pqb 0.47.4 → 0.48.0

package/dist/index.mjs

@@ -561,7 +561,7 @@ const indexInnerToCode = (index, t) => {
   if (columnsMultiline) {
     const objects = [];
     for (const column of index.columns) {
-      const expr = "column" in column ? column.column : column.expression;
+      const expr = "expression" in column ? column.expression : column.column;
       let hasOptions2 = false;
       for (const key in column) {
         if (key !== "column") {
@@ -572,7 +572,7 @@ const indexInnerToCode = (index, t) => {
         objects.push(`${singleQuote(expr)},`);
       } else {
         const props = [
-          `${"column" in column ? "column" : "expression"}: ${singleQuote(
+          `${"expression" in column ? "expression" : "column"}: ${singleQuote(
             expr
           )},`
         ];
@@ -642,9 +642,11 @@ const excludeInnerToCode = (item, t) => {
   const hasOptions = optionsKeys.some((key) => key && item.options[key]);
   const objects = [];
   for (const column of item.columns) {
-    const expr = "column" in column ? column.column : column.expression;
+    const expr = "expression" in column ? column.expression : column.column;
     const props = [
-      `${"column" in column ? "column" : "expression"}: ${singleQuote(expr)},`
+      `${"expression" in column ? "expression" : "column"}: ${singleQuote(
+        expr
+      )},`
     ];
     for (const key of columnOptions) {
       const value = column[key];
@@ -766,12 +768,14 @@ const foreignKeyArgumentToCode = ({
 const columnIndexesToCode = (items) => {
   const code = [];
   for (const { options, name } of items) {
-    addCode(code, `.${options.unique ? "unique" : "index"}(`);
+    addCode(
+      code,
+      `.${options.unique ? "unique" : "index"}(${name ? `${singleQuote(name)}` : ""}`
+    );
     const arr = [
       options.collate && `collate: ${singleQuote(options.collate)},`,
       options.opclass && `opclass: ${singleQuote(options.opclass)},`,
       options.order && `order: ${singleQuote(options.order)},`,
-      name && `name: ${singleQuote(name)},`,
       options.using && `using: ${singleQuote(options.using)},`,
       options.include && `include: ${typeof options.include === "string" ? singleQuote(options.include) : `[${options.include.map(singleQuote).join(", ")}]`},`,
       options.nullsNotDistinct && `nullsNotDistinct: true,`,
@@ -780,7 +784,7 @@ const columnIndexesToCode = (items) => {
       options.where && `where: ${singleQuote(options.where)},`
     ].filter((x) => !!x);
     if (arr.length) {
-      addCode(code, "{");
+      addCode(code, name ? `, {` : "{");
       addCode(code, arr);
       addCode(code, "}");
     }
@@ -1017,7 +1021,7 @@ const quoteValue = (arg, ctx, quotedAs, IN) => {
       return arg.toSQL(ctx, quotedAs);
     }
     if ("toSQL" in arg) {
-      return `(${getSqlText(arg.toSQL({ values: ctx.values }))})`;
+      return `(${getSqlText(arg.toSQL(ctx))})`;
     }
   }
   return addValue(ctx.values, arg);
@@ -1032,7 +1036,7 @@ const quoteLikeValue = (arg, ctx, quotedAs, jsonArray) => {
     }
     if ("toSQL" in arg) {
       return `replace(replace((${getSqlText(
-        arg.toSQL({ values: ctx.values })
+        arg.toSQL(ctx)
       )}), '%', '\\\\%'), '_', '\\\\_')`;
     }
   }
@@ -1115,9 +1119,7 @@ const quoteJsonValue = (arg, ctx, quotedAs, IN) => {
       return "to_jsonb(" + arg.toSQL(ctx, quotedAs) + ")";
     }
     if ("toSQL" in arg) {
-      return `to_jsonb((${getSqlText(
-        arg.toSQL({ values: ctx.values })
-      )}))`;
+      return `to_jsonb((${getSqlText(arg.toSQL(ctx))}))`;
     }
   }
   return addValue(ctx.values, JSON.stringify(arg)) + "::jsonb";
@@ -4675,7 +4677,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
         )
       );
     }
-    ctx.sql[1] = getSqlText(makeSQL(q2, { values: ctx.values }));
+    ctx.sql[1] = getSqlText(toSQL(q2, { values: ctx.values }));
   }
   return {
     hookSelect: returning.hookSelect,
@@ -5045,7 +5047,7 @@ const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) =>
     `${coalesce(
       ctx,
       query,
-      `(${getSqlText(makeSQL(query, ctx))})`,
+      `(${getSqlText(toSQL(query, ctx))})`,
       quotedAs
     )} "${as}"`
   );
@@ -5121,7 +5123,7 @@ const pushWithSql = (ctx, items) => {
     items.map((item) => {
       let inner;
       if (item.q) {
-        inner = getSqlText(makeSQL(item.q, ctx));
+        inner = getSqlText(toSQL(item.q, ctx));
       } else {
         inner = item.s.toSQL(ctx, `"${item.n}"`);
       }
@@ -5213,9 +5215,9 @@ const fromToSql = (ctx, data, from, quotedAs) => {
     } else {
       only = from.q.only;
       if (!from.table) {
-        sql = `(${getSqlText(makeSQL(from, ctx))})`;
+        sql = `(${getSqlText(toSQL(from, ctx))})`;
       } else if (!checkIfASimpleQuery(from)) {
-        sql = `(${getSqlText(makeSQL(from, ctx))})`;
+        sql = `(${getSqlText(toSQL(from, ctx))})`;
       } else {
         sql = quoteSchemaAndTable(from.q.schema, from.table);
       }
@@ -5476,16 +5478,6 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
 };
 
 const toSQL = (table, options) => {
-  if (table.q.sqlCache && !options?.clearCache) {
-    const cached = table.q.sqlCache;
-    if (options?.values && "values" in cached && cached.values && options.values !== cached.values) {
-      options.values.push(...cached.values);
-    }
-    return cached;
-  }
-  return table.q.sqlCache = makeSQL(table, options);
-};
-const makeSQL = (table, options) => {
   const query = table.q;
   const sql = [];
   const values = options?.values || [];
@@ -5535,10 +5527,10 @@ const makeSQL = (table, options) => {
   }
   const quotedAs = (query.as || table.table) && `"${query.as || table.table}"`;
   if (query.union) {
-    const s = getSqlText(makeSQL(query.union.b, { values }));
+    const s = getSqlText(toSQL(query.union.b, { values }));
     sql.push(query.union.p ? s : `(${s})`);
     for (const u of query.union.u) {
-      const s2 = isExpression(u.a) ? u.a.toSQL(ctx, quotedAs) : getSqlText(makeSQL(u.a, { values }));
+      const s2 = isExpression(u.a) ? u.a.toSQL(ctx, quotedAs) : getSqlText(toSQL(u.a, { values }));
       sql.push(`${u.k} ${u.p ? s2 : "(" + s2 + ")"}`);
     }
   } else {
@@ -5672,7 +5664,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
       } else {
         const q = joinSubQuery(table, query2);
         q.q.select = [query2.q.expr];
-        ands.push(`(${getSqlText(makeSQL(q, ctx))})`);
+        ands.push(`(${getSqlText(toSQL(q, ctx))})`);
       }
     } else {
       pushWhereToSql(
@@ -5857,7 +5849,7 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
   } else if (isExpression(arg.values)) {
     value = arg.values.toSQL(ctx, quotedAs);
   } else {
-    value = `(${getSqlText(makeSQL(arg.values, ctx))})`;
+    value = `(${getSqlText(toSQL(arg.values, ctx))})`;
   }
   const columnsSql = arg.columns.map((column) => columnToSql(ctx, query, query.shape, column, quotedAs)).join(", ");
   ands.push(`${multiple ? `(${columnsSql})` : columnsSql} IN ${value}`);
@@ -5979,11 +5971,7 @@ const subJoinToSql = (ctx, jq, innerAs, outerAs, cloned) => {
     if (!cloned) jq = jq.clone();
     jq.q.select = [new RawSQL(`${innerAs}.*`)];
   }
-  return `(${getSqlText(
-    jq.toSQL({
-      values: ctx.values
-    })
-  )}) ${outerAs || innerAs}`;
+  return `(${getSqlText(jq.toSQL(ctx))}) ${outerAs || innerAs}`;
 };
 const processArgs = (args, ctx, query, joinAs, joinShape, quotedAs) => {
   return args.length ? args.length === 1 ? getObjectOrRawConditions(
@@ -6076,7 +6064,6 @@ const skipQueryKeysForSubQuery = {
   joinedShapes: true,
   returnsOne: true,
   aliases: true,
-  sqlCache: true,
   defaults: true,
   transform: true
 };
@@ -7025,7 +7012,7 @@ const _chain = (fromQuery, toQuery, rel) => {
 };
 
 const getClonedQueryData = (query) => {
-  return { ...query, sqlCache: void 0 };
+  return { ...query };
 };
 const getQueryAs = (q) => {
   return q.q.as || q.table;
@@ -11949,7 +11936,6 @@ class QueryMethods {
    *
    * ```ts
    * type ToSqlOptions = {
-   *   clearCache?: true;
    *   values?: [];
    * };
    * ```
@@ -13121,5 +13107,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, 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, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
+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, 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, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
 //# sourceMappingURL=index.mjs.map