pqb 0.36.14 → 0.36.16

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, MaybeArray, TemplateLiteralArgs, QueryColumn, MaybePromise, FnUnknownToUnknown, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, BatchParsers, HookSelect, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, getValueKey, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ExpressionData, ValExpression, PickOutputType, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DbBase, QueryCatch, TransactionState, ColumnTypeBase, PickQueryUniqueProperties, PickQueryMetaResult, IsQuery, PickQueryTableMetaResultInputType, MergeObjects, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase } from 'orchid-core';
+import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, MaybeArray, TemplateLiteralArgs, QueryColumn, MaybePromise, FnUnknownToUnknown, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, BatchParsers, HookSelect, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, getValueKey, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ExpressionData, ValExpression, PickOutputType, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DbBase, QueryCatch, TransactionState, ColumnTypeBase, PickQueryUniqueProperties, PickQueryMetaResult, IsQuery, PickQueryTableMetaResultInputType, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase } from 'orchid-core';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
@@ -2951,7 +2951,7 @@ declare abstract class LimitedTextBaseColumn<Schema extends ColumnSchemaConfig>
     data: TextColumnData & {
         maxChars?: number;
     };
-    constructor(schema: Schema, limit: number);
+    constructor(schema: Schema, limit?: number);
     toSQL(): string;
 }
 declare class VarCharColumn<Schema extends ColumnSchemaConfig> extends LimitedTextBaseColumn<Schema> {
@@ -3181,7 +3181,7 @@ interface DefaultSchemaConfig extends ColumnSchemaConfig<ColumnType> {
     doublePrecision(): DoublePrecisionColumn<DefaultSchemaConfig>;
     bigSerial(): BigSerialColumn<DefaultSchemaConfig>;
     money(): MoneyColumn<DefaultSchemaConfig>;
-    varchar(limit: number): VarCharColumn<DefaultSchemaConfig>;
+    varchar(limit?: number): VarCharColumn<DefaultSchemaConfig>;
     text(): TextColumn<DefaultSchemaConfig>;
     string(limit?: number): StringColumn$1<DefaultSchemaConfig>;
     citext(): CitextColumn<DefaultSchemaConfig>;
@@ -5066,8 +5066,8 @@ declare class QueryLog {
 
 type MergeQuery<T extends PickQueryMetaResultReturnTypeWithDataWindows, Q extends PickQueryMetaResultReturnTypeWithDataWindows> = {
     [K in keyof T]: K extends 'meta' ? {
-        [K in keyof T['meta'] | keyof Q['meta']]: K extends 'selectable' ? MergeObjects<T['meta']['selectable'], Q['meta']['selectable']> : K extends keyof Q['meta'] ? Q['meta'][K] : T['meta'][K];
-    } : K extends 'result' ? MergeQueryResult<T, Q> : K extends 'returnType' ? Q['returnType'] extends undefined ? T['returnType'] : Q['returnType'] : K extends 'then' ? QueryThen<GetQueryResult<Q['returnType'] extends undefined ? T : Q, MergeQueryResult<T, Q>>> : K extends 'windows' ? MergeObjects<T['windows'], Q['windows']> : K extends 'withData' ? MergeObjects<T['withData'], Q['withData']> : T[K];
+        [K in keyof T['meta'] | keyof Q['meta']]: K extends 'selectable' ? Q['meta']['selectable'] & Omit<T['meta']['selectable'], keyof Q['meta']['selectable']> : K extends keyof Q['meta'] ? Q['meta'][K] : T['meta'][K];
+    } : K extends 'result' ? MergeQueryResult<T, Q> : K extends 'returnType' ? Q['returnType'] extends undefined ? T['returnType'] : Q['returnType'] : K extends 'then' ? QueryThen<GetQueryResult<Q['returnType'] extends undefined ? T : Q, MergeQueryResult<T, Q>>> : K extends 'windows' ? Q['windows'] & Omit<T['windows'], keyof Q['windows']> : K extends 'withData' ? Q['withData'] & Omit<T['withData'], keyof Q['withData']> : T[K];
 };
 type MergeQueryResult<T extends PickQueryMetaResult, Q extends PickQueryMetaResult> = T['meta']['hasSelect'] extends true ? Q['meta']['hasSelect'] extends true ? {
     [K in keyof T['result'] | keyof Q['result']]: K extends keyof Q['result'] ? Q['result'][K] : T['result'][K];

package/dist/index.js

@@ -1270,11 +1270,17 @@ class TextBaseColumn extends ColumnType {
 }
 class LimitedTextBaseColumn extends TextBaseColumn {
   constructor(schema, limit) {
-    super(schema, schema.stringMax(limit));
+    super(
+      schema,
+      limit !== void 0 ? schema.stringMax(limit) : schema.stringSchema()
+    );
     this.data.maxChars = limit;
   }
   toSQL() {
-    return orchidCore.joinTruthy(this.dataType, `(${this.data.maxChars})`);
+    return orchidCore.joinTruthy(
+      this.dataType,
+      this.data.maxChars !== void 0 && `(${this.data.maxChars})`
+    );
   }
 }
 class VarCharColumn extends LimitedTextBaseColumn {
@@ -2593,7 +2599,7 @@ var __spreadValues$g = (a, b) => {
   return a;
 };
 var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
-const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
+const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
   var _a;
   if (typeof first === "string") {
     if (first in joinTo.relations) {
@@ -2603,7 +2609,11 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
         const r = args[0](
           makeJoinQueryBuilder(j, j.q.joinedShapes, joinTo)
         );
-        return { j: j.merge(r), s: joinSubQuery || getIsJoinSubQuery(r), r };
+        return {
+          j: j.merge(r),
+          s: whereExists ? false : joinSubQuery || getIsJoinSubQuery(r),
+          r
+        };
       }
       return { j, s: joinSubQuery };
     } else if (typeof args[0] !== "function") {
@@ -2635,7 +2645,11 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
           joinTo
         )
       );
-      return { w: first, r, s: joinSubQuery || getIsJoinSubQuery(r) };
+      return {
+        w: first,
+        r,
+        s: whereExists ? false : joinSubQuery || getIsJoinSubQuery(r)
+      };
     }
   }
   const args0 = args.length ? args[0] : orchidCore.returnArg;
@@ -5260,7 +5274,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
     const column = q.shape[key];
     quotedColumns[0] = `"${(column == null ? void 0 : column.data.name) || key}"`;
     if (Array.isArray(values) && Array.isArray(values[0])) {
-      values = [[void 0]];
+      values = values.map(() => [void 0]);
     }
   }
   ctx.sql.push(
@@ -7150,7 +7164,7 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
           item[key]
         );
       }
