pqb 0.42.5 → 0.42.7

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, setCurrentColumnName, makeTimestampsHelpers, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
+import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, templateLiteralToSQL as templateLiteralToSQL$1, 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';
@@ -362,7 +362,21 @@ class ColumnType extends ColumnTypeBase {
    */
   generated(...args) {
     const sql = raw(...args);
-    return setColumnData(this, "generated", (...args2) => sql.toSQL(...args2));
+    return setColumnData(this, "generated", {
+      toSQL(ctx, quoted) {
+        return sql.toSQL(ctx, quoted);
+      },
+      toCode() {
+        let sql2 = ".generated";
+        if (Array.isArray(args[0])) {
+          sql2 += templateLiteralToSQL$1(args);
+        } else {
+          const { raw: raw2, values } = args[0];
+          sql2 += `({ raw: '${raw2.replace(/'/g, "\\'")}'${values ? `, values: ${JSON.stringify(values)}` : ""} })`;
+        }
+        return sql2;
+      }
+    });
   }
 }
 
@@ -726,6 +740,9 @@ const columnCode = (type, ctx, key, code) => {
   } else {
     code[0].unshift(prepend);
   }
+  if (data.generated) {
+    addCode(code, data.generated.toCode());
+  }
   if (data.primaryKey) {
     addCode(
       code,
@@ -1320,32 +1337,59 @@ class TsVectorColumn extends ColumnType {
    * @param args
    */
   generated(...args) {
-    return setColumnData(this, "generated", (ctx, quotedAs) => {
+    const arg = args[0];
+    if (typeof arg === "object" && "raw" in arg) {
+      return super.generated(...args);
+    }
+    const toSQL = (ctx) => {
       const first = args[0];
-      if (typeof first === "string" || !("raw" in first)) {
-        const target = typeof first === "string" ? args[1] : first;
-        const language = typeof first === "string" ? first : this.defaultLanguage;
-        const { snakeCase } = ctx;
-        let sql;
-        if (Array.isArray(target)) {
-          const columns = target.length === 1 ? `"${snakeCase ? toSnakeCase(target[0]) : target[0]}"` : target.map(
-            (column) => `coalesce("${snakeCase ? toSnakeCase(column) : column}", '')`
-          ).join(` || ' ' || `);
-          sql = `to_tsvector('${language}', ${columns})`;
+      const target = typeof first === "string" ? args[1] : first;
+      const language = typeof first === "string" ? first : this.defaultLanguage;
+      const { snakeCase } = ctx;
+      let sql;
+      if (Array.isArray(target)) {
+        const columns = target.length === 1 ? `"${snakeCase ? toSnakeCase(target[0]) : target[0]}"` : target.map(
+          (column) => `coalesce("${snakeCase ? toSnakeCase(column) : column}", '')`
+        ).join(` || ' ' || `);
+        sql = `to_tsvector('${language}', ${columns})`;
+      } else {
+        for (const key in target) {
+          sql = (sql ? sql + " || " : "(") + `setweight(to_tsvector('${language}', coalesce("${snakeCase ? toSnakeCase(key) : key}", '')), '${target[key]}')`;
+        }
+        if (sql) {
+          sql += ")";
         } else {
-          for (const key in target) {
-            sql = (sql ? sql + " || " : "(") + `setweight(to_tsvector('${language}', coalesce("${snakeCase ? toSnakeCase(key) : key}", '')), '${target[key]}')`;
-          }
-          if (sql) {
-            sql += ")";
-          } else {
-            throw new Error("Empty target in the text search generated column");
-          }
+          throw new Error("Empty target in the text search generated column");
         }
-        return sql;
+      }
+      return sql;
+    };
+    const toCode = () => {
+      let code = ".generated(";
+      const first = args[0];
+      let target;
+      if (typeof first === "string") {
+        code += `'${first}', `;
+        target = args[1];
       } else {
-        return raw(...args).toSQL(ctx, quotedAs);
+        target = args[0];
       }
+      if (Array.isArray(target)) {
+        code += `[${target.map((x) => `'${x}'`).join(", ")}]`;
+      } else {
+        const pairs = [];
+        for (const key in target) {
+          pairs.push(
+            `${quoteObjectKey(key)}: '${target[key]}'`
+          );
+        }
+        code += `{ ${pairs.join(", ")} }`;
+      }
+      return code + ")";
+    };
+    return setColumnData(this, "generated", {
+      toSQL,
+      toCode
     });
   }
 }
@@ -3287,6 +3331,10 @@ 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;
+};
 
 const _join = (query, require, type, first, args) => {
   var _a;
@@ -5054,43 +5102,43 @@ const setParserForSelectedString = (q, arg, as, columnAs) => {
   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 = q.q.parsers?.[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 = 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 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 = 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}` });
-        }
-        q.q.selectedComputeds = {
-          ...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 = q.q.parsers?.[arg];
@@ -5166,9 +5214,10 @@ const getShapeFromSelect = (q, isSubQuery) => {
 const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, key) => {
   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 = query.joinedShapes?.[table]?.[column];
@@ -5262,9 +5311,10 @@ const _getSelectableColumn = (q, 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 = q.q.joinedShapes?.[table]?.[column];
@@ -11183,9 +11233,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];
@@ -11867,9 +11918,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);
     };
   }
@@ -12486,5 +12540,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