pqb 0.11.19 → 0.11.21

package/dist/index.js

@@ -5,21 +5,21 @@ var pg = require('pg');
 var util = require('util');
 var node_async_hooks = require('node:async_hooks');
 
-var __defProp$g = Object.defineProperty;
+var __defProp$f = Object.defineProperty;
 var __defProps$a = Object.defineProperties;
 var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
-var __hasOwnProp$h = Object.prototype.hasOwnProperty;
-var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$g = (a, b) => {
+var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
+var __hasOwnProp$g = Object.prototype.hasOwnProperty;
+var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$f = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$h.call(b, prop))
-      __defNormalProp$g(a, prop, b[prop]);
-  if (__getOwnPropSymbols$h)
-    for (var prop of __getOwnPropSymbols$h(b)) {
-      if (__propIsEnum$h.call(b, prop))
-        __defNormalProp$g(a, prop, b[prop]);
+    if (__hasOwnProp$g.call(b, prop))
+      __defNormalProp$f(a, prop, b[prop]);
+  if (__getOwnPropSymbols$g)
+    for (var prop of __getOwnPropSymbols$g(b)) {
+      if (__propIsEnum$g.call(b, prop))
+        __defNormalProp$f(a, prop, b[prop]);
     }
   return a;
 };
@@ -37,7 +37,7 @@ const simplifyColumnDefault = (value) => {
 };
 const instantiateColumn = (klass, params) => {
   const column = new klass();
-  Object.assign(column.data, __spreadProps$a(__spreadValues$g({}, params), {
+  Object.assign(column.data, __spreadProps$a(__spreadValues$f({}, params), {
     default: simplifyColumnDefault(params.default)
   }));
   return column;
@@ -51,7 +51,7 @@ class ColumnType extends orchidCore.ColumnTypeBase {
     );
   }
   foreignKey(fnOrTable, column, options = {}) {
-    const item = typeof fnOrTable === "string" ? __spreadValues$g({ table: fnOrTable, columns: [column] }, options) : __spreadValues$g({ fn: fnOrTable, columns: [column] }, options);
+    const item = typeof fnOrTable === "string" ? __spreadValues$f({ table: fnOrTable, columns: [column] }, options) : __spreadValues$f({ fn: fnOrTable, columns: [column] }, options);
     return orchidCore.pushColumnData(this, "foreignKeys", item);
   }
   hidden() {
@@ -78,7 +78,7 @@ class ColumnType extends orchidCore.ColumnTypeBase {
     return orchidCore.pushColumnData(this, "indexes", options);
   }
   unique(options = {}) {
-    return orchidCore.pushColumnData(this, "indexes", __spreadProps$a(__spreadValues$g({}, options), { unique: true }));
+    return orchidCore.pushColumnData(this, "indexes", __spreadProps$a(__spreadValues$f({}, options), { unique: true }));
   }
   comment(comment) {
     return orchidCore.setColumnData(this, "comment", comment);
@@ -109,8 +109,8 @@ class ColumnType extends orchidCore.ColumnTypeBase {
     const cloned = Object.create(this);
     cloned.chain = [...this.chain, ["refine", check, cloned]];
     if (typeof params === "string" || (params == null ? void 0 : params.message)) {
-      cloned.data = __spreadProps$a(__spreadValues$g({}, this.data), {
-        errors: __spreadProps$a(__spreadValues$g({}, this.data.errors), {
+      cloned.data = __spreadProps$a(__spreadValues$f({}, this.data), {
+        errors: __spreadProps$a(__spreadValues$f({}, this.data.errors), {
           refine: typeof params === "string" ? params : params.message
         })
       });
@@ -211,21 +211,21 @@ const addValue = (values, value) => {
   return `$${values.length}`;
 };
 
-var __defProp$f = Object.defineProperty;
+var __defProp$e = Object.defineProperty;
 var __defProps$9 = Object.defineProperties;
 var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
-var __hasOwnProp$g = Object.prototype.hasOwnProperty;
-var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$f = (a, b) => {
+var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
+var __hasOwnProp$f = Object.prototype.hasOwnProperty;
+var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$e = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$g.call(b, prop))
-      __defNormalProp$f(a, prop, b[prop]);
-  if (__getOwnPropSymbols$g)
-    for (var prop of __getOwnPropSymbols$g(b)) {
-      if (__propIsEnum$g.call(b, prop))
-        __defNormalProp$f(a, prop, b[prop]);
+    if (__hasOwnProp$f.call(b, prop))
+      __defNormalProp$e(a, prop, b[prop]);
+  if (__getOwnPropSymbols$f)
+    for (var prop of __getOwnPropSymbols$f(b)) {
+      if (__propIsEnum$f.call(b, prop))
+        __defNormalProp$e(a, prop, b[prop]);
     }
   return a;
 };
@@ -313,14 +313,14 @@ const base = () => ({
   in: all.in(),
   notIn: all.notIn()
 });
-const numeric = () => __spreadProps$9(__spreadValues$f({}, base()), {
+const numeric = () => __spreadProps$9(__spreadValues$e({}, base()), {
   lt: all.lt(),
   lte: all.lte(),
   gt: all.gt(),
   gte: all.gte(),
   between: all.between()
 });
-const text$1 = () => __spreadProps$9(__spreadValues$f({}, base()), {
+const text$1 = () => __spreadProps$9(__spreadValues$e({}, base()), {
   contains: all.contains(),
   containsSensitive: all.containsSensitive(),
   startsWith: all.startsWith(),
@@ -328,7 +328,7 @@ const text$1 = () => __spreadProps$9(__spreadValues$f({}, base()), {
   endsWith: all.endsWith(),
   endsWithSensitive: all.endsWithSensitive()
 });
-const json = () => __spreadProps$9(__spreadValues$f({}, base()), {
+const json = () => __spreadProps$9(__spreadValues$e({}, base()), {
   jsonPath: all.jsonPath(),
   jsonSupersetOf: all.jsonSupersetOf(),
   jsonSubsetOf: all.jsonSubsetOf()
@@ -889,21 +889,21 @@ class BigSerialColumn extends NumberAsStringBaseColumn {
   }
 }
 
-var __defProp$e = Object.defineProperty;
+var __defProp$d = Object.defineProperty;
 var __defProps$8 = Object.defineProperties;
 var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
-var __hasOwnProp$f = Object.prototype.hasOwnProperty;
-var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$e = (a, b) => {
+var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
+var __hasOwnProp$e = Object.prototype.hasOwnProperty;
+var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$d = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$f.call(b, prop))
-      __defNormalProp$e(a, prop, b[prop]);
-  if (__getOwnPropSymbols$f)
-    for (var prop of __getOwnPropSymbols$f(b)) {
-      if (__propIsEnum$f.call(b, prop))
-        __defNormalProp$e(a, prop, b[prop]);
+    if (__hasOwnProp$e.call(b, prop))
+      __defNormalProp$d(a, prop, b[prop]);
+  if (__getOwnPropSymbols$e)
+    for (var prop of __getOwnPropSymbols$e(b)) {
+      if (__propIsEnum$e.call(b, prop))
+        __defNormalProp$d(a, prop, b[prop]);
     }
   return a;
 };
@@ -965,7 +965,7 @@ const setTextColumnData = (column, minArg, maxArg) => {
   }
 };
 const textColumnToCode = (column, t) => {
-  const data = __spreadValues$e({}, column.data);
+  const data = __spreadValues$d({}, column.data);
   let args = "";
   if (data.minArg !== void 0 && data.min === data.minArg) {
     args += data.minArg;
@@ -1203,7 +1203,7 @@ class UUIDColumn extends ColumnType {
       this,
       t,
       `uuid()`,
-      typeof data.default === "object" && data.default.__raw === uuidDefault.__raw ? __spreadProps$8(__spreadValues$e({}, data), { default: void 0 }) : data
+      typeof data.default === "object" && data.default.__raw === uuidDefault.__raw ? __spreadProps$8(__spreadValues$d({}, data), { default: void 0 }) : data
     );
   }
 }
@@ -1387,26 +1387,26 @@ class EnumColumn extends ColumnType {
   }
 }
 
-var __defProp$d = Object.defineProperty;
+var __defProp$c = Object.defineProperty;
 var __defProps$7 = Object.defineProperties;
 var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
-var __hasOwnProp$e = Object.prototype.hasOwnProperty;
-var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$d = (a, b) => {
+var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
+var __hasOwnProp$d = Object.prototype.hasOwnProperty;
+var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$c = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$e.call(b, prop))
-      __defNormalProp$d(a, prop, b[prop]);
-  if (__getOwnPropSymbols$e)
-    for (var prop of __getOwnPropSymbols$e(b)) {
-      if (__propIsEnum$e.call(b, prop))
-        __defNormalProp$d(a, prop, b[prop]);
+    if (__hasOwnProp$d.call(b, prop))
+      __defNormalProp$c(a, prop, b[prop]);
+  if (__getOwnPropSymbols$d)
+    for (var prop of __getOwnPropSymbols$d(b)) {
+      if (__propIsEnum$d.call(b, prop))
+        __defNormalProp$c(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
-const jsonTypes = __spreadProps$7(__spreadValues$d({
+const jsonTypes = __spreadProps$7(__spreadValues$c({
   array: orchidCore.array,
   discriminatedUnion: orchidCore.discriminatedUnion,
   enum: orchidCore.enumType,
@@ -1642,21 +1642,21 @@ const setQueryObjectValue = (q, object, key, value) => {
   return q;
 };
 
-var __defProp$c = Object.defineProperty;
+var __defProp$b = Object.defineProperty;
 var __defProps$6 = Object.defineProperties;
 var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
-var __hasOwnProp$d = Object.prototype.hasOwnProperty;
-var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$c = (a, b) => {
+var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
+var __hasOwnProp$c = Object.prototype.hasOwnProperty;
+var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$b = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$d.call(b, prop))
-      __defNormalProp$c(a, prop, b[prop]);
-  if (__getOwnPropSymbols$d)
-    for (var prop of __getOwnPropSymbols$d(b)) {
-      if (__propIsEnum$d.call(b, prop))
-        __defNormalProp$c(a, prop, b[prop]);
+    if (__hasOwnProp$c.call(b, prop))
+      __defNormalProp$b(a, prop, b[prop]);
+  if (__getOwnPropSymbols$c)
+    for (var prop of __getOwnPropSymbols$c(b)) {
+      if (__propIsEnum$c.call(b, prop))
+        __defNormalProp$b(a, prop, b[prop]);
     }
   return a;
 };
@@ -1684,7 +1684,7 @@ const processJoinItem = (ctx, table, query, item, quotedAs) => {
       }
       const queryData = {
         shape: j.shape,
-        joinedShapes: __spreadProps$6(__spreadValues$c(__spreadValues$c({}, query.joinedShapes), j.joinedShapes), {
+        joinedShapes: __spreadProps$6(__spreadValues$b(__spreadValues$b({}, query.joinedShapes), j.joinedShapes), {
           [table.query.as || table.table]: table.shape
         }),
         and: j.and ? [...j.and] : [],
@@ -1749,8 +1749,8 @@ const processJoinItem = (ctx, table, query, item, quotedAs) => {
       const whereSql = whereToSql(
         ctx,
         first,
-        __spreadProps$6(__spreadValues$c({}, joinQuery), {
-          joinedShapes: __spreadProps$6(__spreadValues$c(__spreadValues$c({}, query.joinedShapes), joinQuery.joinedShapes), {
+        __spreadProps$6(__spreadValues$b({}, joinQuery), {
+          joinedShapes: __spreadProps$6(__spreadValues$b(__spreadValues$b({}, query.joinedShapes), joinQuery.joinedShapes), {
             [table.query.as || table.table]: table.query.shape
           })
         }),
@@ -1771,7 +1771,7 @@ const processArgs = (args, ctx, table, query, first, joinAs, joinShape, quotedAs
   if (args.length === 2) {
     const arg = args[1];
     if (typeof arg === "function") {
-      const joinedShapes = __spreadProps$6(__spreadValues$c({}, query.joinedShapes), {
+      const joinedShapes = __spreadProps$6(__spreadValues$b({}, query.joinedShapes), {
         [table.query.as || table.table]: table.shape
       });
       let q2;
@@ -1808,13 +1808,13 @@ const processArgs = (args, ctx, table, query, first, joinAs, joinShape, quotedAs
             pushQueryArray(q2, "or", query2.or);
           }
         }
-        data = __spreadProps$6(__spreadValues$c({}, first.query), {
-          joinedShapes: __spreadValues$c(__spreadValues$c({}, first.query.joinedShapes), joinedShapes)
+        data = __spreadProps$6(__spreadValues$b({}, first.query), {
+          joinedShapes: __spreadValues$b(__spreadValues$b({}, first.query.joinedShapes), joinedShapes)
         });
       }
       const jq = arg(new ctx.onQueryBuilder(q2, data, table));
       if (jq.query.joinedShapes !== joinedShapes) {
-        jq.query.joinedShapes = __spreadValues$c(__spreadValues$c({}, jq.query.joinedShapes), joinedShapes);
+        jq.query.joinedShapes = __spreadValues$b(__spreadValues$b({}, jq.query.joinedShapes), joinedShapes);
       }
       return whereToSql(ctx, jq, jq.query, joinAs);
     } else {
@@ -2133,21 +2133,21 @@ const pushIn = (query, ands, prefix, quotedAs, values, arg) => {
   );
 };
 
-var __defProp$b = Object.defineProperty;
+var __defProp$a = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
 var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
-var __hasOwnProp$c = Object.prototype.hasOwnProperty;
-var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$b = (a, b) => {
+var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
+var __hasOwnProp$b = Object.prototype.hasOwnProperty;
+var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$a = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$c.call(b, prop))
-      __defNormalProp$b(a, prop, b[prop]);
-  if (__getOwnPropSymbols$c)
-    for (var prop of __getOwnPropSymbols$c(b)) {
-      if (__propIsEnum$c.call(b, prop))
-        __defNormalProp$b(a, prop, b[prop]);
+    if (__hasOwnProp$b.call(b, prop))
+      __defNormalProp$a(a, prop, b[prop]);
+  if (__getOwnPropSymbols$b)
+    for (var prop of __getOwnPropSymbols$b(b)) {
+      if (__propIsEnum$b.call(b, prop))
+        __defNormalProp$a(a, prop, b[prop]);
     }
   return a;
 };
@@ -2155,7 +2155,7 @@ var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const aggregateToSql = (ctx, table, item, quotedAs) => {
   var _a;
   const sql = [`${item.function}(`];
-  ctx = __spreadProps$5(__spreadValues$b({}, ctx), { sql });
+  ctx = __spreadProps$5(__spreadValues$a({}, ctx), { sql });
   const options = item.options || orchidCore.emptyObject;
   if (options.distinct && !options.withinGroup)
     sql.push("DISTINCT ");
@@ -2630,62 +2630,71 @@ const getFrom = (table, query, values) => {
   return quoteSchemaAndTable(query.schema, table.table);
 };
 
+const quotedColumns = [];
 const pushInsertSql = (ctx, table, query, quotedAs) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const { shape } = table.query;
-  const quotedColumns = query.columns.map(
-    (key) => {
-      var _a2;
-      return q(((_a2 = shape[key]) == null ? void 0 : _a2.data.name) || key);
-    }
-  );
+  const { columns } = query;
+  quotedColumns.length = columns.length;
+  for (let i = 0, len = columns.length; i < len; i++) {
+    quotedColumns[i] = q(((_a = shape[columns[i]]) == null ? void 0 : _a.data.name) || columns[i]);
+  }
   let runtimeDefaults;
   if (table.internal.runtimeDefaultColumns) {
     runtimeDefaults = [];
     for (const key of table.internal.runtimeDefaultColumns) {
-      if (!query.columns.includes(key)) {
+      if (!columns.includes(key)) {
         const column = shape[key];
         quotedColumns.push(q(column.data.name || key));
         runtimeDefaults.push(column.data.default);
       }
     }
   }
+  let values = query.values;
+  if (quotedColumns.length === 0) {
+    const key = Object.keys(table.shape)[0];
+    const column = table.shape[key];
+    quotedColumns[0] = q((column == null ? void 0 : column.data.name) || key);
+    if (Array.isArray(values) && Array.isArray(values[0])) {
+      values = [[void 0]];
+    }
+  }
   ctx.sql.push(`INSERT INTO ${quotedAs}(${quotedColumns.join(", ")})`);
-  if ("from" in query.values) {
-    const { from, values } = query.values;
+  if ("from" in values) {
+    const { from, values: v } = values;
     const q2 = from.clone();
-    if (values) {
+    if (v) {
       pushQueryValue(
         q2,
         "select",
-        orchidCore.raw(encodeRow(ctx, values[0], runtimeDefaults), false)
+        orchidCore.raw(encodeRow(ctx, v[0], runtimeDefaults), false)
       );
     }
     ctx.sql.push(makeSql(q2, { values: ctx.values }).text);
-  } else if (orchidCore.isRaw(query.values)) {
-    let valuesSql = getRaw(query.values, ctx.values);
+  } else if (orchidCore.isRaw(values)) {
+    let valuesSql = getRaw(values, ctx.values);
     if (runtimeDefaults) {
       valuesSql += `, ${runtimeDefaults.map((fn) => addValue(ctx.values, fn())).join(", ")}`;
     }
     ctx.sql.push(`VALUES (${valuesSql})`);
-  } else if (orchidCore.isRaw(query.values[0])) {
+  } else if (orchidCore.isRaw(values[0])) {
     let sql;
     if (runtimeDefaults) {
-      const { values } = ctx;
-      sql = query.values.map(
+      const { values: v } = ctx;
+      sql = values.map(
         (raw2) => (
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          `(${getRaw(raw2, values)}, ${runtimeDefaults.map((fn) => addValue(values, fn())).join(", ")})`
+          `(${getRaw(raw2, v)}, ${runtimeDefaults.map((fn) => addValue(v, fn())).join(", ")})`
         )
       ).join(", ");
     } else {
-      const { values } = ctx;
-      sql = query.values.map((raw2) => `(${getRaw(raw2, values)})`).join(", ");
+      const { values: v } = ctx;
+      sql = values.map((raw2) => `(${getRaw(raw2, v)})`).join(", ");
     }
     ctx.sql.push(`VALUES ${sql}`);
   } else {
     ctx.sql.push(
-      `VALUES ${query.values.map((row) => `(${encodeRow(ctx, row, runtimeDefaults)})`).join(", ")}`
+      `VALUES ${values.map((row) => `(${encodeRow(ctx, row, runtimeDefaults)})`).join(", ")}`
     );
   }
   if (query.onConflict) {
@@ -2693,7 +2702,7 @@ const pushInsertSql = (ctx, table, query, quotedAs) => {
     const { expr, type } = query.onConflict;
     if (expr) {
       if (typeof expr === "string") {
-        ctx.sql.push(`(${q(((_a = shape[expr]) == null ? void 0 : _a.data.name) || expr)})`);
+        ctx.sql.push(`(${q(((_b = shape[expr]) == null ? void 0 : _b.data.name) || expr)})`);
       } else if (Array.isArray(expr)) {
         ctx.sql.push(
           `(${expr.map((item) => {
@@ -2706,7 +2715,7 @@ const pushInsertSql = (ctx, table, query, quotedAs) => {
       }
     } else if (type === "merge") {
       const { indexes } = table.internal;
-      const quotedUniques = query.columns.reduce((arr, key, i) => {
+      const quotedUniques = columns.reduce((arr, key, i) => {
         var _a2, _b2;
         const unique = (
           // check column index
@@ -2732,7 +2741,7 @@ const pushInsertSql = (ctx, table, query, quotedAs) => {
       const { update } = query.onConflict;
       if (update) {
         if (typeof update === "string") {
-          const name = q(((_b = shape[update]) == null ? void 0 : _b.data.name) || update);
+          const name = q(((_c = shape[update]) == null ? void 0 : _c.data.name) || update);
           set = `${name} = excluded.${name}`;
         } else if (Array.isArray(update)) {
           set = update.map((item) => {
@@ -2746,7 +2755,7 @@ const pushInsertSql = (ctx, table, query, quotedAs) => {
           const arr = [];
           for (const key in update) {
             arr.push(
-              `${q(((_c = shape[key]) == null ? void 0 : _c.data.name) || key)} = ${addValue(
+              `${q(((_d = shape[key]) == null ? void 0 : _d.data.name) || key)} = ${addValue(
                 ctx.values,
                 update[key]
               )}`
@@ -3167,27 +3176,27 @@ const cloneQueryArrays = (q) => {
   }
 };
 
-var __defProp$a = Object.defineProperty;
-var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
-var __hasOwnProp$b = Object.prototype.hasOwnProperty;
-var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$a = (a, b) => {
+var __defProp$9 = Object.defineProperty;
+var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
+var __hasOwnProp$a = Object.prototype.hasOwnProperty;
+var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$9 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$b.call(b, prop))
-      __defNormalProp$a(a, prop, b[prop]);
-  if (__getOwnPropSymbols$b)
-    for (var prop of __getOwnPropSymbols$b(b)) {
-      if (__propIsEnum$b.call(b, prop))
-        __defNormalProp$a(a, prop, b[prop]);
+    if (__hasOwnProp$a.call(b, prop))
+      __defNormalProp$9(a, prop, b[prop]);
+  if (__getOwnPropSymbols$a)
+    for (var prop of __getOwnPropSymbols$a(b)) {
+      if (__propIsEnum$a.call(b, prop))
+        __defNormalProp$9(a, prop, b[prop]);
     }
   return a;
 };
 const getClonedQueryData = (query) => {
-  const cloned = __spreadValues$a({}, query);
+  const cloned = __spreadValues$9({}, query);
   delete cloned[toSqlCacheKey];
   if (cloned.parsers)
-    cloned.parsers = __spreadValues$a({}, cloned.parsers);
+    cloned.parsers = __spreadValues$9({}, cloned.parsers);
   cloneQueryArrays(cloned);
   return cloned;
 };
@@ -3215,21 +3224,21 @@ class DomainColumn extends CustomTypeColumn {
   }
 }
 
-var __defProp$9 = Object.defineProperty;
+var __defProp$8 = Object.defineProperty;
 var __defProps$4 = Object.defineProperties;
 var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
-var __hasOwnProp$a = Object.prototype.hasOwnProperty;
-var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$9 = (a, b) => {
+var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
+var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
+var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$8 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$a.call(b, prop))
-      __defNormalProp$9(a, prop, b[prop]);
-  if (__getOwnPropSymbols$a)
-    for (var prop of __getOwnPropSymbols$a(b)) {
-      if (__propIsEnum$a.call(b, prop))
-        __defNormalProp$9(a, prop, b[prop]);
+    if (__hasOwnProp$9.call(b, prop))
+      __defNormalProp$8(a, prop, b[prop]);
+  if (__getOwnPropSymbols$9)
+    for (var prop of __getOwnPropSymbols$9(b)) {
+      if (__propIsEnum$9.call(b, prop))
+        __defNormalProp$8(a, prop, b[prop]);
     }
   return a;
 };
@@ -3258,7 +3267,7 @@ const getColumnTypes = (types, fn, nowSQL, data = newTableData()) => {
 function text(min, max) {
   return new TextColumn(min, max);
 }
-const columnTypes = __spreadValues$9({
+const columnTypes = __spreadValues$8({
   name: orchidCore.name,
   raw: orchidCore.raw,
   smallint() {
@@ -3419,7 +3428,7 @@ const columnTypes = __spreadValues$9({
       columns: orchidCore.toArray(columns).map(
         (column) => typeof column === "string" ? { column } : column
       ),
-      options: __spreadProps$4(__spreadValues$9({}, options), { unique: true })
+      options: __spreadProps$4(__spreadValues$8({}, options), { unique: true })
     };
     ((_a = tableData.indexes) != null ? _a : tableData.indexes = []).push(index);
     return orchidCore.emptyObject;
@@ -3561,17 +3570,17 @@ const columnsByType = {
   bigserial: BigSerialColumn
 };
 
-var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
-var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
-var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
+var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
+var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
+var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
 var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$9.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$8.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$9)
-    for (var prop of __getOwnPropSymbols$9(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$9.call(source, prop))
+  if (source != null && __getOwnPropSymbols$8)
+    for (var prop of __getOwnPropSymbols$8(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$8.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -3755,21 +3764,21 @@ class QueryGet {
   }
 }
 
-var __defProp$8 = Object.defineProperty;
+var __defProp$7 = Object.defineProperty;
 var __defProps$3 = Object.defineProperties;
 var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
-var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
-var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$8 = (a, b) => {
+var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
+var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
+var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$7 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$8.call(b, prop))
-      __defNormalProp$8(a, prop, b[prop]);
-  if (__getOwnPropSymbols$8)
-    for (var prop of __getOwnPropSymbols$8(b)) {
-      if (__propIsEnum$8.call(b, prop))
-        __defNormalProp$8(a, prop, b[prop]);
+    if (__hasOwnProp$7.call(b, prop))
+      __defNormalProp$7(a, prop, b[prop]);
+  if (__getOwnPropSymbols$7)
+    for (var prop of __getOwnPropSymbols$7(b)) {
+      if (__propIsEnum$7.call(b, prop))
+        __defNormalProp$7(a, prop, b[prop]);
     }
   return a;
 };
@@ -3808,7 +3817,7 @@ const _join = (q, require2, type, args) => {
       shape = (_a = q.query.withShapes) == null ? void 0 : _a[joinKey];
       if (shape) {
         if (!require2)
-          shape = __spreadValues$8({}, shape);
+          shape = __spreadValues$7({}, shape);
         parsers = {};
         for (const key in shape) {
           const parser = shape[key].parseFn;
@@ -3842,7 +3851,7 @@ const _joinLateral = (q, type, arg, cb, as) => {
         const t = Object.create(q.queryBuilder);
         t.table = arg;
         t.shape = shape;
-        t.query = __spreadProps$3(__spreadValues$8({}, t.query), {
+        t.query = __spreadProps$3(__spreadValues$7({}, t.query), {
           shape
         });
         t.baseQuery = t;
@@ -3866,22 +3875,6 @@ const _joinLateral = (q, type, arg, cb, as) => {
   return pushQueryValue(q, "join", [type, result, as]);
 };
 
-var __defProp$7 = Object.defineProperty;
-var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$7 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$7.call(b, prop))
-      __defNormalProp$7(a, prop, b[prop]);
-  if (__getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(b)) {
-      if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
-    }
-  return a;
-};
 const addParserForRawExpression = (q, key, raw2) => {
   var _a;
   const parser = (_a = raw2.__column) == null ? void 0 : _a.parseFn;
@@ -3993,7 +3986,13 @@ const processSelectArg = (q, as, arg, columnAs) => {
           }
           query = value;
         }
-        _joinLateral(q, "LEFT JOIN", query, (q2) => q2, key);
+        _joinLateral(
+          q,
+          value.query.innerJoinLateral ? "JOIN" : "LEFT JOIN",
+          query,
+          (q2) => q2,
+          key
+        );
       }
     }
     selectAs[key] = addParserForSelectItem(q, as, key, value);
@@ -4025,36 +4024,46 @@ const processSelectColumnArg = (q, arg, as, columnAs) => {
 const getShapeFromSelect = (q, isSubQuery) => {
   const query = q.query;
   const { select, shape } = query;
+  let result;
   if (!select) {
-    return shape;
-  }
-  const result = {};
-  for (const item of select) {
-    if (typeof item === "string") {
-      addColumnToShapeFromSelect(q, item, shape, query, result, isSubQuery);
-    } else if ("selectAs" in item) {
-      for (const key in item.selectAs) {
-        const it = item.selectAs[key];
-        if (typeof it === "string") {
-          addColumnToShapeFromSelect(
-            q,
-            it,
-            shape,
-            query,
-            result,
-            isSubQuery,
-            key
-          );
-        } else if (orchidCore.isRaw(it)) {
-          result[key] = it.__column || new UnknownColumn();
-        } else {
-          const { returnType } = it.query;
-          if (returnType === "value" || returnType === "valueOrThrow") {
-            const type = it.query[getValueKey];
-            if (type)
-              result[key] = type;
+    if (isSubQuery) {
+      result = {};
+      for (const key in shape) {
+        const column = shape[key];
+        result[key] = column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
+      }
+    } else {
+      result = shape;
+    }
+  } else {
+    result = {};
+    for (const item of select) {
+      if (typeof item === "string") {
+        addColumnToShapeFromSelect(q, item, shape, query, result, isSubQuery);
+      } else if ("selectAs" in item) {
+        for (const key in item.selectAs) {
+          const it = item.selectAs[key];
+          if (typeof it === "string") {
+            addColumnToShapeFromSelect(
+              q,
+              it,
+              shape,
+              query,
+              result,
+              isSubQuery,
+              key
+            );
+          } else if (orchidCore.isRaw(it)) {
+            result[key] = it.__column || new UnknownColumn();
           } else {
-            result[key] = new JSONTextColumn();
+            const { returnType } = it.query;
+            if (returnType === "value" || returnType === "valueOrThrow") {
+              const type = it.query[getValueKey];
+              if (type)
+                result[key] = type;
+            } else {
+              result[key] = new JSONTextColumn();
+            }
           }
         }
       }
@@ -4088,12 +4097,7 @@ const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, ke
   }
 };
 const maybeUnNameColumn = (column, isSubQuery) => {
-  if (!isSubQuery || !column.data.name)
-    return column;
-  const cloned = Object.create(column);
-  cloned.data = __spreadValues$7({}, column.data);
-  delete cloned.data.name;
-  return cloned;
+  return isSubQuery && column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
 };
 class Select {
   select(...args) {
@@ -6158,6 +6162,9 @@ class QueryUpsertOrCreate {
     };
     this.query.patchResult = async (queryResult) => {
       if (queryResult.rowCount === 0) {
+        if (typeof data === "function") {
+          data = data();
+        }
         const inner = this.create(data);
         const { handleResult: handleResult2 } = inner.query;
         inner.query.handleResult = (q, r, s) => {