pqb 0.31.5 → 0.31.7

package/dist/index.js

@@ -4385,27 +4385,20 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
       if (merge) {
         if (typeof merge === "string") {
           const name = ((_c = shape[merge]) == null ? void 0 : _c.data.name) || merge;
-          sql = `"${name}" = excluded."${name}"`;
+          sql = `DO UPDATE SET "${name}" = excluded."${name}"`;
         } else if ("except" in merge) {
-          const notExcluded = [];
-          const except = orchidCore.toArray(merge.except);
-          for (let i = 0; i < columns.length; i++) {
-            if (!except.includes(columns[i])) {
-              notExcluded.push(quotedColumns[i]);
-            }
-          }
-          sql = mergeColumnsSql(notExcluded);
+          sql = mergeColumnsSql(columns, quotedColumns, target, merge.except);
         } else {
-          sql = merge.reduce((sql2, item, i) => {
+          sql = `DO UPDATE SET ${merge.reduce((sql2, item, i) => {
             var _a2;
             const name = ((_a2 = shape[item]) == null ? void 0 : _a2.data.name) || item;
             return sql2 + (i ? ", " : "") + `"${name}" = excluded."${name}"`;
-          }, "");
+          }, "")}`;
         }
       } else {
-        sql = mergeColumnsSql(quotedColumns);
+        sql = mergeColumnsSql(columns, quotedColumns, target);
       }
-      ctx.sql.push("DO UPDATE SET", sql);
+      ctx.sql.push(sql);
     } else if (query.onConflict.set) {
       let sql;
       const { set } = query.onConflict;
@@ -4431,8 +4424,22 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
   pushWhereStatementSql(ctx, q, query, quotedAs);
   return pushReturningSql(ctx, q, query, quotedAs, query.afterCreateSelect);
 };
-const mergeColumnsSql = (quotedColumns2) => {
-  return quotedColumns2.map((column) => `${column} = excluded.${column}`).join(", ");
+const mergeColumnsSql = (columns, quotedColumns2, target, except) => {
+  const notExcluded = [];
+  const exclude = typeof target === "string" ? [target] : Array.isArray(target) ? [...target] : [];
+  if (except) {
+    if (typeof except === "string") {
+      exclude.push(except);
+    } else {
+      exclude.push(...except);
+    }
+  }
+  for (let i = 0; i < columns.length; i++) {
+    if (!exclude.includes(columns[i])) {
+      notExcluded.push(quotedColumns2[i]);
+    }
+  }
+  return notExcluded.length ? `DO UPDATE SET ${notExcluded.map((column) => `${column} = excluded.${column}`).join(", ")}` : "DO NOTHING";
 };
 const encodeRow = (ctx, q, QueryClass, row, runtimeDefaults, quotedAs) => {
   const arr = row.map((value) => {