pqb 0.42.4 → 0.42.6

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, emptyArray, addValue, isExpression, joinTruthy, stringDataToCode, getDefaultLanguage, dateDataToCode, returnArg as returnArg$1, noop, pushOrNewArrayToObject, arrayDataToCode, numberDataToCode, logColors, applyTransforms, callWithThis, setParserToQuery, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
+import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, emptyArray, addValue, isExpression, joinTruthy, stringDataToCode, getDefaultLanguage, dateDataToCode, returnArg as returnArg$1, noop, pushOrNewArrayToObject, arrayDataToCode, numberDataToCode, logColors, applyTransforms, callWithThis, setParserToQuery, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, setCurrentColumnName, makeTimestampsHelpers, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
 import pg from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -54,8 +54,7 @@ class RawSQL extends RawSQLBase {
     used.length = 0;
     for (let i = 0; i < len; i += 2) {
       arr[i] = arr[i].replace(/\$\$?(\w+)/g, (match, key, i2) => {
-        if (isTemplate && literalValues.includes(i2))
-          return match;
+        if (isTemplate && literalValues.includes(i2)) return match;
         const value = data[key];
         if (value === void 0) {
           throw new Error(`Query variable \`${key}\` is not provided`);
@@ -117,25 +116,6 @@ const sqlFn = (...args) => {
   return (...args2) => new RawSQL(args2, arg);
 };
 
-var __defProp$p = Object.defineProperty;
-var __defProps$f = Object.defineProperties;
-var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
-var __hasOwnProp$q = Object.prototype.hasOwnProperty;
-var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$p = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$q.call(b, prop))
-      __defNormalProp$p(a, prop, b[prop]);
-  if (__getOwnPropSymbols$q)
-    for (var prop of __getOwnPropSymbols$q(b)) {
-      if (__propIsEnum$q.call(b, prop))
-        __defNormalProp$p(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
 class ColumnType extends ColumnTypeBase {
   /**
    * Mark the column as a primary key.
@@ -162,7 +142,7 @@ class ColumnType extends ColumnTypeBase {
    * @param name - to specify a constraint name
    */
   primaryKey(name) {
-    return setColumnData(this, "primaryKey", name != null ? name : true);
+    return setColumnData(this, "primaryKey", name ?? true);
   }
   foreignKey(fnOrTable, column, options = emptyObject) {
     return pushColumnData(this, "foreignKeys", {
@@ -224,9 +204,8 @@ class ColumnType extends ColumnTypeBase {
    * @param args
    */
   index(...args) {
-    var _a;
     return pushColumnData(this, "indexes", {
-      options: (_a = typeof args[0] === "string" ? args[1] : args[0]) != null ? _a : emptyObject,
+      options: (typeof args[0] === "string" ? args[1] : args[0]) ?? emptyObject,
       name: typeof args[0] === "string" ? args[0] : void 0
     });
   }
@@ -334,15 +313,19 @@ class ColumnType extends ColumnTypeBase {
    */
   searchIndex(...args) {
     return pushColumnData(this, "indexes", {
-      options: __spreadValues$p(__spreadValues$p({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
+      options: {
+        ...typeof args[0] === "string" ? args[1] : args[0],
+        ...this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }
+      },
       name: typeof args[0] === "string" ? args[0] : void 0
     });
   }
   unique(...args) {
     return pushColumnData(this, "indexes", {
-      options: __spreadProps$f(__spreadValues$p({}, typeof args[0] === "string" ? args[1] : args[0]), {
+      options: {
+        ...typeof args[0] === "string" ? args[1] : args[0],
         unique: true
-      }),
+      },
       name: typeof args[0] === "string" ? args[0] : void 0
     });
   }
@@ -383,25 +366,6 @@ class ColumnType extends ColumnTypeBase {
   }
 }
 
-var __defProp$o = Object.defineProperty;
-var __defProps$e = Object.defineProperties;
-var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
-var __hasOwnProp$p = Object.prototype.hasOwnProperty;
-var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$o = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$o = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$p.call(b, prop))
-      __defNormalProp$o(a, prop, b[prop]);
-  if (__getOwnPropSymbols$p)
-    for (var prop of __getOwnPropSymbols$p(b)) {
-      if (__propIsEnum$p.call(b, prop))
-        __defNormalProp$o(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
 const knownDefaults = {
   current_timestamp: "now()",
   "transaction_timestamp()": "now()"
@@ -417,28 +381,26 @@ const simplifyColumnDefault = (value) => {
 const instantiateColumn = (typeFn, params) => {
   const column = typeFn();
   const { dateTimePrecision } = params;
-  Object.assign(column.data, __spreadProps$e(__spreadValues$o({}, params), {
+  Object.assign(column.data, {
+    ...params,
     dateTimePrecision: (
       // 0 is default for date, 6 is default for timestamp
       dateTimePrecision && dateTimePrecision !== 6 ? dateTimePrecision : void 0
     ),
     collate: params.collate,
     default: simplifyColumnDefault(params.default)
-  }));
+  });
   return column;
 };
 
 const isDefaultTimeStamp = (item) => {
-  if (item.dataType !== "timestamptz")
-    return false;
+  if (item.dataType !== "timestamptz") return false;
   const def = item.data.default;
-  if (!(def instanceof RawSQLBase))
-    return false;
+  if (!(def instanceof RawSQLBase)) return false;
   return typeof def._sql === "string" && def._sql.startsWith("now()");
 };
 const combineCodeElements = (input) => {
-  if (typeof input === "string")
-    return input;
+  if (typeof input === "string") return input;
   const output = [];
   let i = -1;
   for (const item of input) {
@@ -458,12 +420,10 @@ const columnsShapeToCode = (ctx, shape) => {
   const hasTimestamps = "createdAt" in shape && isDefaultTimeStamp(shape.createdAt) && "updatedAt" in shape && isDefaultTimeStamp(shape.updatedAt);
   const code = [];
   for (const key in shape) {
-    if (hasTimestamps && (key === "createdAt" || key === "updatedAt"))
-      continue;
+    if (hasTimestamps && (key === "createdAt" || key === "updatedAt")) continue;
     const column = shape[key];
     const name = column.data.name;
-    if (name === key)
-      column.data.name = void 0;
+    if (name === key) column.data.name = void 0;
     code.push(
       ...combineCodeElements([
         `${quoteObjectKey(key)}: `,
@@ -471,8 +431,7 @@ const columnsShapeToCode = (ctx, shape) => {
         ","
       ])
     );
-    if (name === key)
-      column.data.name = name;
+    if (name === key) column.data.name = name;
   }
   if (hasTimestamps) {
     code.push(`...${ctx.t}.timestamps(),`);
@@ -509,11 +468,9 @@ const primaryKeyInnerToCode = (primaryKey, t) => {
 };
 const indexToCode = (index, t, prefix) => {
   const code = indexInnerToCode(index, t);
-  if (prefix)
-    code[0] = prefix + code[0];
+  if (prefix) code[0] = prefix + code[0];
   const last = code[code.length - 1];
-  if (typeof last === "string" && !last.endsWith(","))
-    addCode(code, ",");
+  if (typeof last === "string" && !last.endsWith(",")) addCode(code, ",");
   return code;
 };
 const indexInnerToCode = (index, t) => {
@@ -590,11 +547,9 @@ const indexInnerToCode = (index, t) => {
     }
     const options = [];
     for (const key of indexOptionsKeys) {
-      if (!key)
-        continue;
+      if (!key) continue;
       const value = index.options[key];
-      if (value === null || value === void 0)
-        continue;
+      if (value === null || value === void 0) continue;
       options.push(
         `${key}: ${Array.isArray(value) ? singleQuoteArray(value) : typeof value === "string" ? singleQuote(value) : value},`
       );
@@ -615,8 +570,7 @@ const indexInnerToCode = (index, t) => {
 };
 const constraintToCode = (item, t, m, prefix) => {
   const code = constraintInnerToCode(item, t, m);
-  if (prefix)
-    code[0] = prefix + code[0];
+  if (prefix) code[0] = prefix + code[0];
   const last = code[code.length - 1];
   if (typeof last === "string" && !last.endsWith(","))
     code[code.length - 1] += ",";
@@ -639,7 +593,7 @@ const referencesArgsToCode = ({
   fnOrTable,
   foreignColumns,
   options
-}, name = (options == null ? void 0 : options.name) || false, m) => {
+}, name = options?.name || false, m) => {
   const args = [];
   args.push(`${singleQuoteArray(columns)},`);
   if (m && typeof fnOrTable !== "string") {
@@ -652,14 +606,11 @@ const referencesArgsToCode = ({
   args.push(`${singleQuoteArray(foreignColumns)},`);
   if (objectHasValues(options) || name) {
     const lines = [];
-    if (name)
-      lines.push(`name: ${singleQuote(name)},`);
+    if (name) lines.push(`name: ${singleQuote(name)},`);
     for (const key in options) {
-      if (key === "name")
-        continue;
+      if (key === "name") continue;
       const value = options[key];
-      if (value)
-        lines.push(`${key}: ${singleQuote(value)},`);
+      if (value) lines.push(`${key}: ${singleQuote(value)},`);
     }
     args.push("{", lines, "},");
   }
@@ -693,10 +644,8 @@ const foreignKeyArgumentToCode = ({
   const hasOptions = options.name || options.match || options.onUpdate || options.onDelete;
   if (hasOptions) {
     const arr = [];
-    if (options.name)
-      arr.push(`name: ${singleQuote(options.name)},`);
-    if (options.match)
-      arr.push(`match: ${singleQuote(options.match)},`);
+    if (options.name) arr.push(`name: ${singleQuote(options.name)},`);
+    if (options.match) arr.push(`match: ${singleQuote(options.match)},`);
     if (options.onUpdate)
       arr.push(`onUpdate: ${singleQuote(options.onUpdate)},`);
     if (options.onDelete)
@@ -712,28 +661,20 @@ const columnIndexesToCode = (indexes) => {
   for (const { options, name } of indexes) {
     addCode(code, `.${options.unique ? "unique" : "index"}(`);
     const arr = [];
-    if (options.collate)
-      arr.push(`collate: ${singleQuote(options.collate)},`);
-    if (options.opclass)
-      arr.push(`opclass: ${singleQuote(options.opclass)},`);
-    if (options.order)
-      arr.push(`order: ${singleQuote(options.order)},`);
-    if (name)
-      arr.push(`name: ${singleQuote(name)},`);
-    if (options.using)
-      arr.push(`using: ${singleQuote(options.using)},`);
+    if (options.collate) arr.push(`collate: ${singleQuote(options.collate)},`);
+    if (options.opclass) arr.push(`opclass: ${singleQuote(options.opclass)},`);
+    if (options.order) arr.push(`order: ${singleQuote(options.order)},`);
+    if (name) arr.push(`name: ${singleQuote(name)},`);
+    if (options.using) arr.push(`using: ${singleQuote(options.using)},`);
     if (options.include)
       arr.push(
         `include: ${typeof options.include === "string" ? singleQuote(options.include) : `[${options.include.map(singleQuote).join(", ")}]`},`
       );
-    if (options.nullsNotDistinct)
-      arr.push(`nullsNotDistinct: true,`);
-    if (options.with)
-      arr.push(`with: ${singleQuote(options.with)},`);
+    if (options.nullsNotDistinct) arr.push(`nullsNotDistinct: true,`);
+    if (options.with) arr.push(`with: ${singleQuote(options.with)},`);
     if (options.tablespace)
       arr.push(`tablespace: ${singleQuote(options.tablespace)},`);
-    if (options.where)
-      arr.push(`where: ${singleQuote(options.where)},`);
+    if (options.where) arr.push(`where: ${singleQuote(options.where)},`);
     if (arr.length) {
       addCode(code, "{");
       addCode(code, arr);
@@ -754,20 +695,16 @@ const identityToCode = (identity, dataType) => {
     code.push(`${dataType}().identity(`);
   }
   const props = [];
-  if (identity.always)
-    props.push(`always: true,`);
+  if (identity.always) props.push(`always: true,`);
   if (identity.increment && identity.increment !== 1)
     props.push(`increment: ${identity.increment},`);
   if (identity.start && identity.start !== 1)
     props.push(`start: ${identity.start},`);
-  if (identity.min)
-    props.push(`min: ${identity.min},`);
-  if (identity.max)
-    props.push(`max: ${identity.max},`);
+  if (identity.min) props.push(`min: ${identity.min},`);
+  if (identity.max) props.push(`max: ${identity.max},`);
   if (identity.cache && identity.cache !== 1)
     props.push(`cache: ${identity.cache},`);
-  if (identity.cycle)
-    props.push(`cycle: true,`);
+  if (identity.cycle) props.push(`cycle: true,`);
   if (props.length) {
     addCode(code, "{");
     code.push(props, "}");
@@ -776,12 +713,11 @@ const identityToCode = (identity, dataType) => {
   return code;
 };
 const columnCode = (type, ctx, key, code) => {
-  var _a;
   const { data } = type;
   code = toArray(code);
   let prepend = `${ctx.t}.`;
   const keyName = ctx.snakeCase ? toSnakeCase(key) : key;
-  const name = (_a = data.name) != null ? _a : keyName;
+  const name = data.name ?? keyName;
   if (name !== keyName) {
     prepend += `name(${singleQuote(name)}).`;
   }
@@ -804,18 +740,15 @@ const columnCode = (type, ctx, key, code) => {
       addCode(code, part);
     }
   }
-  if (data.explicitSelect)
-    addCode(code, ".select(false)");
-  if (data.isNullable)
-    addCode(code, ".nullable()");
+  if (data.explicitSelect) addCode(code, ".select(false)");
+  if (data.isNullable) addCode(code, ".nullable()");
   if (data.encode && data.encode !== data.defaultEncode)
     addCode(code, `.encode(${data.encode.toString()})`);
   if (data.parse && data.parse !== data.defaultParse)
     addCode(code, `.parse(${data.parse.toString()})`);
   if (type.data.parseNull)
     addCode(code, `.parseNull(${type.data.parseNull.toString()})`);
-  if (data.as)
-    addCode(code, `.as(${data.as.toCode(ctx, key)})`);
+  if (data.as) addCode(code, `.as(${data.as.toCode(ctx, key)})`);
   if (data.default !== void 0 && data.default !== data.defaultDefault && (!ctx.migration || typeof data.default !== "function")) {
     addCode(
       code,
@@ -827,8 +760,7 @@ const columnCode = (type, ctx, key, code) => {
       addCode(code, part);
     }
   }
-  if (data.comment)
-    addCode(code, `.comment(${singleQuote(data.comment)})`);
+  if (data.comment) addCode(code, `.comment(${singleQuote(data.comment)})`);
   if (data.check) {
     addCode(code, columnCheckToCode(ctx, data.check, name));
   }
@@ -846,42 +778,20 @@ const columnCode = (type, ctx, key, code) => {
   }
   if (data.compression)
     addCode(code, `.compression(${singleQuote(data.compression)})`);
-  if (data.collate)
-    addCode(code, `.collate(${singleQuote(data.collate)})`);
+  if (data.collate) addCode(code, `.collate(${singleQuote(data.collate)})`);
   if (data.modifyQuery)
     addCode(code, `.modifyQuery(${data.modifyQuery.toString()})`);
   return code.length === 1 && typeof code[0] === "string" ? code[0] : code;
 };
 
 const getSqlText = (sql) => {
-  if ("text" in sql)
-    return sql.text;
+  if ("text" in sql) return sql.text;
   throw new Error(`Batch SQL is not supported in this query`);
 };
 
-var __defProp$n = Object.defineProperty;
-var __defProps$d = Object.defineProperties;
-var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
-var __hasOwnProp$o = Object.prototype.hasOwnProperty;
-var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$n = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$o.call(b, prop))
-      __defNormalProp$n(a, prop, b[prop]);
-  if (__getOwnPropSymbols$o)
-    for (var prop of __getOwnPropSymbols$o(b)) {
-      if (__propIsEnum$o.call(b, prop))
-        __defNormalProp$n(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
 const addColumnParserToQuery = (q, key, column) => {
-  var _a;
   if (column._parse) {
-    ((_a = q.parsers) != null ? _a : q.parsers = {})[key] = column._parse;
+    (q.parsers ?? (q.parsers = {}))[key] = column._parse;
   }
 };
 const setColumnDefaultParse = (column, parse) => {
@@ -891,7 +801,7 @@ const setColumnDefaultParse = (column, parse) => {
 const setColumnParse = (column, fn, outputSchema) => {
   const c = Object.create(column);
   c.outputSchema = outputSchema;
-  c.data = __spreadProps$d(__spreadValues$n({}, column.data), { parse: fn });
+  c.data = { ...column.data, parse: fn };
   const { parseNull } = column.data;
   c._parse = parseNull ? (input) => input === null ? parseNull() : fn(input) : (input) => input === null ? null : fn(input);
   return c;
@@ -899,7 +809,7 @@ const setColumnParse = (column, fn, outputSchema) => {
 const setColumnParseNull = (column, fn, nullSchema) => {
   const c = Object.create(column);
   c.nullSchema = nullSchema;
-  c.data = __spreadProps$d(__spreadValues$n({}, column.data), { parseNull: fn });
+  c.data = { ...column.data, parseNull: fn };
   const { parse } = column.data;
   c._parse = parse ? (input) => input === null ? fn() : parse(input) : (input) => input === null ? fn() : input;
   return c;
@@ -907,29 +817,10 @@ const setColumnParseNull = (column, fn, nullSchema) => {
 const setColumnEncode = (column, fn, inputSchema) => {
   const c = Object.create(column);
   c.inputSchema = inputSchema;
-  c.data = __spreadProps$d(__spreadValues$n({}, column.data), { encode: fn });
+  c.data = { ...column.data, encode: fn };
   return c;
 };
 
-var __defProp$m = Object.defineProperty;
-var __defProps$c = Object.defineProperties;
-var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
-var __hasOwnProp$n = Object.prototype.hasOwnProperty;
-var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$m = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$n.call(b, prop))
-      __defNormalProp$m(a, prop, b[prop]);
-  if (__getOwnPropSymbols$n)
-    for (var prop of __getOwnPropSymbols$n(b)) {
-      if (__propIsEnum$n.call(b, prop))
-        __defNormalProp$m(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
 function setQueryOperators(query, operators) {
   const q = query.q;
   if (q.operators !== operators) {
@@ -942,9 +833,9 @@ const make = (_op) => {
   return Object.assign(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     function(value) {
-      var _a, _b, _c;
-      ((_b = (_a = this.q).chain) != null ? _b : _a.chain = []).push(_op, value);
-      if ((_c = this.q.parsers) == null ? void 0 : _c[getValueKey]) {
+      var _a;
+      ((_a = this.q).chain ?? (_a.chain = [])).push(_op, value);
+      if (this.q.parsers?.[getValueKey]) {
         this.q.parsers[getValueKey] = void 0;
       }
       return setQueryOperators(this, boolean);
@@ -960,9 +851,9 @@ const makeVarArg = (_op) => {
   return Object.assign(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     function(...args) {
-      var _a, _b, _c;
-      ((_b = (_a = this.q).chain) != null ? _b : _a.chain = []).push(_op, args);
-      if ((_c = this.q.parsers) == null ? void 0 : _c[getValueKey]) {
+      var _a;
+      ((_a = this.q).chain ?? (_a.chain = [])).push(_op, args);
+      if (this.q.parsers?.[getValueKey]) {
         this.q.parsers[getValueKey] = void 0;
       }
       return setQueryOperators(this, boolean);
@@ -990,7 +881,7 @@ const quoteValue = (arg, ctx, quotedAs, jsonArray) => {
 };
 const quoteLikeValue = (arg, ctx, quotedAs, jsonArray) => {
   if (arg && typeof arg === "object") {
-    if (!jsonArray && Array.isArray(arg)) {
+    if (Array.isArray(arg)) {
       return `(${arg.map((value) => addValue(ctx.values, value)).join(", ")})`;
     }
     if (isExpression(arg)) {
@@ -1018,15 +909,17 @@ const base = {
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
   )
 };
-const boolean = __spreadProps$c(__spreadValues$m({}, base), {
+const boolean = {
+  ...base,
   and: make(
     (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
   ),
   or: make(
     (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
   )
-});
-const numeric = __spreadProps$c(__spreadValues$m({}, base), {
+};
+const numeric = {
+  ...base,
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
   ),
@@ -1046,8 +939,9 @@ const numeric = __spreadProps$c(__spreadValues$m({}, base), {
       quotedAs
     )}`
   )
-});
-const text = __spreadProps$c(__spreadValues$m({}, base), {
+};
+const text = {
+  ...base,
   contains: make(
     (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)} || '%'`
   ),
@@ -1066,20 +960,20 @@ const text = __spreadProps$c(__spreadValues$m({}, base), {
   endsWithSensitive: make(
     (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)}`
   )
-});
+};
 const encodeJsonPath = (ctx, path) => addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
-const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${addValue(ctx.values, path)}${(options == null ? void 0 : options.vars) ? `, ${addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : (options == null ? void 0 : options.silent) ? ", NULL, true" : ""})`;
-const json = __spreadProps$c(__spreadValues$m({}, base), {
+const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${addValue(ctx.values, path)}${options?.vars ? `, ${addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : options?.silent ? ", NULL, true" : ""})`;
+const json = {
+  ...base,
   jsonPathQueryFirst: Object.assign(
     function(path, options) {
-      var _a, _b;
       const { q, columnTypes } = this;
-      const chain = (_a = q.chain) != null ? _a : q.chain = [];
+      const chain = q.chain ?? (q.chain = []);
       chain.push(jsonPathQueryOp, [path, options]);
-      if ((_b = q.parsers) == null ? void 0 : _b[getValueKey]) {
+      if (q.parsers?.[getValueKey]) {
         q.parsers[getValueKey] = void 0;
       }
-      if (options == null ? void 0 : options.type) {
+      if (options?.type) {
         const type = options.type(columnTypes);
         addColumnParserToQuery(q, getValueKey, type);
         chain.push = (...args) => {
@@ -1115,12 +1009,12 @@ const json = __spreadProps$c(__spreadValues$m({}, base), {
     (key, [path, value, options], ctx) => `jsonb_insert(${key}, ${encodeJsonPath(ctx, path)}, ${addValue(
       ctx.values,
       JSON.stringify(value)
-    )}${(options == null ? void 0 : options.after) ? ", true" : ""})`
+    )}${options?.after ? ", true" : ""})`
   ),
   jsonRemove: makeVarArg(
     (key, [path], ctx) => `(${key} #- ${encodeJsonPath(ctx, path)})`
   )
-});
+};
 const Operators = {
   any: base,
   boolean,
@@ -1132,22 +1026,6 @@ const Operators = {
   array: base
 };
 
-var __defProp$l = Object.defineProperty;
-var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
-var __hasOwnProp$m = Object.prototype.hasOwnProperty;
-var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$l = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$m.call(b, prop))
-      __defNormalProp$l(a, prop, b[prop]);
-  if (__getOwnPropSymbols$m)
-    for (var prop of __getOwnPropSymbols$m(b)) {
-      if (__propIsEnum$m.call(b, prop))
-        __defNormalProp$l(a, prop, b[prop]);
-    }
-  return a;
-};
 class TextBaseColumn extends ColumnType {
   constructor(schema, schemaType = schema.stringSchema()) {
     super(schema, schemaType);
@@ -1180,7 +1058,7 @@ class VarCharColumn extends LimitedTextBaseColumn {
       this,
       ctx,
       key,
-      `varchar(${maxChars != null ? maxChars : ""})${stringDataToCode(this.data, ctx.migration)}`
+      `varchar(${maxChars ?? ""})${stringDataToCode(this.data, ctx.migration)}`
     );
   }
 }
@@ -1190,18 +1068,17 @@ class StringColumn extends VarCharColumn {
   }
   toCode(ctx, key) {
     let max = this.data.maxChars;
-    if (max === 255)
-      max = void 0;
+    if (max === 255) max = void 0;
     return columnCode(
       this,
       ctx,
       key,
-      `string(${max != null ? max : ""})${stringDataToCode(this.data, ctx.migration)}`
+      `string(${max ?? ""})${stringDataToCode(this.data, ctx.migration)}`
     );
   }
 }
 const textColumnToCode = (column, ctx, key) => {
-  const data = __spreadValues$l({}, column.data);
+  const data = { ...column.data };
   let args = "";
   const hasMax = data.maxArg !== void 0 && data.max === data.maxArg;
   if (data.minArg !== void 0 && data.min === data.minArg || hasMax) {
@@ -1399,7 +1276,7 @@ class BitVaryingColumn extends ColumnType {
   }
   toCode(ctx, key) {
     const { length } = this.data;
-    return columnCode(this, ctx, key, `bitVarying(${length != null ? length : ""})`);
+    return columnCode(this, ctx, key, `bitVarying(${length ?? ""})`);
   }
   toSQL() {
     return joinTruthy(
@@ -1496,8 +1373,7 @@ class UUIDColumn extends ColumnType {
    */
   primaryKey(name) {
     const column = super.primaryKey(name);
-    if (!column.data.default)
-      column.data.default = uuidDefault;
+    if (!column.data.default) column.data.default = uuidDefault;
     return column;
   }
   toCode(ctx, key) {
@@ -1720,8 +1596,7 @@ const applySqlComputed = (ctx, q, computed, as, quotedAs) => {
   return computed.toSQL(ctx, quotedAs);
 };
 function simpleColumnToSQL(ctx, q, key, column, quotedAs) {
-  if (!column)
-    return `"${key}"`;
+  if (!column) return `"${key}"`;
   const { data } = column;
   return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
@@ -1730,7 +1605,6 @@ function simpleExistingColumnToSQL(ctx, q, key, column, quotedAs) {
   return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
-  var _a;
   const index = column.indexOf(".");
   if (index !== -1) {
     return columnWithDotToSql(
@@ -1743,18 +1617,17 @@ const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
       select
     );
   }
-  if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
+  if (!select && data.joinedShapes?.[column]) {
     return `"${column}".r`;
   }
   return simpleColumnToSQL(ctx, data, column, shape[column], quotedAs);
 };
 const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
-  var _a;
   const index = column.indexOf(".");
   if (index !== -1) {
     return columnWithDotToSql(ctx, data, data.shape, column, index, quotedAs);
   } else {
-    if ((_a = data.joinedShapes) == null ? void 0 : _a[column]) {
+    if (data.joinedShapes?.[column]) {
       return `"${column}".r`;
     }
     if (data.select) {
@@ -1770,15 +1643,14 @@ const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
   }
 };
 const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
-  var _a, _b, _c, _d;
   const table = column.slice(0, index);
   const key = column.slice(index + 1);
   if (key === "*") {
-    return ((_a = data.joinedShapes) == null ? void 0 : _a[table]) ? select ? `row_to_json("${table}".*)` : `"${table}".*` : column;
+    return data.joinedShapes?.[table] ? select ? `row_to_json("${table}".*)` : `"${table}".*` : column;
   }
-  const tableName = ((_b = data.aliases) == null ? void 0 : _b[table]) || table;
+  const tableName = data.aliases?.[table] || table;
   const quoted = `"${table}"`;
-  const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
+  const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
   if (col) {
     if (col.data.name) {
       return `"${tableName}"."${col.data.name}"`;
@@ -1799,16 +1671,13 @@ const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
     column.slice(0, index),
     column.slice(index + 1),
     as,
-    quotedAs,
-    select
-  ) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select);
+    quotedAs) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select);
 };
 const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select) => {
-  var _a, _b, _c;
   if (key === "*") {
-    const shape = (_a = data.joinedShapes) == null ? void 0 : _a[table];
+    const shape = data.joinedShapes?.[table];
     if (shape) {
-      if (select) {
+      {
         let isSimple = true;
         const list = [];
         for (const key2 in shape) {
@@ -1823,13 +1692,12 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
         }
         return (isSimple ? `row_to_json("${table}".*)` : "json_build_object(" + list.join(", ") + ")") + ` "${as}"`;
       }
-      return `"${table}".r "${as}"`;
     }
     return column;
   }
-  const tableName = ((_b = data.aliases) == null ? void 0 : _b[table]) || table;
+  const tableName = data.aliases?.[table] || table;
   const quoted = `"${table}"`;
-  const col = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
+  const col = quoted === quotedAs ? data.shape[key] : data.joinedShapes?.[tableName][key];
   if (col) {
     if (col.data.name && col.data.name !== key) {
       return `"${tableName}"."${col.data.name}" "${as}"`;
@@ -1847,8 +1715,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
   return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
 };
 const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
-  var _a;
-  if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
+  if (!select && data.joinedShapes?.[column]) {
     return select ? `row_to_json("${column}".*) "${as}"` : `"${column}".r "${as}"`;
   }
   const col = data.shape[column];
@@ -1878,31 +1745,20 @@ const quoteSchemaAndTable = (schema, table) => {
 const pushDistinctSql = (ctx, table, distinct, quotedAs) => {
   ctx.sql.push("DISTINCT");
   if (distinct.length) {
-    const columns = distinct == null ? void 0 : distinct.map(
+    const columns = distinct?.map(
       (item) => rawOrColumnToSql(ctx, table.q, item, quotedAs)
     );
-    ctx.sql.push(`ON (${(columns == null ? void 0 : columns.join(", ")) || ""})`);
+    ctx.sql.push(`ON (${columns?.join(", ") || ""})`);
   }
 };
 
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateSet = (obj, member, value, setter) => {
-  __accessCheck(obj, member, "write to private field");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
+var __typeError = (msg) => {
+  throw TypeError(msg);
 };
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
 var _query, _query2;
 class OrchidOrmError extends Error {
 }
@@ -1910,7 +1766,7 @@ class NotFoundError extends OrchidOrmError {
   constructor(query, message = "Record is not found") {
     super(message);
     // `#query` is private to prevent it from serializing to not cause problems to test runner reports
-    __privateAdd(this, _query, void 0);
+    __privateAdd(this, _query);
     __privateSet(this, _query, query);
   }
   get query() {
@@ -1922,7 +1778,7 @@ class OrchidOrmInternalError extends Error {
   constructor(query, message) {
     super(message);
     // `#query` is private to prevent it from serializing to not cause problems to test runner reports
-    __privateAdd(this, _query2, void 0);
+    __privateAdd(this, _query2);
     __privateSet(this, _query2, query);
   }
   get query() {
@@ -1935,17 +1791,14 @@ class QueryError extends OrchidOrmInternalError {
     return this.code === "23505";
   }
   get columns() {
-    var _a;
-    if (this.columnsCache)
-      return this.columnsCache;
+    if (this.columnsCache) return this.columnsCache;
     const columns = {};
     if (this.detail) {
-      const list = (_a = this.detail.match(/\((.*)\)=/)) == null ? void 0 : _a[1];
+      const list = this.detail.match(/\((.*)\)=/)?.[1];
       if (list) {
         list.split(", ").forEach((item) => {
-          var _a2;
           const column = item.startsWith('"') ? item.slice(1, -1) : item;
-          const key = (_a2 = this.query.columnNameToKey(column)) != null ? _a2 : column;
+          const key = this.query.columnNameToKey(column) ?? column;
           columns[key] = true;
         });
       }
@@ -1985,18 +1838,16 @@ const whereToSql = (ctx, table, query, quotedAs, parens) => {
       data.and = scope.and;
       data.or = scope.or;
       const scopeSql = andOrToSql(ctx, table, data, quotedAs, true);
-      if (scopeSql)
-        sql = sql ? sql + " AND " + scopeSql : scopeSql;
+      if (scopeSql) sql = sql ? sql + " AND " + scopeSql : scopeSql;
     }
     return sql;
   }
   return andOrToSql(ctx, table, query, quotedAs, parens);
 };
 const andOrToSql = (ctx, table, query, quotedAs, parens) => {
-  var _a;
   let sql;
   if (query.or) {
-    const ors = ((_a = query.and) == null ? void 0 : _a.length) ? [query.and, ...query.or] : query.or;
+    const ors = query.and?.length ? [query.and, ...query.or] : query.or;
     sql = ors.map((and) => processAnds(and, ctx, table, query, quotedAs)).join(" OR ");
   } else if (query.and) {
     sql = processAnds(query.and, ctx, table, query, quotedAs);
@@ -2014,7 +1865,6 @@ const processAnds = (and, ctx, table, query, quotedAs, parens) => {
   return parens && ands.length > 1 ? `(${sql})` : sql;
 };
 const processWhere = (ands, ctx, table, query, data, quotedAs) => {
-  var _a, _b, _c, _d;
   if ("prototype" in data || "baseQuery" in data) {
     const query2 = data;
     if (query2.q.expr) {
@@ -2043,8 +1893,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
   }
   for (const key in data) {
     const value = data[key];
-    if (value === void 0)
-      continue;
+    if (value === void 0) continue;
     if (key === "AND") {
       const arr = toArray(value);
       ands.push(processAnds(arr, ctx, table, query, quotedAs));
@@ -2114,8 +1963,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         );
         const sql = `EXISTS (SELECT 1 FROM ${target}${on ? ` WHERE ${on}` : ""})`;
         if (joinSet) {
-          if (joinSet.has(sql))
-            continue;
+          if (joinSet.has(sql)) continue;
           joinSet.add(sql);
         }
         ands.push(sql);
@@ -2151,10 +1999,10 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             const table2 = key.slice(0, index);
             const quoted = `"${table2}"`;
             const name = key.slice(index + 1);
-            column = quotedAs === quoted ? query.shape[name] : (_b = (_a = query.joinedShapes) == null ? void 0 : _a[table2]) == null ? void 0 : _b[name];
+            column = quotedAs === quoted ? query.shape[name] : query.joinedShapes?.[table2]?.[name];
             quotedColumn = simpleColumnToSQL(ctx, query, name, column, quoted);
           } else {
-            column = (_d = (_c = query.joinedShapes) == null ? void 0 : _c[key]) == null ? void 0 : _d.value;
+            column = query.joinedShapes?.[key]?.value;
             quotedColumn = `"${key}".r`;
           }
           if (!column || !quotedColumn) {
@@ -2171,8 +2019,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             if (!operator) {
               throw new Error(`Unknown operator ${op} provided to condition`);
             }
-            if (value[op] === void 0)
-              continue;
+            if (value[op] === void 0) continue;
             ands.push(
               `${operator._op(
                 quotedColumn,
@@ -2218,25 +2065,6 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
   ands.push(`${multiple ? `(${columnsSql})` : columnsSql} IN ${value}`);
 };
 
-var __defProp$k = Object.defineProperty;
-var __defProps$b = Object.defineProperties;
-var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
-var __hasOwnProp$l = Object.prototype.hasOwnProperty;
-var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$k = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$l.call(b, prop))
-      __defNormalProp$k(a, prop, b[prop]);
-  if (__getOwnPropSymbols$l)
-    for (var prop of __getOwnPropSymbols$l(b)) {
-      if (__propIsEnum$l.call(b, prop))
-        __defNormalProp$k(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
 const processJoinItem = (ctx, table, query, args, quotedAs) => {
   let target;
   let on;
@@ -2298,18 +2126,19 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
       const whereSql = whereToSql(
         ctx,
         q,
-        __spreadProps$b(__spreadValues$k({}, q.q), {
-          joinedShapes: __spreadProps$b(__spreadValues$k(__spreadValues$k({}, query.joinedShapes), q.q.joinedShapes), {
+        {
+          ...q.q,
+          joinedShapes: {
+            ...query.joinedShapes,
+            ...q.q.joinedShapes,
             [table.q.as || table.table]: table.q.shape
-          })
-        }),
+          }
+        },
         joinAs
       );
       if (whereSql) {
-        if (on)
-          on += ` AND ${whereSql}`;
-        else
-          on = whereSql;
+        if (on) on += ` AND ${whereSql}`;
+        else on = whereSql;
       }
     }
   }
@@ -2337,8 +2166,7 @@ const getArgQueryTarget = (ctx, first, joinSubQuery, cloned) => {
 };
 const subJoinToSql = (ctx, jq, innerAs, outerAs, cloned) => {
   if (!jq.q.select && jq.q.selectAllColumns) {
-    if (!cloned)
-      jq = jq.clone();
+    if (!cloned) jq = jq.clone();
     jq.q.select = [new RawSQL(`${innerAs}.*`)];
   }
   return `(${getSqlText(
@@ -2393,7 +2221,6 @@ const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape)
   }
 };
 const pushJoinSql = (ctx, table, query, quotedAs) => {
-  var _a;
   const joinSet = query.join.length > 1 ? /* @__PURE__ */ new Set() : null;
   for (const item of query.join) {
     let sql;
@@ -2402,7 +2229,7 @@ const pushJoinSql = (ctx, table, query, quotedAs) => {
       const { aliasValue } = ctx;
       ctx.aliasValue = true;
       const as = item[2];
-      sql = `${item[0]} LATERAL (${getSqlText(q.toSQL(ctx))}) "${((_a = query.aliases) == null ? void 0 : _a[as]) || as}" ON true`;
+      sql = `${item[0]} LATERAL (${getSqlText(q.toSQL(ctx))}) "${query.aliases?.[as] || as}" ON true`;
       ctx.aliasValue = aliasValue;
     } else {
       const { target, on = "true" } = processJoinItem(
@@ -2415,8 +2242,7 @@ const pushJoinSql = (ctx, table, query, quotedAs) => {
       sql = `${item.type} ${target} ON ${on}`;
     }
     if (joinSet) {
-      if (joinSet.has(sql))
-        continue;
+      if (joinSet.has(sql)) continue;
       joinSet.add(sql);
     }
     ctx.sql.push(sql);
@@ -2447,27 +2273,7 @@ const getIsJoinSubQuery = (query) => {
   return false;
 };
 
-var __defProp$j = Object.defineProperty;
-var __defProps$a = Object.defineProperties;
-var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
-var __hasOwnProp$k = Object.prototype.hasOwnProperty;
-var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$j = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$k.call(b, prop))
-      __defNormalProp$j(a, prop, b[prop]);
-  if (__getOwnPropSymbols$k)
-    for (var prop of __getOwnPropSymbols$k(b)) {
-      if (__propIsEnum$k.call(b, prop))
-        __defNormalProp$j(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
 const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
-  var _a;
   if (typeof first === "string") {
     if (first in joinTo.relations) {
       const { query: toQuery, joinQuery } = joinTo.relations[first].relationConfig;
@@ -2487,7 +2293,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
       return { w: first, a: args };
     } else {
       const joinToQ = joinTo.q;
-      const w = (_a = joinToQ.withShapes) == null ? void 0 : _a[first];
+      const w = joinToQ.withShapes?.[first];
       if (!w) {
         throw new Error("Cannot find a `with` statement");
       }
@@ -2502,13 +2308,17 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
         logger: joinToQ.logger
       };
       j.baseQuery = j;
-      const joinedShapes = __spreadProps$a(__spreadValues$j({}, joinToQ.joinedShapes), {
+      const joinedShapes = {
+        ...joinToQ.joinedShapes,
         [joinToQ.as || joinTo.table]: joinTo.shape
-      });
+      };
       const r = args[0](
         makeJoinQueryBuilder(
           j,
-          j.q.joinedShapes ? __spreadValues$j(__spreadValues$j({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
+          j.q.joinedShapes ? {
+            ...j.q.joinedShapes,
+            ...joinedShapes
+          } : joinedShapes,
           joinTo
         )
       );
@@ -2538,16 +2348,20 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
         pushQueryArray(q, "or", query.or);
       }
       if (query.scopes) {
-        q.q.scopes = __spreadValues$j(__spreadValues$j({}, q.q.scopes), query.scopes);
+        q.q.scopes = { ...q.q.scopes, ...query.scopes };
       }
     }
-    const joinedShapes = __spreadProps$a(__spreadValues$j({}, joinTo.q.joinedShapes), {
+    const joinedShapes = {
+      ...joinTo.q.joinedShapes,
       [joinTo.q.as || joinTo.table]: joinTo.shape
-    });
+    };
     const r = args0(
       makeJoinQueryBuilder(
         q,
-        q.q.joinedShapes ? __spreadValues$j(__spreadValues$j({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
+        q.q.joinedShapes ? {
+          ...q.q.joinedShapes,
+          ...joinedShapes
+        } : joinedShapes,
         joinTo
       )
     );
@@ -2561,8 +2375,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
   };
 };
 const preprocessJoinArg = (q, arg) => {
-  if (typeof arg !== "function")
-    return arg;
+  if (typeof arg !== "function") return arg;
   arg = arg(q.relations);
   arg.joinQueryAfterCallback = arg.joinQuery;
   return arg;
@@ -2582,20 +2395,16 @@ const noneMethods = {
   async then(resolve, reject) {
     const type = this.q.returnType;
     if (!type || type === "all" || type === "rows" || type === "pluck")
-      resolve == null ? void 0 : resolve([]);
-    else if (type === "one" || type === "value" || type === "void")
-      resolve == null ? void 0 : resolve();
-    else if (type === "valueOrThrow" && this.q.returning)
-      resolve == null ? void 0 : resolve(0);
-    else
-      reject == null ? void 0 : reject(new NotFoundError(this));
+      resolve?.([]);
+    else if (type === "one" || type === "value" || type === "void") resolve?.();
+    else if (type === "valueOrThrow" && this.q.returning) resolve?.(0);
+    else reject?.(new NotFoundError(this));
   },
   // `catch` returns a Promise, so it is chainable with then/catch.
   catch: () => new Promise(noop)
 };
 const _queryNone = (q) => {
-  if (isQueryNone(q))
-    return q;
+  if (isQueryNone(q)) return q;
   q = extendQuery(q, noneMethods);
   pushQueryValue(q, "and", new RawSQL("false"));
   return q;
@@ -2693,8 +2502,7 @@ const _queryWhereIn = (q, and, arg, values, not) => {
       item[key] = { in: values2 };
     }
   }
-  if (not)
-    item = { NOT: item };
+  if (not) item = { NOT: item };
   if (and) {
     pushQueryValue(q, "and", item);
   } else {
@@ -3394,8 +3202,7 @@ const setQueryObjectValue = (q, object, key, value) => {
     q.q[object] = {
       [key]: value
     };
-  else
-    q.q[object][key] = value;
+  else q.q[object][key] = value;
   return q;
 };
 const throwIfNoWhere = (q, method) => {
@@ -3407,8 +3214,7 @@ const throwIfNoWhere = (q, method) => {
   }
 };
 const throwIfJoinLateral = (q, method) => {
-  var _a;
-  if ((_a = q.q.join) == null ? void 0 : _a.some(
+  if (q.q.join?.some(
     (x) => Array.isArray(x) || "s" in x.args && x.args.s
   )) {
     throw new OrchidOrmInternalError(
@@ -3419,7 +3225,7 @@ const throwIfJoinLateral = (q, method) => {
 };
 const saveSearchAlias = (q, as, key) => {
   const shapes = q.q[key];
-  if (shapes == null ? void 0 : shapes[as]) {
+  if (shapes?.[as]) {
     let suffix = 2;
     while (shapes[as = `${as}${suffix}`]) {
       suffix++;
@@ -3437,8 +3243,8 @@ const extendQuery = (q, methods) => {
   return cloned;
 };
 const getPrimaryKeys = (q) => {
-  var _a, _b;
-  return (_b = (_a = q.internal).primaryKeys) != null ? _b : _a.primaryKeys = collectPrimaryKeys(q);
+  var _a;
+  return (_a = q.internal).primaryKeys ?? (_a.primaryKeys = collectPrimaryKeys(q));
 };
 const collectPrimaryKeys = (q) => {
   const primaryKeys = [];
@@ -3448,8 +3254,9 @@ const collectPrimaryKeys = (q) => {
       primaryKeys.push(key);
     }
   }
-  if (q.internal.primaryKeys) {
-    primaryKeys.push(...q.internal.primaryKeys);
+  const pKeys = q.internal.primaryKeys;
+  if (pKeys) {
+    primaryKeys.push(...pKeys);
   }
   return primaryKeys;
 };
@@ -3480,28 +3287,13 @@ const _queryRows = (q) => {
   q.q.returnType = "rows";
   return q;
 };
+const getFullColumnTable = (q, column, index, as) => {
+  const table = column.slice(0, index);
+  return as && table !== as && q.q.aliases?.[table] === as ? as : table;
+};
 
-var __defProp$i = Object.defineProperty;
-var __defProps$9 = Object.defineProperties;
-var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
-var __hasOwnProp$j = Object.prototype.hasOwnProperty;
-var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$i = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$j.call(b, prop))
-      __defNormalProp$i(a, prop, b[prop]);
-  if (__getOwnPropSymbols$j)
-    for (var prop of __getOwnPropSymbols$j(b)) {
-      if (__propIsEnum$j.call(b, prop))
-        __defNormalProp$i(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
-const _join = (query, require2, type, first, args) => {
-  var _a, _b, _c, _d;
+const _join = (query, require, type, first, args) => {
+  var _a;
   let joinKey;
   let shape;
   let parsers;
@@ -3510,7 +3302,7 @@ const _join = (query, require2, type, first, args) => {
   let joinSubQuery = false;
   first = preprocessJoinArg(query, first);
   if (typeof first === "object") {
-    if (require2 && isQueryNone(first)) {
+    if (require && isQueryNone(first)) {
       return _queryNone(query);
     }
     const q2 = first;
@@ -3536,12 +3328,11 @@ const _join = (query, require2, type, first, args) => {
       batchParsers = r.q.batchParsers;
       computeds = r.q.computeds;
     } else {
-      const w = (_a = query.q.withShapes) == null ? void 0 : _a[joinKey];
-      shape = w == null ? void 0 : w.shape;
-      computeds = w == null ? void 0 : w.computeds;
+      const w = query.q.withShapes?.[joinKey];
+      shape = w?.shape;
+      computeds = w?.computeds;
       if (shape) {
-        if (!require2)
-          shape = __spreadValues$i({}, shape);
+        if (!require) shape = { ...shape };
         const arg = { parsers: {} };
         for (const key in shape) {
           addColumnParserToQuery(arg, key, shape[key]);
@@ -3556,7 +3347,7 @@ const _join = (query, require2, type, first, args) => {
     joinSubQuery
   );
   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;
+    const j = "j" in joinArgs ? joinArgs.r ?? joinArgs.j : "r" in joinArgs ? joinArgs.r : joinArgs.q;
     if (j.q.select || !j.q.selectAllColumns) {
       const shape2 = getShapeFromSelect(j, true);
       setQueryObjectValue(
@@ -3572,7 +3363,7 @@ const _join = (query, require2, type, first, args) => {
         j.q.parsers
       );
       if (j.q.batchParsers) {
-        ((_d = (_c = query.q).joinedBatchParsers) != null ? _d : _c.joinedBatchParsers = {})[joinKey] = j.q.batchParsers;
+        ((_a = query.q).joinedBatchParsers ?? (_a.joinedBatchParsers = {}))[joinKey] = j.q.batchParsers;
       }
       setQueryObjectValue(
         query,
@@ -3590,7 +3381,7 @@ const _join = (query, require2, type, first, args) => {
         computeds
       );
     }
-  } else if (require2 && "r" in joinArgs && isQueryNone(joinArgs.r)) {
+  } else if (require && "r" in joinArgs && isQueryNone(joinArgs.r)) {
     return _queryNone(query);
   } else {
     addAllShapesAndParsers(
@@ -3612,13 +3403,12 @@ const _join = (query, require2, type, first, args) => {
   return q;
 };
 const addAllShapesAndParsers = (query, joinKey, shape, parsers, batchParsers, computeds) => {
-  var _a, _b;
-  if (!joinKey)
-    return;
+  var _a;
+  if (!joinKey) return;
   setQueryObjectValue(query, "joinedShapes", joinKey, shape);
   setQueryObjectValue(query, "joinedParsers", joinKey, parsers);
   if (batchParsers) {
-    ((_b = (_a = query.q).joinedBatchParsers) != null ? _b : _a.joinedBatchParsers = {})[joinKey] = batchParsers;
+    ((_a = query.q).joinedBatchParsers ?? (_a.joinedBatchParsers = {}))[joinKey] = batchParsers;
   }
   setQueryObjectValue(
     query,
@@ -3628,7 +3418,7 @@ const addAllShapesAndParsers = (query, joinKey, shape, parsers, batchParsers, co
   );
 };
 const _joinLateral = (self, type, arg, cb, as) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c;
   const q = self;
   let relation;
   if (typeof arg === "string") {
@@ -3636,15 +3426,16 @@ const _joinLateral = (self, type, arg, cb, as) => {
     if (relation) {
       arg = _clone(relation.relationConfig.query);
     } else {
-      const w = (_a = q.q.withShapes) == null ? void 0 : _a[arg];
+      const w = q.q.withShapes?.[arg];
       if (w) {
         const t = Object.create(q.queryBuilder);
         t.table = arg;
         t.shape = w.shape;
         t.computeds = w.computeds;
-        t.q = __spreadProps$9(__spreadValues$i({}, t.q), {
+        t.q = {
+          ...t.q,
           shape: w.shape
-        });
+        };
         t.baseQuery = t;
         arg = t;
       }
@@ -3653,7 +3444,7 @@ const _joinLateral = (self, type, arg, cb, as) => {
   const query = arg;
   query.q.joinTo = q;
   const joinedAs = getQueryAs(q);
-  ((_c = (_b = query.q).joinedShapes) != null ? _c : _b.joinedShapes = {})[joinedAs] = q.q.shape;
+  ((_a = query.q).joinedShapes ?? (_a.joinedShapes = {}))[joinedAs] = q.q.shape;
   let result = resolveSubQueryCallback(query, cb);
   if (relation) {
     result = relation.relationConfig.joinQuery(
@@ -3667,11 +3458,11 @@ const _joinLateral = (self, type, arg, cb, as) => {
     setQueryObjectValue(q, "joinedShapes", joinKey, shape);
     setQueryObjectValue(q, "joinedParsers", joinKey, result.q.parsers);
     if (result.q.batchParsers) {
-      ((_e = (_d = q.q).joinedBatchParsers) != null ? _e : _d.joinedBatchParsers = {})[joinKey] = result.q.batchParsers;
+      ((_b = q.q).joinedBatchParsers ?? (_b.joinedBatchParsers = {}))[joinKey] = result.q.batchParsers;
     }
   }
   as || (as = getQueryAs(result));
-  ((_g = (_f = q.q).joinedComputeds) != null ? _g : _f.joinedComputeds = {})[as] = result.q.computeds;
+  ((_c = q.q).joinedComputeds ?? (_c.joinedComputeds = {}))[as] = result.q.computeds;
   return pushQueryValue(q, "join", [type, result, as]);
 };
 
@@ -3735,11 +3526,9 @@ const parsePostgresArray = (source, entries, transform) => {
   let pos = 0;
   if (source[0] === "[") {
     pos = source.indexOf("=") + 1;
-    if (!pos)
-      pos = source.length;
+    if (!pos) pos = source.length;
   }
-  if (source[pos] === "{")
-    pos++;
+  if (source[pos] === "{") pos++;
   let recorded = "";
   while (pos < source.length) {
     const character = source[pos++];
@@ -3760,8 +3549,7 @@ const parsePostgresArray = (source, entries, transform) => {
       while (pos < source.length) {
         let char;
         while ((char = source[pos++]) === "\\") {
-          if (!(esc = !esc))
-            rec += "\\";
+          if (!(esc = !esc)) rec += "\\";
         }
         if (esc) {
           esc = false;
@@ -4048,20 +3836,14 @@ const defaultSchemaConfig = {
 
 const escape = (value, migration, nested) => {
   const type = typeof value;
-  if (type === "number" || type === "bigint")
-    return String(value);
-  else if (type === "string")
-    return escapeString(value);
-  else if (type === "boolean")
-    return value ? "true" : "false";
-  else if (value instanceof Date)
-    return `'${value.toISOString()}'`;
+  if (type === "number" || type === "bigint") return String(value);
+  else if (type === "string") return escapeString(value);
+  else if (type === "boolean") return value ? "true" : "false";
+  else if (value instanceof Date) return `'${value.toISOString()}'`;
   else if (Array.isArray(value))
     return migration && nested && !value.length ? "" : (migration ? nested ? "{" : "'{" : nested ? "[" : "ARRAY[") + value.map((el) => escape(el, migration, true)).join(",") + (migration ? nested ? "}" : "}'" : "]");
-  else if (value === null || value === void 0)
-    return "NULL";
-  else
-    return escapeString(JSON.stringify(value));
+  else if (value === null || value === void 0) return "NULL";
+  else return escapeString(JSON.stringify(value));
 };
 const escapeForLog = (value) => escape(value);
 const escapeForMigration = (value) => escape(value, true);
@@ -4071,15 +3853,14 @@ const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values
   const elapsed = process.hrtime(time);
   const formattedTime = `(${elapsed[0] ? `${elapsed[0]}s ` : ""}${(elapsed[1] / 1e6).toFixed(1)}ms)`;
   const result = `${colors ? timeColor(formattedTime) : formattedTime} ${colors ? sqlColor(sql) : sql}`;
-  if (!(values == null ? void 0 : values.length)) {
+  if (!values?.length) {
     return result;
   }
   const formattedValues = `[${values.map(escapeForLog).join(", ")}]`;
   return `${result} ${colors ? valuesColor(formattedValues) : formattedValues}`;
 };
 const logParamToLogObject = (logger, log) => {
-  if (!log)
-    return;
+  if (!log) return;
   const logObject = Object.assign(
     {
       colors: true,
@@ -4127,25 +3908,6 @@ class QueryLog {
   }
 }
 
-var __defProp$h = Object.defineProperty;
-var __defProps$8 = Object.defineProperties;
-var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
-var __hasOwnProp$i = Object.prototype.hasOwnProperty;
-var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$h = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$i.call(b, prop))
-      __defNormalProp$h(a, prop, b[prop]);
-  if (__getOwnPropSymbols$i)
-    for (var prop of __getOwnPropSymbols$i(b)) {
-      if (__propIsEnum$i.call(b, prop))
-        __defNormalProp$h(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
 const commitSql$1 = {
   text: "COMMIT"
 };
@@ -4169,7 +3931,6 @@ const _afterCommitError = (result, hookResults, catchAfterCommitError) => {
 };
 class Transaction {
   async transaction(cbOrOptions, cb) {
-    var _a;
     let options;
     let fn;
     if (typeof cbOrOptions === "function") {
@@ -4182,15 +3943,13 @@ class Transaction {
     const sql = {
       values: emptyArray
     };
-    const log = options.log !== void 0 ? (_a = this.q.log) != null ? _a : logParamToLogObject(this.q.logger, options.log) : this.q.log;
+    const log = options.log !== void 0 ? this.q.log ?? logParamToLogObject(this.q.logger, options.log) : this.q.log;
     let logData;
     let trx = this.internal.transactionStorage.getStore();
     const transactionId = trx ? trx.transactionId + 1 : 0;
     const callback = (adapter) => {
-      if (log)
-        log.afterQuery(sql, logData);
-      if (log)
-        logData = log.beforeQuery(commitSql$1);
+      if (log) log.afterQuery(sql, logData);
+      if (log) logData = log.beforeQuery(commitSql$1);
       if (trx) {
         trx.transactionId = transactionId;
         return fn();
@@ -4206,15 +3965,12 @@ class Transaction {
     };
     if (!trx) {
       sql.text = `BEGIN${options.level ? ` ISOLATION LEVEL ${options.level}` : ""}${options.readOnly !== void 0 ? ` READ ${options.readOnly ? "ONLY" : "WRITE"}` : ""}${options.deferrable !== void 0 ? ` ${options.deferrable ? "" : "NOT "}DEFERRABLE` : ""}`;
-      if (log)
-        logData = log.beforeQuery(sql);
+      if (log) logData = log.beforeQuery(sql);
       const result = await this.q.adapter.transaction(sql, callback).catch((err) => {
-        if (log)
-          log.afterQuery(rollbackSql$1, logData);
+        if (log) log.afterQuery(rollbackSql$1, logData);
         throw err;
       });
-      if (log)
-        log.afterQuery(commitSql$1, logData);
+      if (log) log.afterQuery(commitSql$1, logData);
       await runAfterCommit(
         trx.afterCommit,
         result
@@ -4223,8 +3979,7 @@ class Transaction {
     } else {
       try {
         sql.text = `SAVEPOINT "${transactionId}"`;
-        if (log)
-          logData = log.beforeQuery(sql);
+        if (log) logData = log.beforeQuery(sql);
         const { adapter } = trx;
         await adapter.query(sql);
         let result;
@@ -4232,19 +3987,15 @@ class Transaction {
           result = await callback(adapter);
         } catch (err) {
           sql.text = `ROLLBACK TO SAVEPOINT "${transactionId}"`;
-          if (log)
-            logData = log.beforeQuery(sql);
+          if (log) logData = log.beforeQuery(sql);
           await adapter.query(sql);
-          if (log)
-            log.afterQuery(sql, logData);
+          if (log) log.afterQuery(sql, logData);
           throw err;
         }
         sql.text = `RELEASE SAVEPOINT "${transactionId}"`;
-        if (log)
-          logData = log.beforeQuery(sql);
+        if (log) logData = log.beforeQuery(sql);
         await adapter.query(sql);
-        if (log)
-          log.afterQuery(sql, logData);
+        if (log) log.afterQuery(sql, logData);
         if (transactionId === trx.testTransactionCount) {
           await runAfterCommit(
             trx.afterCommit,
@@ -4279,8 +4030,7 @@ class Transaction {
    */
   ensureTransaction(cb) {
     const trx = this.internal.transactionStorage.getStore();
-    if (trx)
-      return cb();
+    if (trx) return cb();
     return Transaction.prototype.transaction.call(this, cb);
   }
   isInTransaction() {
@@ -4312,9 +4062,10 @@ const runAfterCommit = async (afterCommit, result) => {
       let r = 0;
       for (let i = 0, len = afterCommit.length; i < len; i += 3) {
         for (const fn of afterCommit[i + 2]) {
-          resultsWithNames.push(__spreadProps$8(__spreadValues$h({}, hookResults[r++]), {
+          resultsWithNames.push({
+            ...hookResults[r++],
             name: fn.name
-          }));
+          });
         }
       }
       _afterCommitError(result, resultsWithNames, catchAfterCommitError);
@@ -4334,7 +4085,6 @@ const applyBatchTransforms = (query, batches) => {
   }
 };
 const finalizeNestedHookSelect = (batches, returnType, tempColumns, renames, key) => {
-  var _a;
   if (renames) {
     for (const { data } of batches) {
       for (const record of data) {
@@ -4346,7 +4096,7 @@ const finalizeNestedHookSelect = (batches, returnType, tempColumns, renames, key
       }
     }
   }
-  if (tempColumns == null ? void 0 : tempColumns.size) {
+  if (tempColumns?.size) {
     for (const { data } of batches) {
       for (const record of data) {
         if (record) {
@@ -4369,30 +4119,11 @@ const finalizeNestedHookSelect = (batches, returnType, tempColumns, renames, key
     }
   } else if (returnType === "value" || returnType === "valueOrThrow") {
     for (const item of batches) {
-      item.parent[item.key] = (_a = item.data[0]) == null ? void 0 : _a[key];
+      item.parent[item.key] = item.data[0]?.[key];
     }
   }
 };
 
-var __defProp$g = Object.defineProperty;
-var __defProps$7 = Object.defineProperties;
-var __getOwnPropDescs$7 = 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) => {
-  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]);
-    }
-  return a;
-};
-var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 class ComputedColumn {
   constructor(kind, deps, fn) {
     this.kind = kind;
@@ -4409,9 +4140,10 @@ const applyComputedColumns = (q, fn) => {
   for (const key in computed) {
     const item = computed[key];
     if (item instanceof ComputedColumn) {
-      q.q.computeds = __spreadProps$7(__spreadValues$g({}, q.q.computeds), {
+      q.q.computeds = {
+        ...q.q.computeds,
         [key]: item
-      });
+      };
     } else {
       const data = (q.shape[key] = item.result.value || UnknownColumn.instance).data;
       data.computed = item;
@@ -4433,7 +4165,7 @@ const processComputedResult = (query, result) => {
       if (Array.isArray(res)) {
         saveBatchComputed(key, result, res);
       } else {
-        (promises != null ? promises : promises = []).push(
+        (promises ?? (promises = [])).push(
           res.then(
             (res2) => saveBatchComputed(key, result, res2)
           )
@@ -4441,8 +4173,7 @@ const processComputedResult = (query, result) => {
       }
     }
   }
-  if (!promises)
-    return;
+  if (!promises) return;
   return Promise.all(promises);
 };
 const processComputedBatches = (query, batches, originalReturnType, returnType, tempColumns, renames, key) => {
@@ -4478,7 +4209,7 @@ const processComputedBatches = (query, batches, originalReturnType, returnType,
         if (Array.isArray(res)) {
           saveBatchComputed(key2, data, res, blanks);
         } else {
-          (promises != null ? promises : promises = []).push(
+          (promises ?? (promises = [])).push(
             res.then(
               (res2) => saveBatchComputed(key2, data, res2, blanks)
             )
@@ -4487,8 +4218,7 @@ const processComputedBatches = (query, batches, originalReturnType, returnType,
       }
     }
   }
-  if (!promises)
-    return;
+  if (!promises) return;
   return Promise.all(promises).then(() => {
     finalizeNestedHookSelect(
       batches,
@@ -4502,7 +4232,7 @@ const processComputedBatches = (query, batches, originalReturnType, returnType,
 };
 const saveBatchComputed = (key, result, res, blanks) => {
   const len = result.length;
-  const actual = res.length + ((blanks == null ? void 0 : blanks.size) || 0);
+  const actual = res.length + (blanks?.size || 0);
   if (len !== actual) {
     throw new Error(
       `Incorrect length of batch computed result for column ${key}. Expected ${len}, received ${actual}.`
@@ -4521,25 +4251,6 @@ const saveBatchComputed = (key, result, res, blanks) => {
   }
 };
 
-var __defProp$f = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = 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) => {
-  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]);
-    }
-  return a;
-};
-var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
 const queryMethodByReturnType = {
   undefined: "query",
   all: "query",
@@ -4562,11 +4273,9 @@ let getThen;
 if (process.versions.bun) {
   getThen = function() {
     queryError = new Error();
-    if (!this.internal)
-      return maybeWrappedThen;
+    if (!this.internal) return maybeWrappedThen;
     const trx = this.internal.transactionStorage.getStore();
-    if (!trx)
-      return maybeWrappedThen;
+    if (!trx) return maybeWrappedThen;
     return (resolve, reject) => {
       return this.internal.transactionStorage.run(trx, () => {
         return maybeWrappedThen.call(this, resolve, reject);
@@ -4628,7 +4337,7 @@ function maybeWrappedThen(resolve, reject) {
   } else {
     return then(
       this,
-      (trx == null ? void 0 : trx.adapter) || this.q.adapter,
+      trx?.adapter || this.q.adapter,
       trx,
       beforeHooks,
       afterHooks,
@@ -4645,11 +4354,10 @@ const callAfterHook = function(cb) {
 };
 const beginSql = { text: "BEGIN" };
 const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject) => {
-  var _a, _b, _c;
   const { q: query } = q;
   let sql;
   let logData;
-  const log = (_a = trx == null ? void 0 : trx.log) != null ? _a : query.log;
+  const log = trx?.log ?? query.log;
   const localError = queryError;
   try {
     if (beforeHooks || query.before) {
@@ -4685,11 +4393,9 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     } else {
       const queryMethod = queryMethodByReturnType[tempReturnType];
       if (!trx) {
-        if (log)
-          logData = log.beforeQuery(beginSql);
+        if (log) logData = log.beforeQuery(beginSql);
         await adapter.arrays(beginSql);
-        if (log)
-          log.afterQuery(beginSql, logData);
+        if (log) log.afterQuery(beginSql, logData);
       }
       for (const item of sql.batch) {
         sql = item;
@@ -4709,11 +4415,9 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         }
       }
       if (!trx) {
-        if (log)
-          logData = log.beforeQuery(commitSql$1);
+        if (log) logData = log.beforeQuery(commitSql$1);
         await adapter.arrays(commitSql$1);
-        if (log)
-          log.afterQuery(commitSql$1, logData);
+        if (log) log.afterQuery(commitSql$1, logData);
       }
       if (query.patchResult) {
         await query.patchResult(q, queryResult);
@@ -4728,9 +4432,8 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     if (hookSelect) {
       for (const column of hookSelect.keys()) {
         const as = hookSelect.get(column).as;
-        if (as)
-          (renames != null ? renames : renames = {})[column] = as;
-        (_b = tempColumns != null ? tempColumns : tempColumns = /* @__PURE__ */ new Set()) == null ? void 0 : _b.add(as || column);
+        if (as) (renames ?? (renames = {}))[column] = as;
+        (tempColumns ?? (tempColumns = /* @__PURE__ */ new Set()))?.add(as || column);
       }
       if (renames) {
         for (const record of result) {
@@ -4743,8 +4446,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
       }
       if (query.selectedComputeds) {
         const promise = processComputedResult(query, result);
-        if (promise)
-          await promise;
+        if (promise) await promise;
       }
     }
     const hasAfterHook = afterHooks || afterCommitHooks || query.after;
@@ -4762,7 +4464,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         if (afterCommitHooks) {
           if (trx && // when inside test transactions, push to a transaction only unless it's the outer user transaction.
           (!trx.testTransactionCount || trx.transactionId + 1 > trx.testTransactionCount)) {
-            ((_c = trx.afterCommit) != null ? _c : trx.afterCommit = []).push(
+            (trx.afterCommit ?? (trx.afterCommit = [])).push(
               result,
               q,
               afterCommitHooks
@@ -4782,7 +4484,8 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
             if (hookResults.some((result2) => result2.status === "rejected")) {
               _afterCommitError(
                 result,
-                hookResults.map((result2, i) => __spreadProps$6(__spreadValues$f({}, result2), {
+                hookResults.map((result2, i) => ({
+                  ...result2,
                   name: afterCommitHooks[i].name
                 })),
                 q.q.catchAfterCommitError
@@ -4816,7 +4519,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     if (query.transform) {
       result = applyTransforms(returnType, query.transform, result);
     }
-    return resolve == null ? void 0 : resolve(result);
+    return resolve?.(result);
   } catch (err) {
     let error;
     if (err instanceof pg.DatabaseError) {
@@ -4842,7 +4545,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     if (log && sql) {
       log.onError(error, sql, logData);
     }
-    return reject == null ? void 0 : reject(error);
+    return reject?.(error);
   }
 };
 const assignError = (to, from) => {
@@ -4868,7 +4571,6 @@ const assignError = (to, from) => {
   return to;
 };
 const handleResult = (q, returnType, result, isSubQuery) => {
-  var _a, _b;
   const { parsers } = q.q;
   switch (returnType) {
     case "all": {
@@ -4885,20 +4587,16 @@ const handleResult = (q, returnType, result, isSubQuery) => {
     }
     case "one": {
       const { rows } = result;
-      if (!rows.length)
-        return;
+      if (!rows.length) return;
       const promise = parseBatch(q, result);
-      if (parsers)
-        parseRecord(parsers, rows[0]);
+      if (parsers) parseRecord(parsers, rows[0]);
       return promise ? promise.then(() => rows[0]) : rows[0];
     }
     case "oneOrThrow": {
       const { rows } = result;
-      if (!rows.length)
-        throw new NotFoundError(q);
+      if (!rows.length) throw new NotFoundError(q);
       const promise = parseBatch(q, result);
-      if (parsers)
-        parseRecord(parsers, rows[0]);
+      if (parsers) parseRecord(parsers, rows[0]);
       return promise ? promise.then(() => rows[0]) : rows[0];
     }
     case "rows": {
@@ -4906,8 +4604,7 @@ const handleResult = (q, returnType, result, isSubQuery) => {
       const promise = parseBatch(q, result);
       if (promise) {
         return promise.then(() => {
-          if (parsers)
-            parseRows(parsers, result.fields, rows);
+          if (parsers) parseRows(parsers, result.fields, rows);
           return rows;
         });
       } else if (parsers) {
@@ -4932,11 +4629,10 @@ const handleResult = (q, returnType, result, isSubQuery) => {
       const promise = parseBatch(q, result);
       if (promise) {
         return promise.then(() => {
-          var _a2;
-          return ((_a2 = rows[0]) == null ? void 0 : _a2[0]) !== void 0 ? parseValue(rows[0][0], parsers) : q.q.notFoundDefault;
+          return rows[0]?.[0] !== void 0 ? parseValue(rows[0][0], parsers) : q.q.notFoundDefault;
         });
       }
-      return ((_a = rows[0]) == null ? void 0 : _a[0]) !== void 0 ? parseValue(rows[0][0], parsers) : q.q.notFoundDefault;
+      return rows[0]?.[0] !== void 0 ? parseValue(rows[0][0], parsers) : q.q.notFoundDefault;
     }
     case "valueOrThrow": {
       if (q.q.returning) {
@@ -4949,14 +4645,11 @@ const handleResult = (q, returnType, result, isSubQuery) => {
       const promise = parseBatch(q, result);
       if (promise) {
         return promise.then(() => {
-          var _a2;
-          if (((_a2 = rows[0]) == null ? void 0 : _a2[0]) === void 0)
-            throw new NotFoundError(q);
+          if (rows[0]?.[0] === void 0) throw new NotFoundError(q);
           return parseValue(rows[0][0], parsers);
         });
       }
-      if (((_b = rows[0]) == null ? void 0 : _b[0]) === void 0)
-        throw new NotFoundError(q);
+      if (rows[0]?.[0] === void 0) throw new NotFoundError(q);
       return parseValue(rows[0][0], parsers);
     }
     case "void": {
@@ -4969,8 +4662,7 @@ const parseBatch = (q, queryResult) => {
   if (q.q.batchParsers) {
     for (const parser of q.q.batchParsers) {
       const res = parser.fn(parser.path, queryResult);
-      if (res)
-        (promises != null ? promises : promises = []).push(res);
+      if (res) (promises ?? (promises = [])).push(res);
     }
   }
   return promises && Promise.all(promises);
@@ -4994,7 +4686,7 @@ const parseRows = (parsers, fields, rows) => {
   }
 };
 const parsePluck = (parsers, isSubQuery, rows) => {
-  const pluck = parsers == null ? void 0 : parsers.pluck;
+  const pluck = parsers?.pluck;
   if (pluck) {
     for (let i = 0; i < rows.length; i++) {
       rows[i] = pluck(isSubQuery ? rows[i] : rows[i][0]);
@@ -5006,25 +4698,22 @@ const parsePluck = (parsers, isSubQuery, rows) => {
   }
 };
 const parseValue = (value, parsers) => {
-  const parser = parsers == null ? void 0 : parsers[getValueKey];
+  const parser = parsers?.[getValueKey];
   return parser ? parser(value) : value;
 };
 const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterHook) => {
-  var _a;
   if (returnType === "all") {
     return filterAllResult(result, tempColumns, hasAfterHook);
   }
   if (returnType === "oneOrThrow" || returnType === "one") {
     let row = result[0];
     if (!row) {
-      if (returnType === "oneOrThrow")
-        throw new NotFoundError(q);
+      if (returnType === "oneOrThrow") throw new NotFoundError(q);
       return void 0;
-    } else if (!(tempColumns == null ? void 0 : tempColumns.size)) {
+    } else if (!tempColumns?.size) {
       return row;
     } else {
-      if (hasAfterHook)
-        row = __spreadValues$f({}, row);
+      if (hasAfterHook) row = { ...row };
       for (const column of tempColumns) {
         delete row[column];
       }
@@ -5032,15 +4721,14 @@ const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterH
     }
   }
   if (returnType === "value") {
-    return (_a = result[0]) == null ? void 0 : _a[getFirstResultKey(q, queryResult)];
+    return result[0]?.[getFirstResultKey(q, queryResult)];
   }
   if (returnType === "valueOrThrow") {
     if (q.q.returning) {
       return queryResult.rowCount;
     }
     const row = result[0];
-    if (!row)
-      throw new NotFoundError(q);
+    if (!row) throw new NotFoundError(q);
     return row[getFirstResultKey(q, queryResult)];
   }
   if (returnType === "pluck") {
@@ -5064,10 +4752,10 @@ const getFirstResultKey = (q, queryResult) => {
   return;
 };
 const filterAllResult = (result, tempColumns, hasAfterHook) => {
-  if (tempColumns == null ? void 0 : tempColumns.size) {
+  if (tempColumns?.size) {
     if (hasAfterHook) {
       return result.map((data) => {
-        const record = __spreadValues$f({}, data);
+        const record = { ...data };
         for (const key of tempColumns) {
           delete record[key];
         }
@@ -5084,38 +4772,18 @@ const filterAllResult = (result, tempColumns, hasAfterHook) => {
   return result;
 };
 
-var __defProp$e = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = 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) => {
-  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]);
-    }
-  return a;
-};
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const addParserForRawExpression = (q, key, raw) => {
-  if (raw.result.value)
-    addColumnParserToQuery(q.q, key, raw.result.value);
+  if (raw.result.value) addColumnParserToQuery(q.q, key, raw.result.value);
 };
 const addParsersForSelectJoined = (q, arg, as = arg) => {
-  var _a, _b, _c, _d;
-  const parsers = (_a = q.q.joinedParsers) == null ? void 0 : _a[arg];
+  var _a;
+  const parsers = q.q.joinedParsers?.[arg];
   if (parsers) {
     setParserToQuery(q.q, as, (row) => parseRecord(parsers, row));
   }
-  const batchParsers = (_b = q.q.joinedBatchParsers) == null ? void 0 : _b[arg];
+  const batchParsers = q.q.joinedBatchParsers?.[arg];
   if (batchParsers) {
-    ((_d = (_c = q.q).batchParsers) != null ? _d : _c.batchParsers = []).push(
+    ((_a = q.q).batchParsers ?? (_a.batchParsers = [])).push(
       ...batchParsers.map((x) => ({
         path: [as, ...x.path],
         fn: x.fn
@@ -5124,21 +4792,20 @@ const addParsersForSelectJoined = (q, arg, as = arg) => {
   }
 };
 const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b;
   if (typeof arg === "object" || typeof arg === "function") {
     const { q: query } = arg;
     if (query.batchParsers) {
-      const batchParsers = (_b = (_a = q.q).batchParsers) != null ? _b : _a.batchParsers = [];
+      const batchParsers = (_a = q.q).batchParsers ?? (_a.batchParsers = []);
       for (const bp of query.batchParsers) {
         batchParsers.push({ path: [key, ...bp.path], fn: bp.fn });
       }
     }
     if (query.hookSelect || query.parsers || query.transform) {
-      const batchParsers = (_d = (_c = q.q).batchParsers) != null ? _d : _c.batchParsers = [];
+      const batchParsers = (_b = q.q).batchParsers ?? (_b.batchParsers = []);
       batchParsers.push({
         path: [key],
         fn: (path, queryResult) => {
-          var _a2, _b2, _c2;
           const { rows } = queryResult;
           const originalReturnType = query.returnType || "all";
           let returnType = originalReturnType;
@@ -5175,20 +4842,17 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
               if (parsers) {
                 if (returnType === "one") {
                   for (const { data } of batches) {
-                    if (data)
-                      parseRecord(parsers, data);
+                    if (data) parseRecord(parsers, data);
                   }
                 } else {
                   for (const { data } of batches) {
-                    if (!data)
-                      throw new NotFoundError(arg);
+                    if (!data) throw new NotFoundError(arg);
                     parseRecord(parsers, data);
                   }
                 }
               } else if (returnType !== "one") {
                 for (const { data } of batches) {
-                  if (!data)
-                    throw new NotFoundError(arg);
+                  if (!data) throw new NotFoundError(arg);
                 }
               }
               if (hookSelect) {
@@ -5199,7 +4863,7 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
               break;
             }
             case "pluck": {
-              const parse = (_a2 = query.parsers) == null ? void 0 : _a2.pluck;
+              const parse = query.parsers?.pluck;
               if (parse) {
                 for (const { data } of batches) {
                   for (let i = 0; i < data.length; i++) {
@@ -5211,7 +4875,7 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
             }
             case "value":
             case "valueOrThrow": {
-              const parse = (_b2 = query.parsers) == null ? void 0 : _b2[getValueKey];
+              const parse = query.parsers?.[getValueKey];
               if (parse) {
                 if (returnType === "value") {
                   for (const item of batches) {
@@ -5226,8 +4890,7 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
                 }
               } else if (returnType !== "value") {
                 for (const { data } of batches) {
-                  if (data === void 0)
-                    throw new NotFoundError(arg);
+                  if (data === void 0) throw new NotFoundError(arg);
                 }
               }
               if (hookSelect) {
@@ -5243,9 +4906,8 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
             let renames;
             for (const column of hookSelect.keys()) {
               const as2 = hookSelect.get(column).as;
-              if (as2)
-                (renames != null ? renames : renames = {})[column] = as2;
-              (_c2 = tempColumns != null ? tempColumns : tempColumns = /* @__PURE__ */ new Set()) == null ? void 0 : _c2.add(as2 || column);
+              if (as2) (renames ?? (renames = {}))[column] = as2;
+              (tempColumns ?? (tempColumns = /* @__PURE__ */ new Set()))?.add(as2 || column);
             }
             if (renames) {
               for (const { data } of batches) {
@@ -5270,8 +4932,7 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
                 renames,
                 key
               );
-              if (maybePromise)
-                return maybePromise;
+              if (maybePromise) return maybePromise;
             }
             finalizeNestedHookSelect(
               batches,
@@ -5286,7 +4947,7 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
         }
       });
     }
-    if (!joinQuery && ((_e = arg.q) == null ? void 0 : _e.subQuery) && arg.q.expr) {
+    if (!joinQuery && arg.q?.subQuery && arg.q.expr) {
       arg = arg.q.expr;
     }
     if (isExpression(arg)) {
@@ -5326,7 +4987,6 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
 };
 const emptyArrSQL = new RawSQL("'[]'");
 const processSelectArg = (q, as, arg, columnAs) => {
-  var _a;
   if (typeof arg === "string") {
     return setParserForSelectedString(q, arg, as, columnAs);
   }
@@ -5369,10 +5029,10 @@ const processSelectArg = (q, as, arg, columnAs) => {
             query = value;
           }
         }
-        const asOverride = (_a = value.q.aliases[key]) != null ? _a : key;
+        const asOverride = value.q.aliases[key] ?? key;
         value.q.joinedForSelect = asOverride;
         if (asOverride !== key) {
-          aliases = __spreadProps$5(__spreadValues$e({}, q.q.aliases), { [key]: asOverride });
+          aliases = { ...q.q.aliases, [key]: asOverride };
         }
         _joinLateral(
           q,
@@ -5383,8 +5043,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
         );
       }
     }
-    if (aliases)
-      q.q.aliases = aliases;
+    if (aliases) q.q.aliases = aliases;
     selectAs[key] = addParserForSelectItem(
       q,
       as,
@@ -5396,65 +5055,63 @@ const processSelectArg = (q, as, arg, columnAs) => {
   return { selectAs };
 };
 const setParserForSelectedString = (q, arg, as, columnAs) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b;
   const index = arg.indexOf(".");
   if (index !== -1) {
-    const table = arg.slice(0, index);
+    const table = getFullColumnTable(q, arg, index, as);
     const column = arg.slice(index + 1);
     if (column === "*") {
       addParsersForSelectJoined(q, table, columnAs);
       return table === as ? column : arg;
-    } else if (table === as) {
+    }
+    if (table === as) {
       if (columnAs) {
-        const parser = (_a = q.q.parsers) == null ? void 0 : _a[column];
-        if (parser)
-          q.q.parsers[columnAs] = parser;
+        const parser2 = q.q.parsers?.[column];
+        if (parser2) q.q.parsers[columnAs] = parser2;
       }
       return handleComputed(q, q.q.computeds, column);
-    } else {
-      const parser = (_c = (_b = q.q.joinedParsers) == null ? void 0 : _b[table]) == null ? void 0 : _c[column];
-      if (parser)
-        setParserToQuery(q.q, columnAs || column, parser);
-      const batchParsers = (_d = q.q.joinedBatchParsers) == null ? void 0 : _d[table];
-      if (batchParsers) {
-        for (const bp of batchParsers) {
-          if (bp.path[0] === column) {
-            ((_f = (_e = q.q).batchParsers) != null ? _f : _e.batchParsers = []).push(bp);
-          }
+    }
+    const parser = q.q.joinedParsers?.[table]?.[column];
+    if (parser) setParserToQuery(q.q, columnAs || column, parser);
+    const batchParsers = q.q.joinedBatchParsers?.[table];
+    if (batchParsers) {
+      for (const bp of batchParsers) {
+        if (bp.path[0] === column) {
+          ((_a = q.q).batchParsers ?? (_a.batchParsers = [])).push(bp);
         }
       }
-      const computeds = (_g = q.q.joinedComputeds) == null ? void 0 : _g[table];
-      if (computeds == null ? void 0 : computeds[column]) {
-        const computed = computeds[column];
-        const map = (_i = (_h = q.q).hookSelect) != null ? _i : _h.hookSelect = /* @__PURE__ */ new Map();
-        for (const column2 of computed.deps) {
-          map.set(column2, { select: `${table}.${column2}` });
-        }
-        q.q.selectedComputeds = __spreadProps$5(__spreadValues$e({}, q.q.selectedComputeds), {
-          [column]: computed
-        });
-        return;
+    }
+    const computeds = q.q.joinedComputeds?.[table];
+    if (computeds?.[column]) {
+      const computed = computeds[column];
+      const map = (_b = q.q).hookSelect ?? (_b.hookSelect = /* @__PURE__ */ new Map());
+      for (const column2 of computed.deps) {
+        map.set(column2, { select: `${table}.${column2}` });
       }
-      return arg;
+      q.q.selectedComputeds = {
+        ...q.q.selectedComputeds,
+        [column]: computed
+      };
+      return;
     }
+    return arg;
   } else {
     if (columnAs) {
-      const parser = (_j = q.q.parsers) == null ? void 0 : _j[arg];
-      if (parser)
-        q.q.parsers[columnAs] = parser;
+      const parser = q.q.parsers?.[arg];
+      if (parser) q.q.parsers[columnAs] = parser;
     }
     return handleComputed(q, q.q.computeds, arg);
   }
 };
 const handleComputed = (q, computeds, column) => {
-  var _a, _b;
-  if (computeds == null ? void 0 : computeds[column]) {
+  var _a;
+  if (computeds?.[column]) {
     const computed = computeds[column];
-    const map = (_b = (_a = q.q).hookSelect) != null ? _b : _a.hookSelect = /* @__PURE__ */ new Map();
+    const map = (_a = q.q).hookSelect ?? (_a.hookSelect = /* @__PURE__ */ new Map());
     for (const column2 of computed.deps) {
       map.set(column2, { select: column2 });
     }
-    q.q.selectedComputeds = __spreadProps$5(__spreadValues$e({}, q.q.selectedComputeds), { [column]: computed });
+    q.q.selectedComputeds = { ...q.q.selectedComputeds, [column]: computed };
     return;
   }
   return column;
@@ -5499,8 +5156,7 @@ const getShapeFromSelect = (q, isSubQuery) => {
             const { returnType } = it.q;
             if (returnType === "value" || returnType === "valueOrThrow") {
               const type = it.q.getColumn;
-              if (type)
-                result[key] = type;
+              if (type) result[key] = type;
             } else {
               result[key] = new JSONTextColumn(defaultSchemaConfig);
             }
@@ -5512,17 +5168,16 @@ const getShapeFromSelect = (q, isSubQuery) => {
   return result;
 };
 const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, key) => {
-  var _a, _b;
   const index = arg.indexOf(".");
   if (index !== -1) {
-    const table = arg.slice(0, index);
+    const as = q.q.as || q.table;
+    const table = getFullColumnTable(q, arg, index, as);
     const column = arg.slice(index + 1);
-    if (table === (q.q.as || q.table)) {
+    if (table === as) {
       result[key || column] = shape[column];
     } else {
-      const it = (_b = (_a = query.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
-      if (it)
-        result[key || column] = maybeUnNameColumn(it, isSubQuery);
+      const it = query.joinedShapes?.[table]?.[column];
+      if (it) result[key || column] = maybeUnNameColumn(it, isSubQuery);
     }
   } else if (arg === "*") {
     for (const key2 in shape) {
@@ -5533,10 +5188,10 @@ const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, ke
   }
 };
 const maybeUnNameColumn = (column, isSubQuery) => {
-  return isSubQuery && (column == null ? void 0 : column.data.name) ? setColumnData(column, "name", void 0) : column;
+  return isSubQuery && column?.data.name ? setColumnData(column, "name", void 0) : column;
 };
 function _querySelect(q, args) {
-  var _a, _b;
+  var _a;
   if (q.q.returning) {
     q.q.select = q.q.returning = void 0;
   }
@@ -5548,17 +5203,15 @@ function _querySelect(q, args) {
   }
   const len = args.length;
   if (!len) {
-    (_b = (_a = q.q).select) != null ? _b : _a.select = [];
+    (_a = q.q).select ?? (_a.select = []);
     return q;
   }
   const as = q.q.as || q.table;
   const selectArgs = [];
   for (const arg of args) {
     const item = processSelectArg(q, as, arg);
-    if (item)
-      selectArgs.push(item);
-    else if (item === false)
-      return _queryNone(q);
+    if (item) selectArgs.push(item);
+    else if (item === false) return _queryNone(q);
   }
   return pushQueryArray(q, "select", selectArgs);
 }
@@ -5601,8 +5254,7 @@ class SelectItemExpression extends Expression {
     this.item = item;
     this.result = { value };
     this.q = query.q;
-    if (value)
-      Object.assign(this, value.operators);
+    if (value) Object.assign(this, value.operators);
   }
   // `makeSQL` acts similarly to how select args are handled
   makeSQL(ctx, quotedAs) {
@@ -5611,17 +5263,17 @@ class SelectItemExpression extends Expression {
 }
 
 const _getSelectableColumn = (q, arg) => {
-  var _a, _b;
   let type = q.q.shape[arg];
   if (!type) {
     const index = arg.indexOf(".");
     if (index !== -1) {
-      const table = arg.slice(0, index);
+      const as = q.q.as || q.table;
+      const table = getFullColumnTable(q, arg, index, as);
       const column = arg.slice(index + 1);
-      if (table === (q.q.as || q.table)) {
+      if (table === as) {
         type = q.shape[column];
       } else {
-        type = (_b = (_a = q.q.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
+        type = q.q.joinedShapes?.[table]?.[column];
       }
     }
   }
@@ -5629,8 +5281,7 @@ const _getSelectableColumn = (q, arg) => {
 };
 const _get = (query, returnType, arg) => {
   const q = query.q;
-  if (q.returning)
-    q.returning = void 0;
+  if (q.returning) q.returning = void 0;
   q.returnType = returnType;
   let type;
   if (typeof arg === "string") {
@@ -5651,7 +5302,7 @@ const _get = (query, returnType, arg) => {
   }
   return setQueryOperators(
     query,
-    (type == null ? void 0 : type.operators) || Operators.any
+    type?.operators || Operators.any
   );
 };
 function _queryGet(self, arg) {
@@ -5661,36 +5312,17 @@ function _queryGetOptional(self, arg) {
   return _get(self, "value", arg);
 }
 
-var __defProp$d = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = 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) => {
-  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]);
-    }
-  return a;
-};
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const _queryAs = (self, as) => {
   const { q } = self;
   q.as = as;
-  q.aliases = __spreadProps$4(__spreadValues$d({}, q.aliases), {
+  q.aliases = {
+    ...q.aliases,
     [as]: q.aliases ? _queryResolveAlias(q.aliases, as) : as
-  });
+  };
   return self;
 };
 const _queryResolveAlias = (aliases, as) => {
-  if (!aliases[as])
-    return as;
+  if (!aliases[as]) return as;
   let suffix = 2;
   let privateAs;
   while (aliases[privateAs = as + suffix]) {
@@ -5716,30 +5348,13 @@ class AsMethods {
   }
 }
 
-var __defProp$c = Object.defineProperty;
-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$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;
-};
 function queryFrom(self, arg) {
-  var _a, _b, _c;
   const data = self.q;
   if (typeof arg === "string") {
     data.as || (data.as = arg);
-    const w = (_a = data.withShapes) == null ? void 0 : _a[arg];
-    data.shape = (_b = w == null ? void 0 : w.shape) != null ? _b : emptyObject;
-    data.computeds = w == null ? void 0 : w.computeds;
+    const w = data.withShapes?.[arg];
+    data.shape = w?.shape ?? emptyObject;
+    data.computeds = w?.computeds;
   } else if (isExpression(arg)) {
     data.as || (data.as = "t");
   } else if (Array.isArray(arg)) {
@@ -5748,8 +5363,7 @@ function queryFrom(self, arg) {
       if (typeof item === "string") {
         const w = data.withShapes[item];
         Object.assign(shape, w.shape);
-        if (w.computeds)
-          data.computeds = __spreadValues$c(__spreadValues$c({}, data.computeds), w.computeds);
+        if (w.computeds) data.computeds = { ...data.computeds, ...w.computeds };
         for (const key in w.shape) {
           addColumnParserToQuery(
             self,
@@ -5759,7 +5373,7 @@ function queryFrom(self, arg) {
         }
       } else if (!isExpression(item)) {
         Object.assign(shape, getShapeFromSelect(item, true));
-        Object.assign((_c = data.parsers) != null ? _c : data.parsers = {}, item.q.parsers);
+        Object.assign(data.parsers ?? (data.parsers = {}), item.q.parsers);
       }
     }
   } else {
@@ -5875,11 +5489,9 @@ function queryJson(self, coalesce) {
 
 const pushSelectSql = (ctx, table, query, quotedAs) => {
   const sql = selectToSql(ctx, table, query, quotedAs);
-  if (sql)
-    ctx.sql.push(sql);
+  if (sql) ctx.sql.push(sql);
 };
 const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect) => {
-  var _a, _b;
   let selected;
   const list = [];
   if (query.select) {
@@ -5888,7 +5500,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
         let sql;
         if (item === "*") {
           if (hookSelect) {
-            selected != null ? selected : selected = {};
+            selected ?? (selected = {});
             for (const key in query.selectAllKeys || query.shape) {
               selected[key] = quotedAs;
             }
@@ -5899,8 +5511,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
           if (index !== -1) {
             const tableName = item.slice(0, index);
             const key = item.slice(index + 1);
-            if (hookSelect == null ? void 0 : hookSelect.get(key))
-              (selected != null ? selected : selected = {})[key] = `"${tableName}"`;
+            if (hookSelect?.get(key)) (selected ?? (selected = {}))[key] = `"${tableName}"`;
             sql = tableColumnToSqlWithAs(
               ctx,
               table.q,
@@ -5908,12 +5519,9 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
               tableName,
               key,
               key === "*" ? tableName : key,
-              quotedAs,
-              true
-            );
+              quotedAs);
           } else {
-            if (hookSelect == null ? void 0 : hookSelect.get(item))
-              (selected != null ? selected : selected = {})[item] = quotedAs;
+            if (hookSelect?.get(item)) (selected ?? (selected = {}))[item] = quotedAs;
             sql = ownColumnToSqlWithAs(
               ctx,
               table.q,
@@ -5929,8 +5537,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
         if ("selectAs" in item) {
           const obj = item.selectAs;
           for (const as in obj) {
-            if (hookSelect)
-              (selected != null ? selected : selected = {})[as] = true;
+            if (hookSelect) (selected ?? (selected = {}))[as] = true;
             const value = obj[as];
             if (typeof value === "object") {
               if (isExpression(value)) {
@@ -5970,26 +5577,25 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
         const tableName = select.slice(0, index);
         quotedTable = `"${tableName}"`;
         columnName = select.slice(index + 1);
-        col = (_b = (_a = table.q.joinedShapes) == null ? void 0 : _a[tableName]) == null ? void 0 : _b[columnName];
-        sql = (col == null ? void 0 : col.data.computed) ? col.data.computed.toSQL(ctx, `"${tableName}"`) : `"${tableName}"."${(col == null ? void 0 : col.data.name) || columnName}"`;
+        col = table.q.joinedShapes?.[tableName]?.[columnName];
+        sql = col?.data.computed ? col.data.computed.toSQL(ctx, `"${tableName}"`) : `"${tableName}"."${col?.data.name || columnName}"`;
       } else {
         quotedTable = quotedAs;
         columnName = select;
         col = query.shape[select];
         sql = simpleColumnToSQL(ctx, query, select, col, quotedAs);
       }
-      if (selected == null ? void 0 : selected[columnName]) {
-        if ((selected == null ? void 0 : selected[columnName]) === quotedTable) {
+      if (selected?.[columnName]) {
+        if (selected?.[columnName] === quotedTable) {
           hookSelect.delete(column);
           continue;
         }
         let i = 2;
         let name;
-        while (selected[name = `${column}${i}`])
-          i++;
+        while (selected[name = `${column}${i}`]) i++;
         item.as = name;
         sql += ` "${name}"`;
-      } else if (col == null ? void 0 : col.data.name) {
+      } else if (col?.data.name) {
         sql += ` "${columnName}"`;
       }
       list.push(sql);
@@ -6002,11 +5608,9 @@ function selectedObjectToSQL(ctx, quotedAs, item) {
   return ctx.aliasValue ? `${sql} r` : sql;
 }
 const selectAllSql = (query, quotedAs) => {
-  var _a, _b, _c;
-  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(", ")) || "*";
+  return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
 const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
-  var _a, _b, _c;
   const { returnType = "all" } = query.q;
   if (isQueryNone(query)) {
     let sql;
@@ -6017,7 +5621,7 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
         return;
       case "value":
       case "valueOrThrow":
-        if (query.q.returning || ((_a = query.q.expr) == null ? void 0 : _a.result.value) instanceof IntegerBaseColumn) {
+        if (query.q.returning || query.q.expr?.result.value instanceof IntegerBaseColumn) {
           sql = "0";
         } else {
           return;
@@ -6048,8 +5652,7 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
         sql = `"${query.q.joinedForSelect}".r`;
         break;
       case "valueOrThrow":
-        if (query.q.returning)
-          return;
+        if (query.q.returning) return;
         sql = `"${query.q.joinedForSelect}".r`;
         break;
       case "void":
@@ -6057,8 +5660,7 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
       default:
         throw new UnhandledTypeError(query, returnType);
     }
-    if (sql)
-      list.push(`${coalesce(ctx, query, sql, quotedAs)} "${as}"`);
+    if (sql) list.push(`${coalesce(ctx, query, sql, quotedAs)} "${as}"`);
     return;
   }
   switch (returnType) {
@@ -6069,8 +5671,8 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
       break;
     case "pluck": {
       const { select } = query.q;
-      const first = select == null ? void 0 : select[0];
-      if (!first && ((_b = query.q.computeds) == null ? void 0 : _b[as])) {
+      const first = select?.[0];
+      if (!first && query.q.computeds?.[as]) {
         query = queryJson(query);
       } else if (!first) {
         throw new OrchidOrmInternalError(
@@ -6087,7 +5689,7 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
     }
     case "value":
     case "valueOrThrow":
-      if (!query.q.returning && ((_c = query.q.computeds) == null ? void 0 : _c[as])) {
+      if (!query.q.returning && query.q.computeds?.[as]) {
         query = queryJson(query);
       }
       break;
@@ -6135,8 +5737,7 @@ const orderByToSql = (ctx, data, order, quotedAs) => {
   return sql.join(", ");
 };
 const addOrder = (ctx, data, column, quotedAs, dir) => {
-  var _a;
-  if ((_a = data.sources) == null ? void 0 : _a[column]) {
+  if (data.sources?.[column]) {
     const search = data.sources[column];
     const order = dir || (!search.order || search.order === true ? emptyObject : search.order);
     return `${order.coverDensity ? "ts_rank_cd" : "ts_rank"}(${order.weights ? `${addValue(ctx.values, `{${order.weights}}`)}, ` : ""}${search.vectorSQL}, "${column}"${order.normalization !== void 0 ? `, ${addValue(ctx.values, order.normalization)}` : ""}) ${order.dir || "DESC"}`;
@@ -6145,10 +5746,8 @@ const addOrder = (ctx, data, column, quotedAs, dir) => {
 };
 
 const windowToSql = (ctx, data, window, quotedAs) => {
-  if (typeof window === "string")
-    return `"${window}"`;
-  if (isExpression(window))
-    return `(${window.toSQL(ctx, quotedAs)})`;
+  if (typeof window === "string") return `"${window}"`;
+  if (isExpression(window)) return `(${window.toSQL(ctx, quotedAs)})`;
   const sql = [];
   if (window.partitionBy) {
     sql.push(
@@ -6165,38 +5764,33 @@ const windowToSql = (ctx, data, window, quotedAs) => {
 
 const pushHavingSql = (ctx, query, quotedAs) => {
   const conditions = havingToSql(ctx, query, quotedAs);
-  if (conditions == null ? void 0 : conditions.length)
-    ctx.sql.push("HAVING", conditions);
+  if (conditions?.length) ctx.sql.push("HAVING", conditions);
 };
 const havingToSql = (ctx, query, quotedAs) => {
-  var _a;
-  return (_a = query.having) == null ? void 0 : _a.map(
+  return query.having?.map(
     (it) => "raw" in it[0] ? templateLiteralToSQL(it, ctx, quotedAs) : it.map((item) => item.toSQL(ctx, quotedAs)).join(" AND ")
   ).join(" AND ");
 };
 
 const pushWithSql = (ctx, items) => {
-  if (!items.length)
-    return;
+  if (!items.length) return;
   ctx.sql.push(
     "WITH",
     items.map((item) => {
-      var _a;
       let inner;
       if (item.q) {
         inner = getSqlText(makeSQL(item.q, ctx));
       } else {
         inner = item.s.toSQL(ctx, `"${item.n}"`);
       }
-      const o = (_a = item.o) != null ? _a : emptyObject;
+      const o = item.o ?? emptyObject;
       return `${o.recursive ? "RECURSIVE " : ""}"${item.n}"${o.columns ? `(${o.columns.map((x) => `"${x}"`).join(", ")})` : ""} AS ${o.materialized ? "MATERIALIZED " : o.notMaterialized ? "NOT MATERIALIZED " : ""}(${inner})`;
     }).join(", ")
   );
 };
 
 const checkIfASimpleQuery = (q) => {
-  var _a, _b;
-  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)
+  if (q.q.returnType && q.q.returnType !== "all" || q.q.selectAllColumns || q.q.and?.length || q.q.or?.length || q.q.scopes)
     return false;
   const keys = Object.keys(q.q);
   return !keys.some((key) => queryKeysOfNotSimpleQuery.includes(key));
@@ -6265,8 +5859,7 @@ const getFrom = (ctx, table, data, quotedAs) => {
     return fromToSql(ctx, data, from, quotedAs);
   }
   let sql = quoteSchemaAndTable(data.schema, table.table);
-  if (data.only)
-    sql = `ONLY ${sql}`;
+  if (data.only) sql = `ONLY ${sql}`;
   return sql;
 };
 const fromToSql = (ctx, data, from, quotedAs) => {
@@ -6291,13 +5884,11 @@ const fromToSql = (ctx, data, from, quotedAs) => {
   return (only === void 0 ? data.only : only) ? `ONLY ${sql}` : sql;
 };
 const getSearchLang = (ctx, data, source, quotedAs) => {
-  var _a;
-  return (_a = source.langSQL) != null ? _a : source.langSQL = "languageColumn" in source ? columnToSql(ctx, data, data.shape, source.languageColumn, quotedAs) : isRawSQL(source.language) ? source.language.toSQL(ctx) : addValue(ctx.values, source.language || data.language || "english");
+  return source.langSQL ?? (source.langSQL = "languageColumn" in source ? columnToSql(ctx, data, data.shape, source.languageColumn, quotedAs) : isRawSQL(source.language) ? source.language.toSQL(ctx) : addValue(ctx.values, source.language || data.language || "english"));
 };
 const getSearchText = (ctx, data, source, quotedAs, forHeadline) => {
   let sql = source.textSQL;
-  if (sql)
-    return sql;
+  if (sql) return sql;
   if ("in" in source) {
     if (typeof source.in === "string") {
       sql = columnToSql(ctx, data, data.shape, source.in, quotedAs);
@@ -6352,11 +5943,10 @@ const MAX_BINDING_PARAMS = 65536;
 
 const quotedColumns = [];
 const makeInsertSql = (ctx, q, query, quotedAs) => {
-  var _a, _b, _c, _d;
   const { columns, shape } = query;
   quotedColumns.length = columns.length;
   for (let i = 0, len = columns.length; i < len; i++) {
-    quotedColumns[i] = `"${((_a = shape[columns[i]]) == null ? void 0 : _a.data.name) || columns[i]}"`;
+    quotedColumns[i] = `"${shape[columns[i]]?.data.name || columns[i]}"`;
   }
   let runtimeDefaults;
   if (q.internal.runtimeDefaultColumns) {
@@ -6373,7 +5963,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
   if (quotedColumns.length === 0) {
     const key = Object.keys(q.shape)[0];
     const column = q.shape[key];
-    quotedColumns[0] = `"${(column == null ? void 0 : column.data.name) || key}"`;
+    quotedColumns[0] = `"${column?.data.name || key}"`;
     if (Array.isArray(values) && Array.isArray(values[0])) {
       values = values.map(() => [void 0]);
     }
@@ -6388,14 +5978,11 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
     const { target } = query.onConflict;
     if (target) {
       if (typeof target === "string") {
-        ctx.sql.push(`("${((_b = shape[target]) == null ? void 0 : _b.data.name) || target}")`);
+        ctx.sql.push(`("${shape[target]?.data.name || target}")`);
       } else if (Array.isArray(target)) {
         ctx.sql.push(
           `(${target.reduce(
-            (sql, item, i) => {
-              var _a2;
-              return sql + (i ? ", " : "") + `"${((_a2 = shape[item]) == null ? void 0 : _a2.data.name) || item}"`;
-            },
+            (sql, item, i) => sql + (i ? ", " : "") + `"${shape[item]?.data.name || item}"`,
             ""
           )})`
         );
@@ -6410,14 +5997,13 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
       const { merge } = query.onConflict;
       if (merge) {
         if (typeof merge === "string") {
-          const name = ((_c = shape[merge]) == null ? void 0 : _c.data.name) || merge;
+          const name = shape[merge]?.data.name || merge;
           sql = `DO UPDATE SET "${name}" = excluded."${name}"`;
         } else if ("except" in merge) {
           sql = mergeColumnsSql(columns, quotedColumns, target, merge.except);
         } else {
           sql = `DO UPDATE SET ${merge.reduce((sql2, item, i) => {
-            var _a2;
-            const name = ((_a2 = shape[item]) == null ? void 0 : _a2.data.name) || item;
+            const name = shape[item]?.data.name || item;
             return sql2 + (i ? ", " : "") + `"${name}" = excluded."${name}"`;
           }, "")}`;
         }
@@ -6434,7 +6020,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
         const arr = [];
         for (const key in set) {
           arr.push(
-            `"${((_d = shape[key]) == null ? void 0 : _d.data.name) || key}" = ${addValue(
+            `"${shape[key]?.data.name || key}" = ${addValue(
               ctx.values,
               set[key]
             )}`
@@ -6591,8 +6177,7 @@ const encodeRow = (ctx, values, q, QueryClass, row, runtimeDefaults, quotedAs) =
 };
 const pushReturningSql = (ctx, q, data, quotedAs, hookSelect, keyword = "RETURNING") => {
   const { select } = data;
-  if (!(hookSelect == null ? void 0 : hookSelect.size) && !select)
-    return hookSelect && /* @__PURE__ */ new Map();
+  if (!hookSelect?.size && !select) return hookSelect && /* @__PURE__ */ new Map();
   ctx.sql.push(keyword);
   if (q.q.hookSelect || hookSelect) {
     const tempSelect = new Map(q.q.hookSelect);
@@ -6645,16 +6230,14 @@ const processData = (ctx, table, set, data, quotedAs) => {
   for (const item of data) {
     if (typeof item === "function") {
       const result = item(data);
-      if (result)
-        append = pushOrNewArray(append, result);
+      if (result) append = pushOrNewArray(append, result);
     } else if (isExpression(item)) {
       set.push(item.toSQL(ctx, quotedAs));
     } else {
       const shape = table.q.shape;
       for (const key in item) {
         const value = item[key];
-        if (value === void 0)
-          continue;
+        if (value === void 0) continue;
         set.push(
           `"${shape[key].data.name || key}" = ${processValue(
             ctx,
@@ -6668,8 +6251,7 @@ const processData = (ctx, table, set, data, quotedAs) => {
       }
     }
   }
-  if (append)
-    processData(ctx, table, set, append, quotedAs);
+  if (append) processData(ctx, table, set, append, quotedAs);
 };
 const processValue = (ctx, table, QueryClass, key, value, quotedAs) => {
   if (value && typeof value === "object") {
@@ -6690,14 +6272,13 @@ const processValue = (ctx, table, QueryClass, key, value, quotedAs) => {
 };
 
 const pushDeleteSql = (ctx, table, query, quotedAs) => {
-  var _a, _b, _c;
   const from = `"${table.table}"`;
   ctx.sql.push(`DELETE FROM ${from}`);
   if (from !== quotedAs) {
     ctx.sql.push(`AS ${quotedAs}`);
   }
   let conditions;
-  if ((_a = query.join) == null ? void 0 : _a.length) {
+  if (query.join?.length) {
     const targets = [];
     const ons = [];
     const joinSet = query.join.length > 1 ? /* @__PURE__ */ new Set() : null;
@@ -6705,13 +6286,11 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
       const join = processJoinItem(ctx, table, query, item.args, quotedAs);
       const key = `${join.target}${join.on}`;
       if (joinSet) {
-        if (joinSet.has(key))
-          continue;
+        if (joinSet.has(key)) continue;
         joinSet.add(key);
       }
       targets.push(join.target);
-      if (join.on)
-        ons.push(join.on);
+      if (join.on) ons.push(join.on);
     }
     if (targets.length) {
       ctx.sql.push(`USING ${targets.join(", ")}`);
@@ -6720,7 +6299,7 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
   }
   pushWhereStatementSql(ctx, table, query, quotedAs);
   if (conditions) {
-    if (((_b = query.and) == null ? void 0 : _b.length) || ((_c = query.or) == null ? void 0 : _c.length) || query.scopes) {
+    if (query.and?.length || query.or?.length || query.scopes) {
       ctx.sql.push("AND", conditions);
     } else {
       ctx.sql.push("WHERE", conditions);
@@ -6731,14 +6310,11 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
 
 const pushTruncateSql = (ctx, table, query) => {
   ctx.sql.push("TRUNCATE", quoteSchemaAndTable(query.schema, table));
-  if (query.restartIdentity)
-    ctx.sql.push("RESTART IDENTITY");
-  if (query.cascade)
-    ctx.sql.push("CASCADE");
+  if (query.restartIdentity) ctx.sql.push("RESTART IDENTITY");
+  if (query.cascade) ctx.sql.push("CASCADE");
 };
 
 const pushColumnInfoSql = (ctx, table, query) => {
-  var _a;
   ctx.sql.push(
     `SELECT * FROM information_schema.columns WHERE table_name = ${addValue(
       ctx.values,
@@ -6749,7 +6325,7 @@ const pushColumnInfoSql = (ctx, table, query) => {
     ctx.sql.push(
       `AND column_name = ${addValue(
         ctx.values,
-        ((_a = table.q.shape[query.column]) == null ? void 0 : _a.data.name) || query.column
+        table.q.shape[query.column]?.data.name || query.column
       )}`
     );
   }
@@ -6758,30 +6334,21 @@ const pushColumnInfoSql = (ctx, table, query) => {
 const pushCopySql = (ctx, table, query, quotedAs) => {
   const { sql } = ctx;
   const { copy } = query;
-  const columns = copy.columns ? `(${copy.columns.map((item) => {
-    var _a;
-    return `"${((_a = query.shape[item]) == null ? void 0 : _a.data.name) || item}"`;
-  }).join(", ")})` : "";
+  const columns = copy.columns ? `(${copy.columns.map((item) => `"${query.shape[item]?.data.name || item}"`).join(", ")})` : "";
   const target = "from" in copy ? copy.from : copy.to;
   sql.push(
     `COPY "${table.table}"${columns} ${"from" in copy ? "FROM" : "TO"} ${typeof target === "string" ? escapeString(target) : `PROGRAM ${escapeString(target.program)}`}`
   );
   if (Object.keys(copy).length > (copy.columns ? 2 : 1)) {
     const options = [];
-    if (copy.format)
-      options.push(`FORMAT ${copy.format}`);
-    if (copy.freeze)
-      options.push(`FREEZE ${copy.freeze}`);
+    if (copy.format) options.push(`FORMAT ${copy.format}`);
+    if (copy.freeze) options.push(`FREEZE ${copy.freeze}`);
     if (copy.delimiter)
       options.push(`DELIMITER ${escapeString(copy.delimiter)}`);
-    if (copy.null)
-      options.push(`NULL ${escapeString(copy.null)}`);
-    if (copy.header)
-      options.push(`HEADER ${copy.header}`);
-    if (copy.quote)
-      options.push(`QUOTE ${escapeString(copy.quote)}`);
-    if (copy.escape)
-      options.push(`ESCAPE ${escapeString(copy.escape)}`);
+    if (copy.null) options.push(`NULL ${escapeString(copy.null)}`);
+    if (copy.header) options.push(`HEADER ${copy.header}`);
+    if (copy.quote) options.push(`QUOTE ${escapeString(copy.quote)}`);
+    if (copy.escape) options.push(`ESCAPE ${escapeString(copy.escape)}`);
     if (copy.forceQuote)
       options.push(
         `FORCE_QUOTE ${copy.forceQuote === "*" ? "*" : `(${copy.forceQuote.map((x) => `"${x}"`).join(", ")})`}`
@@ -6794,8 +6361,7 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
       options.push(
         `FORCE_NULL (${copy.forceNull.map((x) => `"${x}"`).join(", ")})`
       );
-    if (copy.encoding)
-      options.push(`ENCODING ${escapeString(copy.encoding)}`);
+    if (copy.encoding) options.push(`ENCODING ${escapeString(copy.encoding)}`);
     sql.push(`WITH (${options.join(", ")})`);
   }
   pushWhereStatementSql(ctx, table, query, quotedAs);
@@ -6803,26 +6369,24 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
 
 const toSQLCacheKey = Symbol("toSQLCache");
 const toSQL = (table, options) => {
-  return !(options == null ? void 0 : options.clearCache) && table.q[toSQLCacheKey] || (table.q[toSQLCacheKey] = makeSQL(table, options));
+  return !options?.clearCache && table.q[toSQLCacheKey] || (table.q[toSQLCacheKey] = makeSQL(table, options));
 };
 const makeSQL = (table, options) => {
-  var _a;
   const query = table.q;
   const sql = [];
-  const values = (options == null ? void 0 : options.values) || [];
+  const values = options?.values || [];
   const ctx = {
     queryBuilder: table.queryBuilder,
     sql,
     values,
-    aliasValue: options == null ? void 0 : options.aliasValue
+    aliasValue: options?.aliasValue
   };
   if (query.with) {
     pushWithSql(ctx, query.with);
   }
   if (query.type) {
-    const tableName = (_a = table.table) != null ? _a : query.as;
-    if (!tableName)
-      throw new Error(`Table is missing for ${query.type}`);
+    const tableName = table.table ?? query.as;
+    if (!tableName) throw new Error(`Table is missing for ${query.type}`);
     if (query.type === "truncate") {
       pushTruncateSql(ctx, tableName, query);
       return { text: sql.join(" "), values };
@@ -6887,8 +6451,7 @@ const makeSQL = (table, options) => {
       );
       sql.push(`GROUP BY ${group.join(", ")}`);
     }
-    if (query.having)
-      pushHavingSql(ctx, query, quotedAs);
+    if (query.having) pushHavingSql(ctx, query, quotedAs);
     if (query.window) {
       const window = [];
       query.window.forEach((item) => {
@@ -6917,8 +6480,7 @@ const makeSQL = (table, options) => {
         isExpression(tableNames) ? tableNames.toSQL(ctx, quotedAs) : tableNames.map((x) => `"${x}"`).join(", ")
       );
     }
-    if (query.for.mode)
-      sql.push(query.for.mode);
+    if (query.for.mode) sql.push(query.for.mode);
   }
   return { text: sql.join(" "), values, hookSelect: query.hookSelect };
 };
@@ -6932,78 +6494,39 @@ function pushLimitSQL(sql, values, q) {
   }
 }
 
-var __defProp$b = Object.defineProperty;
-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$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;
-};
 const cloneQuery = (q) => {
-  if (q.with)
-    q.with = q.with.slice(0);
-  if (q.select)
-    q.select = q.select.slice(0);
-  if (q.hookSelect)
-    q.hookSelect = new Map(q.hookSelect);
-  if (q.and)
-    q.and = q.and.slice(0);
-  if (q.or)
-    q.or = q.or.slice(0);
-  if (q.before)
-    q.before = q.before.slice(0);
-  if (q.after)
-    q.after = q.after.slice(0);
-  if (q.joinedShapes)
-    q.joinedShapes = __spreadValues$b({}, q.joinedShapes);
-  if (q.joinedComputeds)
-    q.joinedComputeds = __spreadValues$b({}, q.joinedComputeds);
-  if (q.batchParsers)
-    q.batchParsers = [...q.batchParsers];
-  if (q.joinedBatchParsers)
-    q.joinedBatchParsers = __spreadValues$b({}, q.joinedBatchParsers);
-  if (q.scopes)
-    q.scopes = __spreadValues$b({}, q.scopes);
-  if (q.parsers)
-    q.parsers = __spreadValues$b({}, q.parsers);
+  if (q.with) q.with = q.with.slice(0);
+  if (q.select) q.select = q.select.slice(0);
+  if (q.hookSelect) q.hookSelect = new Map(q.hookSelect);
+  if (q.and) q.and = q.and.slice(0);
+  if (q.or) q.or = q.or.slice(0);
+  if (q.before) q.before = q.before.slice(0);
+  if (q.after) q.after = q.after.slice(0);
+  if (q.joinedShapes) q.joinedShapes = { ...q.joinedShapes };
+  if (q.joinedComputeds) q.joinedComputeds = { ...q.joinedComputeds };
+  if (q.batchParsers) q.batchParsers = [...q.batchParsers];
+  if (q.joinedBatchParsers) q.joinedBatchParsers = { ...q.joinedBatchParsers };
+  if (q.scopes) q.scopes = { ...q.scopes };
+  if (q.parsers) q.parsers = { ...q.parsers };
   if (q.updateData) {
     q.updateData = q.updateData.slice(
       0
     );
   }
   if (q.type === void 0) {
-    if (q.distinct)
-      q.distinct = q.distinct.slice(0);
-    if (q.join)
-      q.join = q.join.slice(0);
-    if (q.group)
-      q.group = q.group.slice(0);
-    if (q.having)
-      q.having = q.having.slice(0);
-    if (q.window)
-      q.window = q.window.slice(0);
-    if (q.union)
-      q.union = { b: q.union.b, u: q.union.u.slice(0) };
-    if (q.order)
-      q.order = q.order.slice(0);
+    if (q.distinct) q.distinct = q.distinct.slice(0);
+    if (q.join) q.join = q.join.slice(0);
+    if (q.group) q.group = q.group.slice(0);
+    if (q.having) q.having = q.having.slice(0);
+    if (q.window) q.window = q.window.slice(0);
+    if (q.union) q.union = { b: q.union.b, u: q.union.u.slice(0) };
+    if (q.order) q.order = q.order.slice(0);
   } else if (q.type === "insert") {
     q.columns = q.columns.slice(0);
     q.values = Array.isArray(q.values) ? q.values.slice(0) : q.values;
-    if (q.using)
-      q.using = q.using.slice(0);
-    if (q.join)
-      q.join = q.join.slice(0);
-    if (q.beforeCreate)
-      q.beforeCreate = q.beforeCreate.slice(0);
+    if (q.using) q.using = q.using.slice(0);
+    if (q.join) q.join = q.join.slice(0);
+    if (q.beforeCreate) q.beforeCreate = q.beforeCreate.slice(0);
     if (q.afterCreate) {
       q.afterCreate = q.afterCreate.slice(0);
       if (q.afterCreateSelect) {
@@ -7011,8 +6534,7 @@ const cloneQuery = (q) => {
       }
     }
   } else if (q.type === "update") {
-    if (q.beforeUpdate)
-      q.beforeUpdate = q.beforeUpdate.slice(0);
+    if (q.beforeUpdate) q.beforeUpdate = q.beforeUpdate.slice(0);
     if (q.afterUpdate) {
       q.afterUpdate = q.afterUpdate.slice(0);
       if (q.afterUpdateSelect) {
@@ -7020,8 +6542,7 @@ const cloneQuery = (q) => {
       }
     }
   } else if (q.type === "delete") {
-    if (q.beforeDelete)
-      q.beforeDelete = q.beforeDelete.slice(0);
+    if (q.beforeDelete) q.beforeDelete = q.beforeDelete.slice(0);
     if (q.afterDelete) {
       q.afterDelete = q.afterDelete.slice(0);
       if (q.afterDeleteSelect) {
@@ -7031,27 +6552,7 @@ const cloneQuery = (q) => {
   }
 };
 
-var __defProp$a = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-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$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;
-};
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 const _chain = (fromQuery, toQuery, rel) => {
-  var _a, _b;
   const self = fromQuery;
   const toTable = toQuery;
   let query;
@@ -7071,38 +6572,23 @@ const _chain = (fromQuery, toQuery, rel) => {
   } else {
     query.q.relChain = [self];
   }
-  const aliases = self.q.as ? __spreadValues$a({}, self.q.aliases) : __spreadProps$3(__spreadValues$a({}, self.q.aliases), { [self.table]: self.table });
+  const aliases = self.q.as ? { ...self.q.aliases } : { ...self.q.aliases, [self.table]: self.table };
   const relAliases = query.q.aliases;
   for (const as in relAliases) {
     aliases[as] = _queryResolveAlias(aliases, as);
   }
   query.q.as = aliases[query.q.as];
   query.q.aliases = aliases;
-  query.q.joinedShapes = __spreadValues$a({
-    [getQueryAs(self)]: self.q.shape
-  }, self.q.joinedShapes);
-  (_b = (_a = rel.modifyRelatedQuery) == null ? void 0 : _a.call(rel, query)) == null ? void 0 : _b(self);
+  query.q.joinedShapes = {
+    [getQueryAs(self)]: self.q.shape,
+    ...self.q.joinedShapes
+  };
+  rel.modifyRelatedQuery?.(query)?.(self);
   return query;
 };
 
-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$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$9({}, query);
+  const cloned = { ...query };
   delete cloned[toSQLCacheKey];
   cloneQuery(cloned);
   return cloned;
@@ -7146,8 +6632,7 @@ const resolveSubQueryCallback = (q, cb) => {
   return result;
 };
 const joinSubQuery = (q, sub) => {
-  if (!("relationConfig" in sub))
-    return sub;
+  if (!("relationConfig" in sub)) return sub;
   return sub.relationConfig.joinQuery(
     sub,
     q
@@ -7264,10 +6749,8 @@ const typmodType = (typmod) => {
   } else {
     s += lwtypeName(type);
   }
-  if (typmod >= 0 && typmodGetZ(typmod))
-    s += "Z";
-  if (typmod >= 0 && typmodGetM(typmod))
-    s += "M";
+  if (typmod >= 0 && typmodGetZ(typmod)) s += "Z";
+  if (typmod >= 0 && typmodGetM(typmod)) s += "M";
   return s;
 };
 const typmodSrid = (typmod) => {
@@ -7287,36 +6770,17 @@ function uint8ArrToHex(arr) {
     }
   }
   const hexOctets = [];
-  for (let i = 0; i < arr.length; ++i)
-    hexOctets.push(byteToHex[arr[i]]);
+  for (let i = 0; i < arr.length; ++i) hexOctets.push(byteToHex[arr[i]]);
   return hexOctets.join("");
 }
 
-var __defProp$8 = Object.defineProperty;
-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$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;
-};
 const getColumnTypes = (types, fn, nowSQL, language) => {
-  if (nowSQL)
-    setDefaultNowFn(nowSQL);
-  if (language)
-    setDefaultLanguage(language);
+  if (nowSQL) setDefaultNowFn(nowSQL);
+  if (language) setDefaultLanguage(language);
   return fn(types);
 };
 const makeColumnTypes = (schema) => {
-  return __spreadValues$8({
+  return {
     schema,
     enum: schema.enum,
     array: schema.array,
@@ -7425,8 +6889,9 @@ const makeColumnTypes = (schema) => {
       point() {
         return new PostgisGeographyPointColumn(schema);
       }
-    }
-  }, makeTimestampsHelpers(makeRegexToFindInSql));
+    },
+    ...makeTimestampsHelpers(makeRegexToFindInSql)
+  };
 };
 RawSQL.prototype.columnTypes = makeColumnTypes;
 
@@ -7441,13 +6906,13 @@ class VirtualColumn extends ColumnType {
   }
 }
 
-const _UnknownColumn = class extends VirtualColumn {
+const _UnknownColumn = class _UnknownColumn extends VirtualColumn {
   constructor(schema) {
     super(schema, schema.unknown());
   }
 };
+_UnknownColumn.instance = new _UnknownColumn(defaultSchemaConfig);
 let UnknownColumn = _UnknownColumn;
-UnknownColumn.instance = new _UnknownColumn(defaultSchemaConfig);
 RawSQL.prototype.result = { value: UnknownColumn.instance };
 
 const makeColumnsByType = (schema) => {
@@ -7511,21 +6976,6 @@ const makeColumnsByType = (schema) => {
   };
 };
 
-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$8.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = 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;
-};
 const { types } = pg;
 const defaultTypeParsers = {};
 for (const key in types.builtins) {
@@ -7545,8 +6995,7 @@ const returnArg = (arg) => arg;
 const rollbackSql = { text: "ROLLBACK" };
 const commitSql = { text: "COMMIT" };
 class Adapter {
-  constructor(_a) {
-    var _b = _a, { types: types2 = defaultTypeParsers } = _b, config = __objRest$1(_b, ["types"]);
+  constructor({ types: types2 = defaultTypeParsers, ...config }) {
     this.types = types2;
     let schema = config.schema;
     if (config.databaseURL) {
@@ -7563,8 +7012,7 @@ class Adapter {
       config.databaseURL = url.toString();
       config.connectionString = config.databaseURL;
     }
-    if (schema)
-      this.schema = schema === "public" ? void 0 : schema;
+    if (schema) this.schema = schema === "public" ? void 0 : schema;
     this.config = config;
     this.pool = new pg.Pool(config);
     if (config.connectRetry) {
@@ -7671,25 +7119,6 @@ class TransactionAdapter {
   }
 }
 
-var __defProp$7 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-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;
-};
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 class FnExpression extends Expression {
   /**
    * @param query - query object.
@@ -7715,12 +7144,10 @@ class FnExpression extends Expression {
   }
   // Builds function SQL.
   makeSQL(ctx, quotedAs) {
-    var _a;
     const sql = [`${this.fn}(`];
     const { values } = ctx;
     const { options } = this;
-    if (options.distinct && !options.withinGroup)
-      sql.push("DISTINCT ");
+    if (options.distinct && !options.withinGroup) sql.push("DISTINCT ");
     sql.push(
       this.args.map((arg) => {
         if (typeof arg === "string") {
@@ -7747,13 +7174,11 @@ class FnExpression extends Expression {
         }
       }).join(", ")
     );
-    if (options.withinGroup)
-      sql.push(") WITHIN GROUP (");
-    else if (options.order)
-      sql.push(" ");
+    if (options.withinGroup) sql.push(") WITHIN GROUP (");
+    else if (options.order) sql.push(" ");
     if (options.order) {
       pushOrderBySql(
-        __spreadProps$2(__spreadValues$7({}, ctx), { sql }),
+        { ...ctx, sql },
         this.q,
         quotedAs,
         toArray(options.order)
@@ -7766,7 +7191,7 @@ class FnExpression extends Expression {
         this.query,
         {
           and: options.filter ? [options.filter] : void 0,
-          or: (_a = options.filterOr) == null ? void 0 : _a.map((item) => [item]),
+          or: options.filterOr?.map((item) => [item]),
           shape: this.q.shape,
           joinedShapes: this.q.joinedShapes
         },
@@ -8399,22 +7824,6 @@ class Clear {
   }
 }
 
-var __defProp$6 = Object.defineProperty;
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$6 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$6.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(b)) {
-      if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
-    }
-  return a;
-};
 const createSelect = (q) => {
   if (q.q.returnType === "void" || isSelectingCount(q)) {
     q.q.select = void 0;
@@ -8424,12 +7833,10 @@ const createSelect = (q) => {
   }
 };
 const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
-  var _a, _b, _c;
   const { shape } = q.q;
   for (const key in item) {
     if (shape[key] instanceof VirtualColumn) {
-      (_b = (_a = shape[key]).create) == null ? void 0 : _b.call(
-        _a,
+      shape[key].create?.(
         q,
         ctx,
         item,
@@ -8444,7 +7851,7 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
       }
       if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.computed || shape === anyShape) && item[key] !== void 0) {
         ctx.columns.set(key, ctx.columns.size);
-        encoders[key] = (_c = shape[key]) == null ? void 0 : _c.data.encode;
+        encoders[key] = shape[key]?.data.encode;
       }
     }
   }
@@ -8457,7 +7864,7 @@ const handleOneData = (q, data, ctx) => {
   const encoders = {};
   const defaults = q.q.defaults;
   if (defaults) {
-    data = __spreadValues$6(__spreadValues$6({}, defaults), data);
+    data = { ...defaults, ...data };
   }
   processCreateItem(q, data, 0, ctx, encoders);
   const columns = Array.from(ctx.columns.keys());
@@ -8475,7 +7882,7 @@ const handleManyData = (q, data, ctx) => {
   const encoders = {};
   const defaults = q.q.defaults;
   if (defaults) {
-    data = data.map((item) => __spreadValues$6(__spreadValues$6({}, defaults), item));
+    data = data.map((item) => ({ ...defaults, ...item }));
   }
   data.forEach((item, i) => {
     processCreateItem(q, item, i, ctx, encoders);
@@ -8493,9 +7900,8 @@ const insert = (self, {
   columns,
   values
 }, kind, many) => {
-  var _a;
   const { q } = self;
-  if (!((_a = q.select) == null ? void 0 : _a.length)) {
+  if (!q.select?.length) {
     q.returning = true;
   }
   delete q.and;
@@ -8504,14 +7910,12 @@ const insert = (self, {
   q.type = "insert";
   q.columns = columns;
   q.values = values;
-  if (!q.kind)
-    q.kind = kind;
+  if (!q.kind) q.kind = kind;
   const { select, returnType } = q;
   if (!select) {
     if (returnType !== "void") {
       q.returnType = "valueOrThrow";
-      if (many)
-        q.returningMany = true;
+      if (many) q.returningMany = true;
     }
   } else if (many) {
     if (returnType === "one" || returnType === "oneOrThrow") {
@@ -8527,14 +7931,13 @@ const insert = (self, {
   return self;
 };
 const getFromSelectColumns = (from, obj, many) => {
-  var _a;
   if (!many && !queryTypeWithLimitOne[from.q.returnType]) {
     throw new Error(
       "Cannot create based on a query which returns multiple records"
     );
   }
   const queryColumns = [];
-  (_a = from.q.select) == null ? void 0 : _a.forEach((item) => {
+  from.q.select?.forEach((item) => {
     if (typeof item === "string") {
       const index = item.indexOf(".");
       queryColumns.push(index === -1 ? item : item.slice(index + 1));
@@ -8542,7 +7945,7 @@ const getFromSelectColumns = (from, obj, many) => {
       queryColumns.push(...Object.keys(item.selectAs));
     }
   });
-  if (obj == null ? void 0 : obj.columns) {
+  if (obj?.columns) {
     queryColumns.push(...obj.columns);
   }
   return queryColumns;
@@ -8555,7 +7958,7 @@ const insertFromQuery = (q, from, many, data) => {
     q,
     {
       columns,
-      values: { from, values: obj == null ? void 0 : obj.values }
+      values: { from, values: obj?.values }
     },
     "from",
     many
@@ -8583,8 +7986,7 @@ const _queryCreateMany = (q, data) => {
 const _queryInsertMany = (q, data) => {
   const ctx = createCtx();
   let result = insert(q, handleManyData(q, data, ctx), "object", true);
-  if (!data.length)
-    result = result.none();
+  if (!data.length) result = result.none();
   return result;
 };
 const _queryCreateRaw = (q, args) => {
@@ -9222,15 +8624,13 @@ const forMethods = {
   noWait() {
     const q = _clone(this);
     const data = q.q;
-    if (data == null ? void 0 : data.for)
-      data.for.mode = "NO WAIT";
+    if (data?.for) data.for.mode = "NO WAIT";
     return q;
   },
   skipLocked() {
     const q = _clone(this);
     const data = q.q;
-    if (data == null ? void 0 : data.for)
-      data.for.mode = "SKIP LOCKED";
+    if (data?.for) data.for.mode = "SKIP LOCKED";
     return q;
   }
 };
@@ -9372,9 +8772,9 @@ class Having {
 
 const before = (q, key, cb) => pushQueryValue(q, `before${key}`, cb);
 const after = (q, key, select, cb, commit) => {
-  var _a, _b, _c;
+  var _a, _b;
   pushQueryValue(q, `after${key}${commit ? "Commit" : ""}`, cb);
-  const set = (_c = (_a = q.q)[_b = `after${key}Select`]) != null ? _c : _a[_b] = /* @__PURE__ */ new Set();
+  const set = (_a = q.q)[_b = `after${key}Select`] ?? (_a[_b] = /* @__PURE__ */ new Set());
   for (const column of select) {
     set.add(column);
   }
@@ -10354,22 +9754,6 @@ class JsonMethods {
   }
 }
 
-var __defProp$5 = Object.defineProperty;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
-    }
-  return a;
-};
 const mergableObjects = /* @__PURE__ */ new Set([
   "shape",
   "withShapes",
@@ -10400,7 +9784,7 @@ class MergeQueryMethods {
               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;
+            a[key] = a[key] ? { ...a[key], ...value } : value;
           } else if (key === "union") {
             a[key] = a[key] ? {
               b: a[key].b,
@@ -10414,8 +9798,7 @@ class MergeQueryMethods {
           break;
       }
     }
-    if (b.returnType)
-      a.returnType = b.returnType;
+    if (b.returnType) a.returnType = b.returnType;
     return query;
   }
 }
@@ -10565,25 +9948,6 @@ class Union {
   }
 }
 
-var __defProp$4 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 class WithMethods {
   with(name, second, third) {
     const q = _clone(this);
@@ -10596,10 +9960,11 @@ class WithMethods {
     } else {
       query = queryArg;
     }
-    if ((options == null ? void 0 : options.columns) === true) {
-      options = __spreadProps$1(__spreadValues$4({}, options), {
+    if (options?.columns === true) {
+      options = {
+        ...options,
         columns: Object.keys(query.shape)
-      });
+      };
     }
     pushQueryValue(q, "with", { n: name, o: options, q: query });
     const shape = getShapeFromSelect(query, true);
@@ -10609,7 +9974,7 @@ class WithMethods {
     });
   }
   withRecursive(name, ...args) {
-    var _a, _b, _c;
+    var _a;
     const q = _clone(this);
     let [options, baseFn, recursiveFn] = args.length === 2 ? [{}, args[0], args[1]] : args;
     const arg = q.queryBuilder.clone();
@@ -10617,14 +9982,15 @@ class WithMethods {
     let query = typeof baseFn === "function" ? baseFn(arg) : baseFn;
     const shape = getShapeFromSelect(query, true);
     const withConfig = { shape, computeds: query.q.computeds };
-    ((_b = (_a = arg.q).withShapes) != null ? _b : _a.withShapes = {})[name] = withConfig;
+    ((_a = arg.q).withShapes ?? (_a.withShapes = {}))[name] = withConfig;
     const recursive = recursiveFn(arg);
-    query = _queryUnion(query, [recursive], (_c = options.union) != null ? _c : "UNION ALL");
+    query = _queryUnion(query, [recursive], options.union ?? "UNION ALL");
     options.recursive = true;
     if (options.columns === true) {
-      options = __spreadProps$1(__spreadValues$4({}, options), {
+      options = {
+        ...options,
         columns: Object.keys(shape)
-      });
+      };
     }
     pushQueryValue(q, "with", { n: name, o: options, q: query });
     return setQueryObjectValue(q, "withShapes", name, withConfig);
@@ -10644,22 +10010,6 @@ class WithMethods {
   }
 }
 
-var __defProp$3 = Object.defineProperty;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
-    }
-  return a;
-};
 const _queryChangeCounter = (self, op, data) => {
   const q = self.q;
   q.type = "update";
@@ -10696,7 +10046,7 @@ const update = (self) => {
 };
 const _queryUpdate = (query, arg) => {
   const { q } = query;
-  const set = __spreadValues$3({}, arg);
+  const set = { ...arg };
   pushQueryValue(query, "updateData", set);
   const { shape } = q;
   const ctx = {};
@@ -10738,8 +10088,7 @@ const _queryUpdate = (query, arg) => {
           }
         } else {
           const encode = shape[key].data.encode;
-          if (encode)
-            set[key] = encode(value);
+          if (encode) set[key] = encode(value);
         }
       }
     }
@@ -11098,25 +10447,6 @@ class Update {
   }
 }
 
-var __defProp$2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 class Headline extends Expression {
   constructor(q, source, params) {
     super();
@@ -11129,16 +10459,15 @@ class Headline extends Expression {
   makeSQL(ctx, quotedAs) {
     const { q, source, params } = this;
     const lang = getSearchLang(ctx, q, source, quotedAs);
-    const text = (params == null ? void 0 : params.text) ? params.text instanceof Expression ? params.text.toSQL(ctx, quotedAs) : columnToSql(ctx, q, q.shape, params.text, quotedAs) : getSearchText(ctx, q, source, quotedAs, true);
-    const options = (params == null ? void 0 : params.options) ? `, ${params.options instanceof Expression ? params.options.toSQL(ctx, quotedAs) : addValue(ctx.values, params.options)}` : "";
+    const text = params?.text ? params.text instanceof Expression ? params.text.toSQL(ctx, quotedAs) : columnToSql(ctx, q, q.shape, params.text, quotedAs) : getSearchText(ctx, q, source, quotedAs, true);
+    const options = params?.options ? `, ${params.options instanceof Expression ? params.options.toSQL(ctx, quotedAs) : addValue(ctx.values, params.options)}` : "";
     return `ts_headline(${lang}, ${text}, "${source.as}"${options})`;
   }
 }
 Object.assign(Headline, Operators.text);
 AggregateMethods.prototype.headline = function(search, params) {
-  var _a;
   const q = this;
-  const source = (_a = q.q.sources) == null ? void 0 : _a[search];
+  const source = q.q.sources?.[search];
   if (!source)
     throw new OrchidOrmInternalError(q, `Search \`${search}\` is not defined`);
   return new Headline(
@@ -11340,9 +10669,10 @@ class SearchMethods {
     const q = _clone(this);
     if (!arg.as) {
       const as = saveSearchAlias(q, "@q", "joinedShapes");
-      arg = __spreadProps(__spreadValues$2({}, arg), {
+      arg = {
+        ...arg,
         as
-      });
+      };
     }
     setQueryObjectValue(q, "sources", arg.as, arg);
     if (arg.order) {
@@ -11352,22 +10682,6 @@ class SearchMethods {
   }
 }
 
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
-    }
-  return a;
-};
 function orCreate(query, data, updateData, mergeData) {
   const { q } = query;
   q.returnType = "one";
@@ -11383,12 +10697,11 @@ function orCreate(query, data, updateData, mergeData) {
       if (typeof data === "function") {
         data = data(updateData);
       }
-      if (mergeData)
-        data = __spreadValues$1(__spreadValues$1({}, mergeData), data);
+      if (mergeData) data = { ...mergeData, ...data };
       const inner = q2.create(data);
       inner.q.handleResult = (q3, t, r, s) => {
         result = handleResult(q3, t, r, s);
-        return inner.q.hookSelect ? result.map((row) => __spreadValues$1({}, row)) : result;
+        return inner.q.hookSelect ? result.map((row) => ({ ...row })) : result;
       };
       await inner;
       created = true;
@@ -11678,12 +10991,10 @@ class ScopeMethods {
    * @param scope - name of the scope to apply
    */
   scope(scope) {
-    var _a;
     const q = _clone(this);
-    if (!((_a = q.q.scopes) == null ? void 0 : _a[scope])) {
+    if (!q.q.scopes?.[scope]) {
       const s = q.internal.scopes[scope];
-      if (!s)
-        throw new Error(`Scope ${scope} is not defined`);
+      if (!s) throw new Error(`Scope ${scope} is not defined`);
       setQueryObjectValue(q, "scopes", scope, s);
     }
     return q;
@@ -11714,7 +11025,7 @@ class ScopeMethods {
 }
 
 function enableSoftDelete(q, table, shape, softDelete, scopes) {
-  var _a, _b;
+  var _a;
   const column = softDelete === true ? "deletedAt" : softDelete;
   if (!shape[column]) {
     throw new Error(
@@ -11725,7 +11036,7 @@ function enableSoftDelete(q, table, shape, softDelete, scopes) {
     and: [{ [column]: null }]
   };
   scopes.deleted = scope;
-  ((_b = (_a = q.q).scopes) != null ? _b : _a.scopes = {}).nonDeleted = scope;
+  ((_a = q.q).scopes ?? (_a.scopes = {})).nonDeleted = scope;
   const _del = _softDelete(
     column,
     q.internal.nowSQL
@@ -11808,8 +11119,7 @@ class OrExpression extends Expression {
       if (arg) {
         if (isExpression(arg)) {
           const sql = arg.toSQL(ctx, quotedAs);
-          if (sql)
-            res.push(sql);
+          if (sql) res.push(sql);
         } else {
           res.push(`(${getSqlText(arg.toSQL(ctx))})`);
         }
@@ -11879,9 +11189,10 @@ class ExpressionMethods {
     let column;
     const index = arg.indexOf(".");
     if (index !== -1) {
-      const table = arg.slice(0, index);
+      const as = q.q.as || q.table;
+      const table = getFullColumnTable(q, arg, index, as);
       const col = arg.slice(index + 1);
-      if (table === (q.q.as || q.table)) {
+      if (table === as) {
         column = shape[col];
       } else {
         column = q.q.joinedShapes[table][col];
@@ -12389,10 +11700,10 @@ class QueryMethods {
     const query = _clone(this);
     const q = query.q;
     q.type = "truncate";
-    if (options == null ? void 0 : options.restartIdentity) {
+    if (options?.restartIdentity) {
       q.restartIdentity = true;
     }
-    if (options == null ? void 0 : options.cascade) {
+    if (options?.cascade) {
       q.cascade = true;
     }
     return _queryExec(query);
@@ -12563,9 +11874,12 @@ class QueryMethods {
    * @param fn - helper function
    */
   makeHelper(fn) {
+    const as = this.q.as || this.table;
     return (query, ...args) => {
       const q = _clone(query);
-      q.q.as = void 0;
+      if (q.q.as) {
+        setQueryObjectValue(q, "aliases", as, q.q.as);
+      }
       return fn(q, ...args);
     };
   }
@@ -12642,12 +11956,12 @@ applyMixins(QueryMethods, [
 
 const makeIndex = (columns, first, second) => {
   if (typeof first === "string") {
-    const options = second != null ? second : {};
+    const options = second ?? {};
     return {
       index: { columns, options, name: first }
     };
   } else {
-    const options = first != null ? first : {};
+    const options = first ?? {};
     return {
       index: { columns, options }
     };
@@ -12664,16 +11978,16 @@ const tableDataMethods = {
   },
   index: makeIndex,
   searchIndex(columns, ...[first, second]) {
-    var _a, _b;
+    var _a;
     const input = makeIndex(columns, first, second);
-    (_b = (_a = input.index.options).using) != null ? _b : _a.using = "gin";
+    (_a = input.index.options).using ?? (_a.using = "gin");
     input.index.options.tsVector = true;
     return input;
   },
   foreignKey(columns, fnOrTable, foreignColumns, options) {
     return {
       constraint: {
-        name: options == null ? void 0 : options.name,
+        name: options?.name,
         references: { columns, fnOrTable, foreignColumns, options }
       }
     };
@@ -12698,7 +12012,6 @@ const parseTableData = (dataFn) => {
   return tableData;
 };
 const parseTableDataInput = (tableData, item) => {
-  var _a, _b, _c, _d;
   if (item.primaryKey) {
     tableData.primaryKey = item.primaryKey;
   } else if (item.index) {
@@ -12710,47 +12023,18 @@ const parseTableDataInput = (tableData, item) => {
         };
       }
     }
-    ((_a = tableData.indexes) != null ? _a : tableData.indexes = []).push(item.index);
+    (tableData.indexes ?? (tableData.indexes = [])).push(item.index);
   } else if (item.constraint) {
-    ((_b = tableData.constraints) != null ? _b : tableData.constraints = []).push(item.constraint);
-    if ((_d = (_c = item.constraint.references) == null ? void 0 : _c.options) == null ? void 0 : _d.dropMode) {
+    (tableData.constraints ?? (tableData.constraints = [])).push(item.constraint);
+    if (item.constraint.references?.options?.dropMode) {
       item.constraint.dropMode = item.constraint.references.options.dropMode;
     }
   }
 };
 
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 const anyShape = {};
 class Db extends QueryMethods {
   constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = emptyObject) {
-    var _a;
     super();
     this.adapter = adapter;
     this.queryBuilder = queryBuilder;
@@ -12802,10 +12086,8 @@ class Db extends QueryMethods {
       }
       if (typeof column.data.default === "function") {
         const arr = this.internal.runtimeDefaultColumns;
-        if (!arr)
-          this.internal.runtimeDefaultColumns = [key];
-        else
-          arr.push(key);
+        if (!arr) this.internal.runtimeDefaultColumns = [key];
+        else arr.push(key);
         if (!column.data.runtimeDefault) {
           const {
             data: { default: def, encode }
@@ -12820,10 +12102,10 @@ class Db extends QueryMethods {
       handleResult,
       logger,
       log: logParamToLogObject(logger, options.log),
-      autoPreparedStatements: (_a = options.autoPreparedStatements) != null ? _a : false,
+      autoPreparedStatements: options.autoPreparedStatements ?? false,
       parsers: hasParsers ? parsers : void 0,
       language: options.language,
-      schema: options == null ? void 0 : options.schema
+      schema: options?.schema
     };
     let shapeHasPrimaryKey;
     for (const key in shape) {
@@ -12838,17 +12120,14 @@ class Db extends QueryMethods {
     }
     if (!shapeHasPrimaryKey && !tableData.primaryKey && shape !== anyShape && options.noPrimaryKey !== "ignore") {
       const message = `Table ${table} has no primary key`;
-      if (options.noPrimaryKey === "error")
-        throw new Error(message);
-      else
-        logger.warn(message);
+      if (options.noPrimaryKey === "error") throw new Error(message);
+      else logger.warn(message);
     }
     const columns = Object.keys(
       shape
     );
     this.columns = columns;
-    if (options.computed)
-      applyComputedColumns(this, options.computed);
+    if (options.computed) applyComputedColumns(this, options.computed);
     if (prepareSelectAll) {
       const list = [];
       const keys = {};
@@ -12960,21 +12239,19 @@ class Db extends QueryMethods {
    * use this method to exchange a db column name to its runtime key.
    */
   columnNameToKey(name) {
-    var _a;
     let map = this.internal.columnNameToKeyMap;
     if (!map) {
       this.internal.columnNameToKeyMap = map = /* @__PURE__ */ new Map();
       const { shape } = this;
       for (const key in this.shape) {
         const column = shape[key];
-        map.set((_a = column.data.name) != null ? _a : key, key);
+        map.set(column.data.name ?? key, key);
       }
     }
     return map.get(name);
   }
 }
 const performQuery = async (q, args, method) => {
-  var _a;
   const trx = q.internal.transactionStorage.getStore();
   let sql;
   if (isRawSQL(args[0])) {
@@ -12994,16 +12271,14 @@ const performQuery = async (q, args, method) => {
       values
     };
   }
-  const log = (_a = trx == null ? void 0 : trx.log) != null ? _a : q.q.log;
+  const log = trx?.log ?? q.q.log;
   let logData;
-  if (log)
-    logData = log.beforeQuery(sql);
+  if (log) logData = log.beforeQuery(sql);
   try {
-    const result = await ((trx == null ? void 0 : trx.adapter) || q.adapter)[method](
+    const result = await (trx?.adapter || q.adapter)[method](
       sql
     );
-    if (log)
-      log.afterQuery(sql, logData);
+    if (log) log.afterQuery(sql, logData);
     return result;
   } catch (err) {
     if (log) {
@@ -13014,27 +12289,20 @@ const performQuery = async (q, args, method) => {
 };
 applyMixins(Db, [QueryMethods]);
 Db.prototype.constructor = Db;
-const createDb = (_a) => {
-  var _b = _a, {
-    log,
-    logger,
-    snakeCase,
-    schemaConfig = defaultSchemaConfig,
-    columnTypes: ctOrFn = makeColumnTypes(schemaConfig)
-  } = _b, options = __objRest(_b, [
-    "log",
-    "logger",
-    "snakeCase",
-    "schemaConfig",
-    "columnTypes"
-  ]);
-  var _a2, _b2;
+const createDb = ({
+  log,
+  logger,
+  snakeCase,
+  schemaConfig = defaultSchemaConfig,
+  columnTypes: ctOrFn = makeColumnTypes(schemaConfig),
+  ...options
+}) => {
   const adapter = "adapter" in options ? options.adapter : new Adapter(options);
   const commonOptions = {
     log,
     logger,
-    autoPreparedStatements: (_a2 = options.autoPreparedStatements) != null ? _a2 : false,
-    noPrimaryKey: (_b2 = options.noPrimaryKey) != null ? _b2 : "error",
+    autoPreparedStatements: options.autoPreparedStatements ?? false,
+    noPrimaryKey: options.noPrimaryKey ?? "error",
     nowSQL: options.nowSQL,
     snakeCase
   };
@@ -13056,10 +12324,10 @@ const createDb = (_a) => {
       adapter,
       qb,
       table,
-      typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options2 == null ? void 0 : options2.language) : shape,
+      typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options2?.language) : shape,
       ct,
       transactionStorage,
-      __spreadValues(__spreadValues({}, commonOptions), options2),
+      { ...commonOptions, ...options2 },
       parseTableData(dataFn)
     );
   };
@@ -13117,7 +12385,7 @@ const testTransaction = {
    * @param arg - ORM instance or a queryable instance (such as db.someTable).
    */
   start(arg) {
-    var _a, _b;
+    var _a;
     const db = argToDb(arg);
     const { transactionStorage } = db.internal;
     const { getStore } = transactionStorage;
@@ -13129,7 +12397,7 @@ const testTransaction = {
         transaction: adapter.transaction
       }
     };
-    ((_b = (_a = db.internal)[trxForTest]) != null ? _b : _a[trxForTest] = []).push(data);
+    ((_a = db.internal)[trxForTest] ?? (_a[trxForTest] = [])).push(data);
     return new Promise((resolve) => {
       data.promise = db.transaction(() => {
         resolve();
@@ -13151,7 +12419,7 @@ const testTransaction = {
         }
       }).finally(() => {
         const trx = db.internal.transactionStorage.getStore();
-        if (trx == null ? void 0 : trx.testTransactionCount) {
+        if (trx?.testTransactionCount) {
           trx.testTransactionCount--;
         }
         db.internal.transactionStorage.getStore = getStore;
@@ -13164,16 +12432,14 @@ const testTransaction = {
    * @param arg - the same ORM or query argument passed into the `testTransaction.start`.
    */
   rollback(arg) {
-    var _a;
     const db = argToDb(arg);
     const data = db.internal[trxForTest];
-    const last = data == null ? void 0 : data.pop();
-    if (!last)
-      return;
-    if ((data == null ? void 0 : data.length) === 1) {
+    const last = data?.pop();
+    if (!last) return;
+    if (data?.length === 1) {
       Object.assign(db.baseQuery.q.adapter, data[0].adapter);
     }
-    (_a = last.reject) == null ? void 0 : _a.call(last, new Rollback());
+    last.reject?.(new Rollback());
     return last.promise;
   },
   /**
@@ -13183,10 +12449,9 @@ const testTransaction = {
    * @param arg - the same ORM or query argument passed into the `testTransaction.start`.
    */
   async close(arg) {
-    var _a;
     const db = argToDb(arg);
     await this.rollback(db);
-    if (((_a = db.internal[trxForTest]) == null ? void 0 : _a.length) === 0) {
+    if (db.internal[trxForTest]?.length === 0) {
       return db.q.adapter.close();
     }
   }
@@ -13231,5 +12496,5 @@ function copyTableData(query, arg) {
   return q;
 }
 
-export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _afterCommitError, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _afterCommitError, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL, toSQLCacheKey };
 //# sourceMappingURL=index.mjs.map