pqb 0.5.0 → 0.5.2

package/dist/index.js

@@ -684,7 +684,7 @@ const pushIn = (ands, prefix, quotedAs, values, arg) => {
   } else if (isRaw(arg.values)) {
     value = getRaw(arg.values, values);
   } else {
-    const sql = arg.values.toSql({ values });
+    const sql = makeSql(arg.values, { values });
     value = `(${sql.text})`;
   }
   const columnsSql = arg.columns.map((column) => quoteFullColumn(column, quotedAs)).join(", ");
@@ -939,7 +939,7 @@ const pushSubQuerySql = (query, as, values, list) => {
     default:
       throw new UnhandledTypeError(returnType);
   }
-  let subQuerySql = `(${query.toSql({ values }).text})`;
+  let subQuerySql = `(${makeSql(query, { values }).text})`;
   const { coalesceValue } = query.query;
   if (coalesceValue !== void 0) {
     const value = typeof coalesceValue === "object" && coalesceValue && isRaw(coalesceValue) ? getRaw(coalesceValue, values) : quote(coalesceValue);
@@ -1055,7 +1055,7 @@ const pushWithSql = (ctx, withData) => {
       if (isRaw(query)) {
         inner = getRaw(query, ctx.values);
       } else {
-        inner = query.toSql({ values: ctx.values }).text;
+        inner = makeSql(query, { values: ctx.values }).text;
       }
       return `${options.recursive ? "RECURSIVE " : ""}${q(name)}${options.columns ? `(${options.columns.map(q).join(", ")})` : ""} AS ${options.materialized ? "MATERIALIZED " : options.notMaterialized ? "NOT MATERIALIZED " : ""}(${inner})`;
     }).join(", ")
@@ -1106,12 +1106,12 @@ const getFrom = (model, query, values) => {
         return getRaw(query.from, values);
       }
       if (!query.from.table) {
-        const sql = query.from.toSql({ values });
+        const sql = makeSql(query.from, { values });
         return `(${sql.text})`;
       }
       const q = query.from.query;
       if (!checkIfASimpleQuery(q)) {
-        const sql = query.from.toSql({ values });
+        const sql = makeSql(query.from, { values });
         return `(${sql.text})`;
       }
       return quoteSchemaAndTable(q.schema, query.from.table);
@@ -1158,7 +1158,7 @@ const pushInsertSql = (ctx, model, query, quotedAs) => {
       "select",
       isRaw(query.values) ? query.values : raw(encodeRow(ctx, query.values[0]))
     );
-    ctx.sql.push(q2.toSql({ values: ctx.values }).text);
+    ctx.sql.push(makeSql(q2, { values: ctx.values }).text);
   } else {
     ctx.sql.push(
       `VALUES ${isRaw(query.values) ? getRaw(query.values, ctx.values) : query.values.map((row) => `(${encodeRow(ctx, row)})`).join(", ")}`
@@ -1400,7 +1400,7 @@ const makeSql = (model, { values = [] } = {}) => {
       if (isRaw(item.arg)) {
         itemSql = getRaw(item.arg, values);
       } else {
-        const argSql = item.arg.toSql({ values });
+        const argSql = makeSql(item.arg, { values });
         itemSql = argSql.text;
       }
       sql.push(`${item.kind} ${item.wrap ? `(${itemSql})` : itemSql}`);
@@ -4206,13 +4206,13 @@ const processCreateItem = (item, rowIndex, ctx, columns, encoders, columnsMap, s
           item[key]
         ]);
       } else {
+        const value = item[key];
+        if ((!value.create || Array.isArray(value.create) && value.create.length === 0) && (!value.connect || Array.isArray(value.connect) && value.connect.length === 0) && (!value.connectOrCreate || Array.isArray(value.connectOrCreate) && value.connectOrCreate.length === 0))
+          return;
         ctx.requiredReturning[ctx.relations[key].primaryKey] = true;
         if (!ctx.appendRelations[key])
           ctx.appendRelations[key] = [];
-        ctx.appendRelations[key].push([
-          rowIndex,
-          item[key]
-        ]);
+        ctx.appendRelations[key].push([rowIndex, value]);
       }
     } else if (columnsMap[key] === void 0 && (shape[key] || shape === anyShape)) {
       columnsMap[key] = columns.length;
@@ -4774,7 +4774,7 @@ class Json {
   _json() {
     const q = this._wrap(this.__model.clone());
     q._getOptional(
-      this.raw(
+      raw(
         queryTypeWithLimitOne[this.query.returnType] ? `row_to_json("t".*)` : `COALESCE(json_agg(row_to_json("t".*)), '[]')`
       )
     );
@@ -5155,6 +5155,9 @@ class Update {
         if (relations[key].type === "belongsTo") {
           prependRelations[key] = data[key];
         } else {
+          const value = data[key];
+          if (!value.set && !("upsert" in value) && (!value.disconnect || Array.isArray(value.disconnect) && value.disconnect.length === 0) && (!value.delete || Array.isArray(value.delete) && value.delete.length === 0) && (!value.update || Array.isArray(value.update.where) && value.update.where.length === 0) && (!value.create || Array.isArray(value.create) && value.create.length === 0))
+            continue;
           if (!((_a = query.select) == null ? void 0 : _a.includes("*"))) {
             const primaryKey = relations[key].primaryKey;
             if (!((_b = query.select) == null ? void 0 : _b.includes(primaryKey))) {
@@ -5528,11 +5531,8 @@ class QueryMethods {
   wrap(query, as) {
     return this.clone()._wrap(query, as);
   }
-  _wrap(query, as) {
-    const sql = this.toSql();
-    return query.as(as != null ? as : "t")._from(
-      this.raw(`(${sql.text})`, ...sql.values)
-    );
+  _wrap(query, as = "t") {
+    return query.as(as)._from(this, as);
   }
   order(...args) {
     return this.clone()._order(...args);
@@ -5878,6 +5878,7 @@ exports.literal = literal;
 exports.logColors = logColors;
 exports.logParamToLogObject = logParamToLogObject;
 exports.makeRegexToFindInSql = makeRegexToFindInSql;
+exports.makeSql = makeSql;
 exports.map = map;
 exports.nativeEnum = nativeEnum;
 exports.newTableData = newTableData;