-      if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.computed || shape === anyShape)) {
+      if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.computed || shape === anyShape) && item[key] !== void 0) {
         ctx.columns.set(key, ctx.columns.size);
         encoders[key] = (_c = shape[key]) == null ? void 0 : _c.encodeFn;
       }
@@ -7161,11 +7175,6 @@ const createCtx = () => ({
   columns: /* @__PURE__ */ new Map(),
   resultAll: void 0
 });
-const mapColumnValues = (columns, encoders, data) => {
-  return columns.map(
-    (key) => encoders[key] && !orchidCore.isExpression(data[key]) ? encoders[key](data[key]) : data[key]
-  );
-};
 const handleOneData = (q, data, ctx) => {
   const encoders = {};
   const defaults = q.q.defaults;
@@ -7174,7 +7183,14 @@ const handleOneData = (q, data, ctx) => {
   }
   processCreateItem(q, data, 0, ctx, encoders);
   const columns = Array.from(ctx.columns.keys());
-  const values = [mapColumnValues(columns, encoders, data)];
+  const values = [
+    columns.map(
+      (key) => (
+        // undefined values were stripped and no need to check for them
+        encoders[key] && !orchidCore.isExpression(data[key]) ? encoders[key](data[key]) : data[key]
+      )
+    )
+  ];
   return { columns, values };
 };
 const handleManyData = (q, data, ctx) => {
@@ -7189,7 +7205,9 @@ const handleManyData = (q, data, ctx) => {
   const values = Array(data.length);
   const columns = Array.from(ctx.columns.keys());
   data.forEach((item, i) => {
-    values[i] = mapColumnValues(columns, encoders, item);
+    values[i] = columns.map(
+      (key) => encoders[key] && item[key] !== void 0 && !orchidCore.isExpression(item[key]) ? encoders[key](item[key]) : item[key]
+    );
   });
   return { columns, values };
 };
@@ -9454,20 +9472,7 @@ const _queryWhereIn = (q, and, arg, values, not) => {
   return q;
 };
 const existsArgs = (self, q, args) => {
-  let joinSubQuery;
-  if (typeof q === "object") {
-    joinSubQuery = getIsJoinSubQuery(q);
-    if (joinSubQuery) {
-      q = q.clone();
-      q.shape = getShapeFromSelect(
-        q,
-        true
-      );
-    }
-  } else {
-    joinSubQuery = false;
-  }
-  const joinArgs = processJoinArgs(self, q, args, joinSubQuery);
+  const joinArgs = processJoinArgs(self, q, args, false, true);
   return [
     {
       EXISTS: joinArgs