pqb 0.40.1 → 0.40.2

package/dist/index.mjs

@@ -919,7 +919,7 @@ const makeVarArg = (_op) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   );
 };
-const quoteValue$1 = (arg, ctx, quotedAs, jsonArray) => {
+const quoteValue = (arg, ctx, quotedAs, jsonArray) => {
   if (arg && typeof arg === "object") {
     if (!jsonArray && Array.isArray(arg)) {
       return `(${arg.map((value) => addValue(ctx.values, value)).join(", ")})`;
@@ -951,16 +951,16 @@ const quoteLikeValue = (arg, ctx, quotedAs, jsonArray) => {
 };
 const base = {
   equals: make(
-    (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, ctx, quotedAs)}`
   ),
   not: make(
-    (key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, ctx, quotedAs)}`
   ),
   in: make(
-    (key, value, ctx, quotedAs) => `${key} IN ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} IN ${quoteValue(value, ctx, quotedAs)}`
   ),
   notIn: make(
-    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
   )
 };
 const boolean = __spreadProps$b(__spreadValues$k({}, base), {
@@ -973,19 +973,19 @@ const boolean = __spreadProps$b(__spreadValues$k({}, base), {
 });
 const numeric = __spreadProps$b(__spreadValues$k({}, base), {
   lt: make(
-    (key, value, ctx, quotedAs) => `${key} < ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
   ),
   lte: make(
-    (key, value, ctx, quotedAs) => `${key} <= ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} <= ${quoteValue(value, ctx, quotedAs)}`
   ),
   gt: make(
-    (key, value, ctx, quotedAs) => `${key} > ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} > ${quoteValue(value, ctx, quotedAs)}`
   ),
   gte: make(
-    (key, value, ctx, quotedAs) => `${key} >= ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} >= ${quoteValue(value, ctx, quotedAs)}`
   ),
   between: make(
-    (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue$1(from, ctx, quotedAs)} AND ${quoteValue$1(
+    (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue(from, ctx, quotedAs)} AND ${quoteValue(
       to,
       ctx,
       quotedAs
@@ -1039,10 +1039,10 @@ const json = __spreadProps$b(__spreadValues$k({}, base), {
     { _op: jsonPathQueryOp }
   ),
   jsonSupersetOf: make(
-    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue$1(value, ctx, quotedAs, true)}`
+    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs, true)}`
   ),
   jsonSubsetOf: make(
-    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue$1(value, ctx, quotedAs, true)}`
+    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs, true)}`
   ),
   jsonSet: makeVarArg(
     (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${addValue(
@@ -3180,25 +3180,26 @@ const defaultSchemaConfig = {
   timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
 };
 
-const quoteValue = (value, nested = false) => {
+const escape = (value, migration, nested) => {
   const type = typeof value;
   if (type === "number" || type === "bigint")
     return String(value);
   else if (type === "string")
-    return quoteString(value);
+    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 `${nested ? "" : "ARRAY"}[${value.map((el) => quoteValue(el, true)).join(",")}]`;
+    return migration && nested && !value.length ? "" : (migration ? "{" : nested ? "[" : "ARRAY[") + value.map((el) => escape(el, migration, true)).join(",") + (migration ? "}" : "]");
   else if (value === null || value === void 0)
     return "NULL";
   else
-    return quoteString(JSON.stringify(value));
+    return escapeString(JSON.stringify(value));
 };
-const quote = (value) => quoteValue(value);
-const quoteString = (value) => `'${value.replaceAll("'", "''")}'`;
+const escapeForLog = (value) => escape(value);
+const escapeForMigration = (value) => escape(value, true);
+const escapeString = (value) => `'${value.replaceAll("'", "''")}'`;
 
 const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values) => {
   const elapsed = process.hrtime(time);
@@ -3207,7 +3208,7 @@ const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values
   if (!(values == null ? void 0 : values.length)) {
     return result;
   }
-  const formattedValues = `[${values.map(quote).join(", ")}]`;
+  const formattedValues = `[${values.map(escapeForLog).join(", ")}]`;
   return `${result} ${colors ? valuesColor(formattedValues) : formattedValues}`;
 };
 const logParamToLogObject = (logger, log) => {
@@ -4240,7 +4241,7 @@ const addParserForSelectItem = (q, as, key, arg) => {
             let returnType = originalReturnType;
             const { hookSelect } = query;
             const batches = [];
-            let last = path.length;
+            const last = path.length;
             if (returnType === "value" || returnType === "valueOrThrow") {
               if (hookSelect) {
                 batches.push = (item) => {
@@ -4250,8 +4251,6 @@ const addParserForSelectItem = (q, as, key, arg) => {
                   batches.push = Array.prototype.push;
                   return batches.push(item);
                 };
-              } else {
-                last--;
               }
             }
             collectNestedSelectBatches(batches, rows, path, last);
@@ -4312,19 +4311,19 @@ const addParserForSelectItem = (q, as, key, arg) => {
                 const parse = (_b2 = query.parsers) == null ? void 0 : _b2[getValueKey];
                 if (parse) {
                   if (returnType === "value") {
-                    for (const { data } of batches) {
-                      data[key] = data[key] === void 0 ? arg.q.notFoundDefault : parse(data[key]);
+                    for (const item of batches) {
+                      item.parent[item.key] = item.data = item.data === void 0 ? arg.q.notFoundDefault : parse(item.data);
                     }
                   } else {
-                    for (const { data } of batches) {
-                      if (data[key] === void 0)
+                    for (const item of batches) {
+                      if (item.data === void 0)
                         throw new NotFoundError(arg);
-                      data[key] = parse(data[key]);
+                      item.parent[item.key] = item.data = parse(item.data);
                     }
                   }
                 } else if (returnType !== "value") {
                   for (const { data } of batches) {
-                    if (data[key] === void 0)
+                    if (data === void 0)
                       throw new NotFoundError(arg);
                   }
                 }
@@ -4393,7 +4392,9 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
   const stack = rows.map(
     (row) => ({
       data: row,
-      i: 0
+      parent: row,
+      i: 0,
+      key: path[0]
     })
   );
   while (stack.length > 0) {
@@ -5825,7 +5826,7 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
   }).join(", ")})` : "";
   const target = "from" in copy ? copy.from : copy.to;
   sql.push(
-    `COPY "${table.table}"${columns} ${"from" in copy ? "FROM" : "TO"} ${typeof target === "string" ? quoteString(target) : `PROGRAM ${quoteString(target.program)}`}`
+    `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 = [];
@@ -5834,15 +5835,15 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
     if (copy.freeze)
       options.push(`FREEZE ${copy.freeze}`);
     if (copy.delimiter)
-      options.push(`DELIMITER ${quoteString(copy.delimiter)}`);
+      options.push(`DELIMITER ${escapeString(copy.delimiter)}`);
     if (copy.null)
-      options.push(`NULL ${quoteString(copy.null)}`);
+      options.push(`NULL ${escapeString(copy.null)}`);
     if (copy.header)
       options.push(`HEADER ${copy.header}`);
     if (copy.quote)
-      options.push(`QUOTE ${quoteString(copy.quote)}`);
+      options.push(`QUOTE ${escapeString(copy.quote)}`);
     if (copy.escape)
-      options.push(`ESCAPE ${quoteString(copy.escape)}`);
+      options.push(`ESCAPE ${escapeString(copy.escape)}`);
     if (copy.forceQuote)
       options.push(
         `FORCE_QUOTE ${copy.forceQuote === "*" ? "*" : `(${copy.forceQuote.map((x) => `"${x}"`).join(", ")})`}`
@@ -5856,7 +5857,7 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
         `FORCE_NULL (${copy.forceNull.map((x) => `"${x}"`).join(", ")})`
       );
     if (copy.encoding)
-      options.push(`ENCODING ${quoteString(copy.encoding)}`);
+      options.push(`ENCODING ${escapeString(copy.encoding)}`);
     sql.push(`WITH (${options.join(", ")})`);
   }
   pushWhereStatementSql(ctx, table, query, quotedAs);
@@ -12986,5 +12987,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, QueryBase, 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, _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, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, 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, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, 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, QueryBase, 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, _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, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, 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, 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, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
 //# sourceMappingURL=index.mjs.map