pqb 0.40.8 → 0.40.9

package/dist/index.mjs

@@ -803,8 +803,8 @@ const columnCode = (type, ctx, key, code, data = type.data, skip) => {
       addCode(code, part);
     }
   }
-  if (data.isHidden)
-    addCode(code, ".hidden()");
+  if (data.explicitSelect)
+    addCode(code, ".select(false)");
   if (data.isNullable)
     addCode(code, ".nullable()");
   if (type.encodeFn && type.encodeFn !== (skip == null ? void 0 : skip.encodeFn))
@@ -2356,7 +2356,7 @@ const getArgQueryTarget = (ctx, first, joinSubQuery, cloned) => {
   }
 };
 const subJoinToSql = (ctx, jq, innerAs, outerAs, cloned) => {
-  if (!jq.q.select && jq.internal.columnsForSelectAll) {
+  if (!jq.q.select && jq.q.selectAllColumns) {
     if (!cloned)
       jq = jq.clone();
     jq.q.select = [new RawSQL(`${innerAs}.*`)];
@@ -2693,7 +2693,7 @@ const _join = (query, require2, type, first, args) => {
   );
   if (joinKey && "s" in joinArgs && joinArgs.s) {
     const j = "j" in joinArgs ? (_b = joinArgs.r) != null ? _b : joinArgs.j : "r" in joinArgs ? joinArgs.r : joinArgs.q;
-    if (j.q.select || !j.internal.columnsForSelectAll) {
+    if (j.q.select || !j.q.selectAllColumns) {
       const shape2 = getShapeFromSelect(j, true);
       setQueryObjectValue(
         query,
@@ -4713,7 +4713,7 @@ class SelectItemExpression extends Expression {
   }
   // `makeSQL` acts similarly to how select args are handled
   makeSQL(ctx, quotedAs) {
-    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.query, this.q, quotedAs) : columnToSql(ctx, this.q, this.q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
+    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.q, quotedAs) : columnToSql(ctx, this.q, this.q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
   }
 }
 
@@ -4847,12 +4847,14 @@ function queryFrom(self, arg) {
     data.batchParsers = q.q.batchParsers;
   }
   data.from = arg;
+  data.selectAllColumns = data.selectAllKeys = void 0;
   return self;
 }
 function queryFromSql(self, args) {
   const data = self.q;
   data.as || (data.as = "t");
   data.from = sqlQueryArgsToExpression(args);
+  data.selectAllColumns = data.selectAllKeys = void 0;
   return self;
 }
 class FromMethods {
@@ -4967,11 +4969,11 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
         if (item === "*") {
           if (hookSelect) {
             selected != null ? selected : selected = {};
-            for (const key in table.internal.columnsKeysForSelectAll || query.shape) {
+            for (const key in query.selectAllKeys || query.shape) {
               selected[key] = quotedAs;
             }
           }
-          sql = selectAllSql(table, query, quotedAs);
+          sql = selectAllSql(query, quotedAs);
         } else {
           const index = item.indexOf(".");
           if (index !== -1) {
@@ -5073,15 +5075,15 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
       list.push(sql);
     }
   }
-  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(table, query, quotedAs);
+  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(query, quotedAs);
 };
 function selectedObjectToSQL(ctx, quotedAs, item) {
   const sql = item.toSQL(ctx, quotedAs);
   return ctx.aliasValue ? `${sql} r` : sql;
 }
-const selectAllSql = (table, query, quotedAs) => {
+const selectAllSql = (query, quotedAs) => {
   var _a, _b, _c;
-  return ((_a = query.join) == null ? void 0 : _a.length) ? ((_b = table.internal.columnsForSelectAll) == null ? void 0 : _b.map((item) => `${quotedAs}.${item}`).join(", ")) || `${quotedAs}.*` : ((_c = table.internal.columnsForSelectAll) == null ? void 0 : _c.join(", ")) || "*";
+  return ((_a = query.join) == null ? void 0 : _a.length) ? ((_b = query.selectAllColumns) == null ? void 0 : _b.map((item) => `${quotedAs}.${item}`).join(", ")) || `${quotedAs}.*` : ((_c = query.selectAllColumns) == null ? void 0 : _c.join(", ")) || "*";
 };
 const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
   var _a, _b, _c;
@@ -5275,7 +5277,7 @@ const pushWithSql = (ctx, items) => {
 
 const checkIfASimpleQuery = (q) => {
   var _a, _b;
-  if (q.q.returnType && q.q.returnType !== "all" || q.internal.columnsForSelectAll || ((_a = q.q.and) == null ? void 0 : _a.length) || ((_b = q.q.or) == null ? void 0 : _b.length) || q.q.scopes)
+  if (q.q.returnType && q.q.returnType !== "all" || q.q.selectAllColumns || ((_a = q.q.and) == null ? void 0 : _a.length) || ((_b = q.q.or) == null ? void 0 : _b.length) || q.q.scopes)
     return false;
   const keys = Object.keys(q.q);
   return !keys.some((key) => queryKeysOfNotSimpleQuery.includes(key));
@@ -5303,7 +5305,7 @@ const pushFromAndAs = (ctx, table, data, quotedAs) => {
   const from = getFrom(ctx, table, data, quotedAs);
   sql += from;
   if (data.as && quotedAs && quotedAs !== from) {
-    sql += ` AS ${quotedAs}`;
+    sql += ` ${quotedAs}`;
   }
   for (const as in data.sources) {
     const source = data.sources[as];
@@ -9437,16 +9439,17 @@ var __spreadValues$5 = (a, b) => {
     }
   return a;
 };
-const mergableObjects = {
-  shape: true,
-  withShapes: true,
-  parsers: true,
-  defaults: true,
-  joinedShapes: true,
-  joinedParsers: true,
-  joinedBatchParsers: true,
-  selectedComputeds: true
-};
+const mergableObjects = /* @__PURE__ */ new Set([
+  "shape",
+  "withShapes",
+  "parsers",
+  "defaults",
+  "joinedShapes",
+  "joinedParsers",
+  "joinedBatchParsers",
+  "selectedComputeds"
+]);
+const dontMergeArrays = /* @__PURE__ */ new Set(["selectAllColumns", "selectAllKeys"]);
 class MergeQueryMethods {
   merge(q) {
     const query = this.clone();
@@ -9462,8 +9465,10 @@ class MergeQueryMethods {
           break;
         case "object":
           if (Array.isArray(value)) {
-            a[key] = a[key] ? [...a[key], ...value] : value;
-          } else if (mergableObjects[key]) {
+            if (!dontMergeArrays.has(key)) {
+              a[key] = a[key] ? [...a[key], ...value] : value;
+            }
+          } else if (mergableObjects.has(key)) {
             a[key] = a[key] ? __spreadValues$5(__spreadValues$5({}, a[key]), value) : value;
           } else if (key === "union") {
             a[key] = a[key] ? {
@@ -11383,7 +11388,11 @@ class QueryUpsertOrCreate {
     if (!isObjectEmpty(updateData)) {
       _queryUpdate(q, updateData);
     }
-    return orCreate(q, data.create, updateData, mergeData);
+    const c = orCreate(q, data.create, updateData, mergeData);
+    if (!c.q.select) {
+      c.q.returnType = "void";
+    }
+    return c;
   }
   /**
    * `orCreate` creates a record only if it was not found by conditions.
@@ -12684,7 +12693,7 @@ class Db {
     const parsers = {};
     let hasParsers = false;
     let modifyQuery = void 0;
-    let hasCustomName = false;
+    let prepareSelectAll = false;
     const { snakeCase } = options;
     for (const key in shape) {
       const column = shape[key];
@@ -12694,14 +12703,17 @@ class Db {
         parsers[key] = column.parseFn;
       }
       if (column.data.name) {
-        hasCustomName = true;
+        prepareSelectAll = true;
       } else if (snakeCase) {
         const snakeName = toSnakeCase(key);
         if (snakeName !== key) {
-          hasCustomName = true;
+          prepareSelectAll = true;
           column.data.name = snakeName;
         }
       }
+      if (column.data.explicitSelect) {
+        prepareSelectAll = true;
+      }
       const { modifyQuery: mq } = column.data;
       if (mq) {
         modifyQuery = pushOrNewArray(modifyQuery, (q) => mq(q, column));
@@ -12721,17 +12733,6 @@ class Db {
         }
       }
     }
-    if (hasCustomName) {
-      const list = [];
-      for (const key in shape) {
-        const column = shape[key];
-        list.push(
-          column.data.name ? `"${column.data.name}" AS "${key}"` : `"${key}"`
-        );
-      }
-      this.internal.columnsForSelectAll = list;
-      this.internal.columnsKeysForSelectAll = __spreadValues({}, shape);
-    }
     this.q = {
       adapter,
       shape,
@@ -12764,21 +12765,22 @@ class Db {
     const columns = Object.keys(
       shape
     );
-    const { toSQL } = this;
     this.columns = columns;
-    this.defaultSelectColumns = columns.filter(
-      (column) => !shape[column].data.isHidden
-    );
     if (options.computed)
       applyComputedColumns(this, options.computed);
-    const defaultSelect = this.defaultSelectColumns.length === columns.length ? void 0 : this.defaultSelectColumns;
-    this.toSQL = defaultSelect ? function(options2) {
-      const q = this.clone();
-      if (!q.q.select) {
-        q.q.select = defaultSelect;
-      }
-      return toSQL.call(q, options2);
-    } : toSQL;
+    if (prepareSelectAll) {
+      const list = [];
+      for (const key in shape) {
+        const column = shape[key];
+        if (!column.data.explicitSelect) {
+          list.push(
+            column.data.name ? `"${column.data.name}" AS "${key}"` : `"${key}"`
+          );
+        }
+      }
+      this.q.selectAllColumns = list;
+      this.q.selectAllKeys = __spreadValues({}, shape);
+    }
     if (modifyQuery) {
       for (const cb of modifyQuery) {
         cb(this);