pqb 0.43.4 → 0.44.0

package/dist/index.mjs

@@ -2125,14 +2125,13 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
       } else {
         const item = value;
         const joinAs = `"${getJoinItemSource(item.joinFrom)}"`;
-        const { on } = item;
         const q = item.useOuterAliases ? {
           joinedShapes: query.joinedShapes,
           aliases: query.outerAliases,
           shape: query.shape
         } : query;
         ands.push(
-          `${onColumnToSql(ctx, q, joinAs, on[0])} ${on.length === 2 ? "=" : on[1]} ${onColumnToSql(ctx, q, joinAs, on.length === 3 ? on[2] : on[1])}`
+          `${onColumnToSql(ctx, q, joinAs, item.from)} ${item.op || "="} ${onColumnToSql(ctx, q, joinAs, item.to)}`
         );
       }
     } else if (key === "IN") {
@@ -2609,7 +2608,7 @@ const resolveCallbacksInArgs = (q, args) => {
       qb.q.and = qb.q.or = qb.q.scopes = void 0;
       qb.q.subQuery = 1;
       qb.q.outerAliases = qb.q.aliases;
-      args[i] = resolveSubQueryCallback(qb, arg);
+      args[i] = resolveSubQueryCallbackV2(qb, arg);
     }
   }
 };
@@ -3606,9 +3605,7 @@ const addAllShapesAndParsers = (query, joinKey, shape, parsers, batchParsers, co
     computeds
   );
 };
