pqb 0.51.3 → 0.51.5

package/dist/index.mjs

@@ -878,12 +878,6 @@ const columnCode = (type, ctx, key, code) => {
   }
   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.default !== void 0 && data.default !== data.defaultDefault && (!ctx.migration || typeof data.default !== "function")) {
     addCode(
@@ -930,6 +924,60 @@ const getSqlText = (sql) => {
   throw new Error(`Batch SQL is not supported in this query`);
 };
 
+class CustomTypeColumn extends ColumnType {
+  constructor(schema, dataType, extension) {
+    super(
+      schema,
+      schema.unknown(),
+      schema.unknown(),
+      schema.unknown()
+    );
+    this.dataType = dataType;
+    this.operators = Operators.any;
+    this.data.isOfCustomType = true;
+    this.data.extension = extension;
+  }
+  toCode(ctx, key) {
+    return columnCode(this, ctx, key, `type(${singleQuote(this.dataType)})`);
+  }
+  as(column) {
+    const c = setColumnData(
+      this,
+      "as",
+      column
+    );
+    c.inputSchema = column.inputSchema;
+    c.outputSchema = column.outputSchema;
+    c.querySchema = column.querySchema;
+    return c;
+  }
+}
+class DomainColumn extends CustomTypeColumn {
+  toCode(ctx, key) {
+    return columnCode(this, ctx, key, `domain(${singleQuote(this.dataType)})`);
+  }
+}
+
+class EnumColumn extends ColumnType {
+  constructor(schema, enumName, options, schemaType) {
+    super(schema, schemaType);
+    this.enumName = enumName;
+    this.options = options;
+    this.operators = Operators.any;
+    this.dataType = "enum";
+    this.inputSchema = this.outputSchema = this.querySchema = schemaType;
+  }
+  toCode(ctx, key) {
+    const options = ctx.migration ? "" : `, [${this.options.map((option) => `'${option}'`).join(", ")}]`;
+    return columnCode(this, ctx, key, `enum('${this.enumName}'${options})`);
+  }
+  toSQL() {
+    const name = this.enumName;
+    const index = name.indexOf(".");
+    return `"${index === -1 ? name : `${name.slice(0, index)}"."${name.slice(index + 1)}`}"`;
+  }
+}
+
 const addColumnParserToQuery = (q, key, column) => {
   if (column._parse) {
     setObjectValueImmutable(
@@ -941,7 +989,7 @@ const addColumnParserToQuery = (q, key, column) => {
   }
 };
 const setColumnDefaultParse = (column, parse) => {
-  column.data.parse = column.data.defaultParse = parse;
+  column.data.parse = parse;
   column._parse = (input) => input === null ? null : parse(input);
 };
 const setColumnParse = (column, fn, outputSchema) => {
@@ -966,6 +1014,9 @@ const setColumnEncode = (column, fn, inputSchema) => {
   c.data = { ...column.data, encode: fn };
   return c;
 };
+const getColumnBaseType = (column, domainsMap, type) => {
+  return column instanceof EnumColumn ? "text" : column instanceof DomainColumn ? domainsMap[column.dataType]?.dataType : type;
+};
 
 function setQueryOperators(query, operators) {
   const q = query.q;
@@ -1641,7 +1692,7 @@ class DateBaseColumn extends ColumnType {
     this.operators = Operators.date;
     this.asNumber = schema.dateAsNumber;
     this.asDate = schema.dateAsDate;
-    this.data.encode = this.data.defaultEncode = dateTimeEncode;
+    this.data.encode = dateTimeEncode;
   }
 }
 class DateColumn extends DateBaseColumn {
@@ -1785,13 +1836,13 @@ class BooleanColumn extends ColumnType {
 }
 const parseItem = (input) => input[0] === "t";
 
-const encode = (x) => x === null ? x : JSON.stringify(x);
+const encode$1 = (x) => x === null ? x : JSON.stringify(x);
 class JSONColumn extends ColumnType {
   constructor(schema, inputType) {
     super(schema, inputType);
     this.dataType = "jsonb";
     this.operators = Operators.json;
-    this.data.encode = this.data.defaultEncode = encode;
+    this.data.encode = encode$1;
     this.data.parseItem = JSON.parse;
   }
   toCode(ctx, key) {
@@ -2378,33 +2429,13 @@ const _joinLateral = (self, type, arg, as) => {
   return q;
 };
 
-class EnumColumn extends ColumnType {
-  constructor(schema, enumName, options, schemaType) {
-    super(schema, schemaType);
-    this.enumName = enumName;
-    this.options = options;
-    this.operators = Operators.any;
-    this.dataType = "enum";
-    this.inputSchema = this.outputSchema = this.querySchema = schemaType;
-  }
-  toCode(ctx, key) {
-    const options = ctx.migration ? "" : `, [${this.options.map((option) => `'${option}'`).join(", ")}]`;
-    return columnCode(this, ctx, key, `enum('${this.enumName}'${options})`);
-  }
-  toSQL() {
-    const name = this.enumName;
-    const index = name.indexOf(".");
-    return `"${index === -1 ? name : `${name.slice(0, index)}"."${name.slice(index + 1)}`}"`;
-  }
-}
-
 class ArrayColumn extends ColumnType {
   constructor(schema, item, inputType, outputType, queryType) {
     super(schema, inputType, outputType, queryType);
     this.dataType = "array";
     this.operators = Operators.array;
     item.data.isNullable = true;
-    setColumnDefaultParse(this, (input) => parse.call(this, input));
+    setColumnDefaultParse(this, (input) => parse$1.call(this, input));
     this.data.item = item instanceof ArrayColumn ? item.data.item : item;
     this.data.name = item.data.name;
     this.data.arrayDims = item instanceof ArrayColumn ? item.data.arrayDims + 1 : 1;
@@ -2429,7 +2460,7 @@ class ArrayColumn extends ColumnType {
     return columnCode(this, ctx, key, code);
   }
 }
-const parse = function(source) {
+const parse$1 = function(source) {
   if (typeof source !== "string") return source;
   const entries = [];
   parsePostgresArray(source, entries, this.data.item.data.parseItem);
@@ -2692,14 +2723,10 @@ const defaultSchemaConfig = {
     return this;
   },
   dateAsNumber() {
-    const c = this.parse(Date.parse);
-    c.data.defaultParse = Date.parse;
-    return c;
+    return this.parse(Date.parse);
   },
   dateAsDate() {
-    const c = this.parse(parseDateToDate);
-    c.data.defaultParse = parseDateToDate;
-    return c;
+    return this.parse(parseDateToDate);
   },
   enum(dataType, type) {
     return new EnumColumn(defaultSchemaConfig, dataType, type, void 0);
@@ -2911,10 +2938,9 @@ class Transaction {
         await adapter.query(sql);
         if (log) log.afterQuery(sql, logData);
         if (transactionId === trx.testTransactionCount) {
-          await runAfterCommit(
-            trx.afterCommit,
-            result
-          );
+          const { afterCommit } = trx;
+          trx.afterCommit = void 0;
+          await runAfterCommit(afterCommit, result);
         }
         return result;
       } finally {
@@ -7149,46 +7175,8 @@ const joinSubQuery = (q, sub) => {
   );
 };
 
-class CustomTypeColumn extends ColumnType {
-  constructor(schema, dataType, extension) {
-    super(
-      schema,
-      schema.unknown(),
-      schema.unknown(),
-      schema.unknown()
-    );
-    this.dataType = dataType;
-    this.operators = Operators.any;
-    this.data.isOfCustomType = true;
-    this.data.extension = extension;
-  }
-  toCode(ctx, key) {
-    return columnCode(this, ctx, key, `type(${singleQuote(this.dataType)})`);
-  }
-  as(column) {
-    const c = setColumnData(
-      this,
-      "as",
-      column
-    );
-    c.inputSchema = column.inputSchema;
-    c.outputSchema = column.outputSchema;
-    c.querySchema = column.querySchema;
-    return c;
-  }
-}
-class DomainColumn extends CustomTypeColumn {
-  toCode(ctx, key) {
-    return columnCode(this, ctx, key, `domain(${singleQuote(this.dataType)})`);
-  }
-}
-
 const defaultSrid = 4326;
-const defaultEncode = ({
-  srid = defaultSrid,
-  lon,
-  lat
-}) => {
+const encode = ({ srid = defaultSrid, lon, lat }) => {
   const arr = new Uint8Array(25);
   const view = new DataView(arr.buffer);
   view.setInt8(0, 1);
@@ -7204,8 +7192,8 @@ class PostgisGeographyPointColumn extends ColumnType {
     super(schema, schema.geographyPointSchema());
     this.dataType = "geography(Point)";
     this.operators = Operators.any;
-    setColumnDefaultParse(this, defaultParse);
-    this.data.encode = this.data.defaultEncode = defaultEncode;
+    setColumnDefaultParse(this, parse);
+    this.data.encode = encode;
   }
   static isDefaultPoint(typmod) {
     return typmodType(typmod) === "Point" && typmodSrid(typmod) === defaultSrid;
@@ -7214,8 +7202,9 @@ class PostgisGeographyPointColumn extends ColumnType {
     return columnCode(this, ctx, key, `geography.point()`);
   }
 }
-PostgisGeographyPointColumn.encode = defaultEncode;
-const defaultParse = (input) => {
+// It is used by test-factory
+PostgisGeographyPointColumn.encode = encode;
+const parse = (input) => {
   const bytes = new Uint8Array(20);
   for (let i = 0; i < 40; i += 2) {
     bytes[i / 2] = parseInt(input.slice(10 + i, 12 + i), 16);
@@ -13202,5 +13191,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, assignDbDataToColumn, 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, 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 };
+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, assignDbDataToColumn, 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, getColumnBaseType, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, 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