test: 修复 SAP HANA 和 PostgreSQL 的 SQL 生成问题

Yuuki-Sakura · Yuuki-Sakura · commit 798a98e73dbc · 2025-05-20T18:40:29.000+08:00
- 更新了 SAP HANA 数据库的 MERGE INTO 语句生成逻辑
- 修正了 PostgreSQL 数据库的 INSERT ON CONFLICT 语句中的 WHERE 子句
diff --git a/src/query-builder/InsertQueryBuilder.ts b/src/query-builder/InsertQueryBuilder.ts
@@ -609,7 +609,9 @@ export class InsertQueryBuilder<
                         this.expressionMap.onUpdate.overwriteCondition ??= []
                         const wheres = overwrite.map<WhereClause>((column) => ({
                             type: "or",
-                            condition: `${this.escape(this.alias)}.${this.escape(
+                            condition: `${this.escape(
+                                this.alias,
+                            )}.${this.escape(
                                 column,
                             )} IS DISTINCT FROM EXCLUDED.${this.escape(
                                 column,
diff --git a/test/functional/query-builder/insert-merge-into/query-builder-insert-merge-into.ts b/test/functional/query-builder/insert-merge-into/query-builder-insert-merge-into.ts
@@ -168,6 +168,13 @@ describe("query builder > insertion > merge into", () => {
                             `WHEN MATCHED AND post.date > @4 AND post.title != mergeIntoSource.title THEN UPDATE SET post.title = mergeIntoSource.title ` +
                             `WHEN NOT MATCHED THEN INSERT(id, title, published, date) VALUES (mergeIntoSource.id, mergeIntoSource.title, mergeIntoSource.published, mergeIntoSource.date);`,
                     )
+                }
+                if (connection.options.type === "sap") {
+                    expect(sql).to.equal(
+                        `MERGE INTO post post USING (SELECT ? AS id, ? AS title, ? AS published, ? AS date FROM SYS.DUMMY) mergeIntoSource ON (post.date = mergeIntoSource.date) ` +
+                            `WHEN MATCHED AND post.date > ? AND post.title != mergeIntoSource.title THEN UPDATE SET post.title = mergeIntoSource.title ` +
+                            `WHEN NOT MATCHED THEN INSERT(id, title, published, date) VALUES (mergeIntoSource.id, mergeIntoSource.title, mergeIntoSource.published, mergeIntoSource.date)`,
+                    )
                 } else {
                     expect(sql).to.equal(
                         `MERGE INTO post post USING (SELECT :1 AS id, :2 AS title, :3 AS published, :4 AS date FROM DUAL) mergeIntoSource ON (post.date = mergeIntoSource.date) ` +
diff --git a/test/functional/query-builder/insert-on-conflict/query-builder-insert-on-conflict.ts b/test/functional/query-builder/insert-on-conflict/query-builder-insert-on-conflict.ts
@@ -315,7 +315,7 @@ describe("query builder > insert > on conflict", () => {
                     `INSERT INTO post(id, title, date) ` +
                         `VALUES ($1, $2, $3) ON CONFLICT ( date ) ` +
                         `WHERE ( date > 2020-01-01 ) DO UPDATE SET title = EXCLUDED.title ` +
-                        `WHERE (post.title IS DISTINCT FROM EXCLUDED.title)`,
+                        `WHERE post.title IS DISTINCT FROM EXCLUDED.title`,
                 )
             }),
         ))

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ describe("query builder > insert > on conflict", () => {`
`315`	`315`	`INSERT INTO post(id, title, date) ` +
`316`	`316`	`VALUES ($1, $2, $3) ON CONFLICT ( date ) ` +
`317`	`317`	`WHERE ( date > 2020-01-01 ) DO UPDATE SET title = EXCLUDED.title ` +
`318`		- `WHERE (post.title IS DISTINCT FROM EXCLUDED.title)`,
	`318`	+ `WHERE post.title IS DISTINCT FROM EXCLUDED.title`,
`319`	`319`	`)`
`320`	`320`	`}),`
`321`	`321`	`))`