pqb 0.51.2 → 0.51.4

package/dist/index.d.ts

@@ -380,7 +380,10 @@ interface CommonQueryData {
         aliases: string[];
     };
     selectAllColumns?: string[];
-    selectableShape: RecordUnknown;
+    /**
+     * Subset of the `shape` that only includes columns with no `data.explicitSelect`.
+     */
+    selectAllShape: RecordUnknown;
     /**
      * column type for query with 'value' or 'valueOrThrow' return type
      * Is needed in {@link getShapeFromSelect} to get shape of sub-select that returns a single value.
@@ -2727,7 +2730,7 @@ declare class IntervalColumn<Schema extends ColumnSchemaConfig> extends ColumnTy
     toSQL(): string;
 }
 
-declare class EnumColumn<Schema extends ColumnTypeSchemaArg, SchemaType extends Schema['type'], U extends string = string, T extends readonly [U, ...U[]] = [U]> extends ColumnType<Schema, T[number], SchemaType, OperatorsAny> {
+declare class EnumColumn<Schema extends ColumnTypeSchemaArg, SchemaType extends Schema['type'], T extends readonly string[]> extends ColumnType<Schema, T[number], SchemaType, OperatorsAny> {
     enumName: string;
     options: T;
     operators: OperatorsAny;
@@ -3364,7 +3367,7 @@ interface DefaultSchemaConfig extends ColumnSchemaConfig<ColumnType> {
     };
     dateAsNumber<T extends ColumnType>(this: T): ParseColumn<T, unknown, number>;
     dateAsDate<T extends ColumnType>(this: T): ParseColumn<T, unknown, Date>;
-    enum<U extends string, T extends readonly [U, ...U[]]>(dataType: string, type: T): EnumColumn<DefaultSchemaConfig, unknown, U, T>;
+    enum<T extends readonly string[]>(dataType: string, type: T): EnumColumn<DefaultSchemaConfig, unknown, T>;
     array<Item extends ArrayColumnValue>(item: Item): ArrayColumn<DefaultSchemaConfig, Item, unknown, unknown, unknown>;
     json<T>(): JSONColumn<unknown extends T ? MaybeArray<string | number | boolean | object> : T, DefaultSchemaConfig>;
     inputSchema(): undefined;
@@ -8566,7 +8569,7 @@ interface PostgisPoint {
 declare class PostgisGeographyPointColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, PostgisPoint, ReturnType<Schema['geographyPointSchema']>, OperatorsAny> {
     dataType: string;
     operators: OperatorsAny;
-    static encode: ({ srid, lon, lat, }: PostgisPoint) => string;
+    static encode: ({ srid, lon, lat }: PostgisPoint) => string;
     static isDefaultPoint(typmod: number): boolean;
     constructor(schema: Schema);
     toCode(ctx: ColumnToCodeCtx, key: string): Code;

package/dist/index.js

@@ -880,12 +880,6 @@ const columnCode = (type, ctx, key, code) => {
   }
   if (data.explicitSelect) orchidCore.addCode(code, ".select(false)");
   if (data.isNullable) orchidCore.addCode(code, ".nullable()");
-  if (data.encode && data.encode !== data.defaultEncode)
-    orchidCore.addCode(code, `.encode(${data.encode.toString()})`);
-  if (data.parse && data.parse !== data.defaultParse)
-    orchidCore.addCode(code, `.parse(${data.parse.toString()})`);
-  if (type.data.parseNull)
-    orchidCore.addCode(code, `.parseNull(${type.data.parseNull.toString()})`);
   if (data.as) orchidCore.addCode(code, `.as(${data.as.toCode(ctx, key)})`);
   if (data.default !== void 0 && data.default !== data.defaultDefault && (!ctx.migration || typeof data.default !== "function")) {
     orchidCore.addCode(
@@ -943,7 +937,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) => {
@@ -1643,7 +1637,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 {
@@ -1787,13 +1781,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) {
@@ -2406,7 +2400,7 @@ class ArrayColumn extends ColumnType {
     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;
@@ -2431,7 +2425,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);
@@ -2694,14 +2688,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);
@@ -4232,9 +4222,6 @@ const setParserForSelectedString = (query, arg, as, columnAs, columnAlias) => {
   return arg;
 };
 const selectColumn = (query, q, key, columnAs, columnAlias) => {
-  if (columnAlias === "pluck") {
-    throw new Error("?");
-  }
   if (columnAs && q.parsers) {
     const parser = q.parsers[key];
     if (parser) orchidCore.setObjectValueImmutable(q, "parsers", columnAs, parser);
@@ -4271,7 +4258,9 @@ const getShapeFromSelect = (q, isSubQuery) => {
       result = {};
       for (const key in shape) {
         const column = shape[key];
-        result[key] = column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
+        if (!column.data.explicitSelect) {
+          result[key] = column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
+        }
       }
     } else {
       result = shape;
@@ -4331,10 +4320,12 @@ const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, ke
     }
   } else if (arg === "*") {
     for (const key2 in shape) {
-      result[key2] = mapSubSelectColumn(
-        shape[key2],
-        isSubQuery
-      );
+      if (!shape[key2].data.explicitSelect) {
+        result[key2] = mapSubSelectColumn(
+          shape[key2],
+          isSubQuery
+        );
+      }
     }
   } else {
     result[key || arg] = mapSubSelectColumn(
@@ -4863,7 +4854,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
           if (hookSelect) {
             selected ?? (selected = {});
             selectedAs ?? (selectedAs = {});
-            for (const key in query.selectableShape) {
+            for (const key in query.selectAllShape) {
               selected[key] = quotedAs;
               selectedAs[key] = key;
             }
@@ -5012,7 +5003,7 @@ function selectedObjectToSQL(ctx, quotedAs, item) {
 }
 const selectAllSql = (query, quotedAs, jsonList) => {
   if (jsonList) {
-    Object.assign(jsonList, query.selectableShape);
+    Object.assign(jsonList, query.selectAllShape);
   }
   return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
@@ -7185,11 +7176,7 @@ class DomainColumn extends CustomTypeColumn {
 }
 
 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);
@@ -7205,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;
@@ -7215,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);
@@ -11812,7 +11800,7 @@ class ExpressionMethods {
   column(name) {
     const column = this.shape[name];
     return new ColumnRefExpression(
-      column,
+      column || UnknownColumn.instance,
       name
     );
   }
@@ -11854,12 +11842,12 @@ class ExpressionMethods {
       if (table === as) {
         column = shape[col];
       } else {
-        column = q.q.joinedShapes[table][col];
+        column = q.q.joinedShapes?.[table][col];
       }
     } else {
       column = shape[arg];
     }
-    return new RefExpression(column, q, arg);
+    return new RefExpression(column || UnknownColumn.instance, q, arg);
   }
   val(value) {
     return new orchidCore.ValExpression(value);
@@ -12739,7 +12727,7 @@ const parseIndexOrExclude = (item) => {
 
 const anyShape = {};
 class Db extends QueryMethods {
-  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = orchidCore.emptyObject) {
+  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = {}) {
     super();
     this.adapter = adapter;
     this.queryBuilder = queryBuilder;
@@ -12833,26 +12821,21 @@ class Db extends QueryMethods {
     );
     this.columns = columns;
     if (options.computed) applyComputedColumns(this, options.computed);
-    const selectableShape = this.q.selectableShape = {};
     if (prepareSelectAll) {
+      const selectAllShape = this.q.selectAllShape = {};
       const list = [];
       for (const key in shape) {
         const column = shape[key];
-        if (!column.data.explicitSelect && !(column instanceof VirtualColumn)) {
+        if (!column.data.explicitSelect) {
           list.push(
             column.data.name ? `"${column.data.name}" "${key}"` : `"${key}"`
           );
-          selectableShape[key] = column;
+          selectAllShape[key] = column;
         }
       }
       this.q.selectAllColumns = list;
     } else {
-      for (const key in shape) {
-        const column = shape[key];
-        if (column instanceof VirtualColumn) {
-          selectableShape[key] = column;
-        }
-      }
+      this.q.selectAllShape = shape;
     }
     if (modifyQuery) {
       for (const cb of modifyQuery) {