-const _joinLateral = (self, type, arg, cb, as) => {
-  var _a, _b, _c;
-  const q = self;
+const _joinLateralProcessArg = (q, arg, cb) => {
   let relation;
   if (typeof arg === "string") {
     relation = q.relations[arg];
@@ -3630,29 +3627,36 @@ const _joinLateral = (self, type, arg, cb, as) => {
       }
     }
   }
-  const query = arg;
-  query.q.joinTo = q;
-  const joinedAs = getQueryAs(q);
-  ((_a = query.q).joinedShapes ?? (_a.joinedShapes = {}))[joinedAs] = q.q.shape;
-  let result = resolveSubQueryCallback(query, cb);
+  let result = resolveSubQueryCallbackV2(
+    arg,
+    cb
+  );
   if (relation) {
     result = relation.relationConfig.joinQuery(
       result,
       q
     );
   }
-  const joinKey = as || result.q.as || result.table;
+  return result;
+};
+const _joinLateral = (self, type, arg, as) => {
+  var _a, _b, _c;
+  const q = self;
+  arg.q.joinTo = q;
+  const joinedAs = getQueryAs(q);
+  ((_a = arg.q).joinedShapes ?? (_a.joinedShapes = {}))[joinedAs] = q.q.shape;
+  const joinKey = as || arg.q.as || arg.table;
   if (joinKey) {
-    const shape = getShapeFromSelect(result, true);
+    const shape = getShapeFromSelect(arg, true);
     setQueryObjectValue(q, "joinedShapes", joinKey, shape);
-    setQueryObjectValue(q, "joinedParsers", joinKey, result.q.parsers);
-    if (result.q.batchParsers) {
-      ((_b = q.q).joinedBatchParsers ?? (_b.joinedBatchParsers = {}))[joinKey] = result.q.batchParsers;
+    setQueryObjectValue(q, "joinedParsers", joinKey, arg.q.parsers);
+    if (arg.q.batchParsers) {
+      ((_b = q.q).joinedBatchParsers ?? (_b.joinedBatchParsers = {}))[joinKey] = arg.q.batchParsers;
     }
   }
-  as || (as = getQueryAs(result));
-  ((_c = q.q).joinedComputeds ?? (_c.joinedComputeds = {}))[as] = result.q.computeds;
-  return pushQueryValue(q, "join", [type, result, as]);
+  as || (as = getQueryAs(arg));
+  ((_c = q.q).joinedComputeds ?? (_c.joinedComputeds = {}))[as] = arg.q.computeds;
+  return pushQueryValue(q, "join", [type, arg, as]);
 };
 
 class EnumColumn extends ColumnType {
@@ -3707,6 +3711,7 @@ class ArrayColumn extends ColumnType {
   }
 }
 const parse = function(source) {
+  if (typeof source !== "string") return source;
   const entries = [];
   parsePostgresArray(source, entries, this.data.item.data.parseItem);
   return entries;
@@ -5200,7 +5205,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
     let value = arg[key];
     let joinQuery;
     if (typeof value === "function") {
-      value = resolveSubQueryCallback(q, value);
+      value = resolveSubQueryCallbackV2(q, value);
       if (isQueryNone(value)) {
         if (value.q.innerJoinLateral) {
           return false;
@@ -5242,7 +5247,6 @@ const processSelectArg = (q, as, arg, columnAs) => {
           q,
           value.q.innerJoinLateral ? "JOIN" : "LEFT JOIN",
           query,
-          (q2) => q2,
           key
         );
       }
@@ -6656,7 +6660,14 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
 
 const toSQLCacheKey = Symbol("toSQLCache");
 const toSQL = (table, options) => {
-  return !options?.clearCache && table.q[toSQLCacheKey] || (table.q[toSQLCacheKey] = makeSQL(table, options));
+  if (table.q[toSQLCacheKey] && !options?.clearCache) {
+    const cached = table.q[toSQLCacheKey];
+    if (options?.values && "values" in cached && cached.values && options.values !== cached.values) {
+      options.values.push(...cached.values);
+    }
+    return cached;
+  }
+  return table.q[toSQLCacheKey] = makeSQL(table, options);
 };
 const makeSQL = (table, options) => {
   const query = table.q;
@@ -6893,13 +6904,13 @@ const getQueryAs = (q) => {
 const makeRegexToFindInSql = (value) => {
   return new RegExp(`${value}(?=(?:[^']*'[^']*')*[^']*$)`, "g");
 };
-const resolveSubQueryCallback = (q, cb) => {
-  let arg;
+const resolveSubQueryCallbackV2 = (q, cb) => {
+  let base;
   if (q.table) {
-    if (!q.internal.callbackArg) {
-      const base = Object.create(q.baseQuery);
+    base = q.internal.callbackArg;
+    if (!base) {
+      base = Object.create(q.baseQuery);
       base.baseQuery = base;
-      q.internal.callbackArg = base;
       const { relations } = q;
       for (const key in relations) {
         Object.defineProperty(base, key, {
@@ -6909,21 +6920,17 @@ const resolveSubQueryCallback = (q, cb) => {
           }
         });
       }
+      q.internal.callbackArg = base;
     }
-    arg = Object.create(q.internal.callbackArg);
-    arg.q = q.q;
   } else {
-    arg = q;
-  }
-  const { subQuery, relChain, outerAliases } = q.q;
-  q.q.subQuery = 1;
-  q.q.relChain = void 0;
-  q.q.outerAliases = q.q.aliases;
-  const result = cb(arg);
-  q.q.subQuery = subQuery;
-  q.q.relChain = relChain;
-  q.q.outerAliases = outerAliases;
-  return result;
+    base = q;
+  }
+  const arg = Object.create(base);
+  arg.q = getClonedQueryData(q.q);
+  arg.q.subQuery = 1;
+  arg.q.relChain = void 0;
+  arg.q.outerAliases = q.q.aliases;
+  return cb(arg);
 };
 const joinSubQuery = (q, sub) => {
   if (!("relationConfig" in sub)) return sub;
@@ -8139,7 +8146,7 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
       );
     } else {
       if (typeof item[key] === "function") {
-        item[key] = resolveSubQueryCallback(
+        item[key] = resolveSubQueryCallbackV2(
           q,
           item[key]
         );
@@ -9895,11 +9902,11 @@ class Join {
    * @param cb - {@link JoinLateralCallback}
    */
   joinLateral(arg, cb) {
+    const q = _clone(this);
     return _joinLateral(
-      _clone(this),
+      q,
       "JOIN",
-      arg,
-      cb
+      _joinLateralProcessArg(q, arg, cb)
     );
   }
   /**
@@ -9918,28 +9925,32 @@ class Join {
    * @param cb - {@link JoinLateralCallback}
    */
   leftJoinLateral(arg, cb) {
+    const q = _clone(this);
     return _joinLateral(
       _clone(this),
       "LEFT JOIN",
-      arg,
-      cb
+      _joinLateralProcessArg(q, arg, cb)
     );
   }
 }
 const makeOnItem = (joinTo, joinFrom, args) => ({
   ON: {
-    joinTo,
     joinFrom,
-    on: args
+    from: args[0],
+    joinTo,
+    to: args.length === 2 ? args[1] : args[2],
+    op: args.length === 2 ? void 0 : args[1]
   }
 });
 const pushQueryOnForOuter = (q, joinFrom, joinTo, ...on) => {
   return pushQueryValue(q, "and", {
     ON: {
-      joinTo: joinFrom,
       joinFrom: joinTo,
+      from: on[0],
+      joinTo: joinFrom,
+      to: on.length === 2 ? on[1] : on[2],
       useOuterAliases: true,
-      on
+      op: on.length === 2 ? void 0 : on[1]
     }
   });
 };
@@ -10357,11 +10368,11 @@ const _queryUpdate = (query, arg) => {
     } else {
       let value = set[key];
       if (typeof value === "function") {
-        value = resolveSubQueryCallback(
+        value = resolveSubQueryCallbackV2(
           query.baseQuery,
           value
         );
-        if (value instanceof Db && value.q.type) {
+        if (value instanceof Db && value.q.type && value.q.subQuery) {
           throw new OrchidOrmInternalError(
             value,
             `Only selecting queries are allowed inside callback of update, ${value.q.type} is given instead.`
@@ -10483,7 +10494,7 @@ class Update {
    *
    *   // use query that returns a single value
    *   // returning multiple values will result in Postgres error
-   *   column3: db.otherTable.get('someColumn'),
+   *   column3: () => db.otherTable.get('someColumn'),
    *
    *   // select a single value from a related record
    *   fromRelation: (q) => q.relatedTable.get('someColumn'),
@@ -10500,16 +10511,16 @@ class Update {
    * ```ts
    * await db.table.where({ ...conditions }).update({
    *   // `column` will be set to a value of the `otherColumn` of the created record.
-   *   column: db.otherTable.get('otherColumn').create({ ...data }),
+   *   column: () => db.otherTable.get('otherColumn').create({ ...data }),
    *
    *   // `column2` will be set to a value of the `otherColumn` of the updated record.
-   *   column2: db.otherTable
+   *   column2: () => db.otherTable
    *     .get('otherColumn')
    *     .findBy({ ...conditions })
    *     .update({ key: 'value' }),
    *
    *   // `column3` will be set to a value of the `otherColumn` of the deleted record.
-   *   column3: db.otherTable
+   *   column3: () => db.otherTable
    *     .get('otherColumn')
    *     .findBy({ ...conditions })
    *     .delete(),
@@ -12900,5 +12911,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, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, 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 };
+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, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, 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, resolveSubQueryCallbackV2, 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