pqb 0.25.1 → 0.26.1

package/dist/index.js

@@ -656,6 +656,7 @@ const columnCode = (type, t, code, data = type.data, skip) => {
   return code.length === 1 && typeof code[0] === "string" ? code[0] : code;
 };
 
+const joinStatementsSet = /* @__PURE__ */ new Set();
 function simpleColumnToSQL(ctx, key, column, quotedAs) {
   if (!column)
     return `"${key}"`;
@@ -831,7 +832,7 @@ class JSONColumn extends ColumnType {
 JSONColumn.prototype.encodeFn = JSON.stringify;
 class JSONTextColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "json";
     this.operators = Operators.text;
   }
@@ -991,6 +992,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
       });
     } else if (key === "EXISTS") {
       const joinItems = Array.isArray(value[0]) ? value : [value];
+      joinStatementsSet.clear();
       for (const args of joinItems) {
         const { target, conditions } = processJoinItem(
           ctx,
@@ -999,7 +1001,11 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
           args,
           quotedAs
         );
-        ands.push(`EXISTS (SELECT 1 FROM ${target} WHERE ${conditions})`);
+        const sql = `EXISTS (SELECT 1 FROM ${target} WHERE ${conditions})`;
+        if (!joinStatementsSet.has(sql)) {
+          joinStatementsSet.add(sql);
+          ands.push(sql);
+        }
       }
     } else if (key === "SEARCH") {
       const search = value;
@@ -1316,15 +1322,15 @@ const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape)
 };
 const pushJoinSql = (ctx, table, query, quotedAs) => {
   var _a;
+  joinStatementsSet.clear();
   for (const item of query.join) {
+    let sql;
     if (Array.isArray(item)) {
       const q = item[1];
       const { aliasValue } = ctx;
       ctx.aliasValue = true;
       const as = item[2];
-      ctx.sql.push(
-        `${item[0]} LATERAL (${q.toSQL(ctx).text}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`
-      );
+      sql = `${item[0]} LATERAL (${q.toSQL(ctx).text}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`;
       ctx.aliasValue = aliasValue;
     } else {
       const { target, conditions } = processJoinItem(
@@ -1334,9 +1340,11 @@ const pushJoinSql = (ctx, table, query, quotedAs) => {
         item,
         quotedAs
       );
-      ctx.sql.push(item.type, target);
-      if (conditions)
-        ctx.sql.push("ON", conditions);
+      sql = conditions ? `${item.type} ${target} ON ${conditions}` : `${item.type} ${target} ON true`;
+    }
+    if (!joinStatementsSet.has(sql)) {
+      joinStatementsSet.add(sql);
+      ctx.sql.push(sql);
     }
   }
 };
@@ -1483,7 +1491,12 @@ const dateTimeEncode = (input) => {
 const skipDateMethodsFromToCode = { encodeFn: dateTimeEncode };
 class DateBaseColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringNumberDate);
+    super(
+      schema,
+      schema.stringNumberDate(),
+      schema.stringSchema(),
+      schema.stringNumberDate()
+    );
     this.operators = Operators.date;
     this.encodeFn = dateTimeEncode;
     this.asNumber = schema.dateAsNumber;
@@ -1557,7 +1570,7 @@ class TimestampTZColumn extends DateTimeTzBaseClass {
 }
 class TimeColumn extends ColumnType {
   constructor(schema, dateTimePrecision) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "time";
     this.operators = Operators.time;
     this.data.dateTimePrecision = dateTimePrecision;
@@ -1575,7 +1588,7 @@ class TimeColumn extends ColumnType {
 }
 class IntervalColumn extends ColumnType {
   constructor(schema, fields, precision) {
-    super(schema, schema.timeInterval);
+    super(schema, schema.timeInterval());
     this.dataType = "interval";
     this.operators = Operators.date;
     this.data.fields = fields;
@@ -1748,10 +1761,20 @@ const defaultSchemaConfig = {
   array(item) {
     return new ArrayColumn(defaultSchemaConfig, item, void 0);
   },
+  boolean: orchidCore.noop,
+  buffer: orchidCore.noop,
+  unknown: orchidCore.noop,
+  never: orchidCore.noop,
+  stringSchema: orchidCore.noop,
   stringMin: orchidCore.noop,
   stringMax: orchidCore.noop,
   stringMinMax: orchidCore.noop,
+  number: orchidCore.noop,
+  int: orchidCore.noop,
+  stringNumberDate: orchidCore.noop,
+  timeInterval: orchidCore.noop,
   bit: orchidCore.noop,
+  uuid: orchidCore.noop,
   nullable() {
     return orchidCore.setColumnData(this, "isNullable", true);
   },
@@ -2906,9 +2929,15 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
   let conditions;
   if ((_a = query.join) == null ? void 0 : _a.length) {
     const items = [];
+    joinStatementsSet.clear();
     for (const item of query.join) {
       if (!Array.isArray(item)) {
-        items.push(processJoinItem(ctx, table, query, item, quotedAs));
+        const join = processJoinItem(ctx, table, query, item, quotedAs);
+        const key = `${join.target}${join.conditions}`;
+        if (!joinStatementsSet.has(key)) {
+          joinStatementsSet.add(key);
+          items.push(join);
+        }
       }
     }
     if (items.length) {
@@ -3526,19 +3555,19 @@ class NumberBaseColumn extends ColumnType {
 }
 class IntegerBaseColumn extends NumberBaseColumn {
   constructor(schema) {
-    super(schema, schema.int);
+    super(schema, schema.int());
     this.data.int = true;
   }
 }
 class NumberAsStringBaseColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.operators = Operators.number;
   }
 }
 class DecimalColumn extends ColumnType {
   constructor(schema, numericPrecision, numericScale) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.operators = Operators.number;
     this.dataType = "decimal";
     this.data.numericPrecision = numericPrecision;
@@ -3611,7 +3640,7 @@ class BigIntColumn extends NumberAsStringBaseColumn {
 }
 class RealColumn extends NumberBaseColumn {
   constructor(schema) {
-    super(schema, schema.number);
+    super(schema, schema.number());
     this.dataType = "real";
     this.parseItem = parseFloat;
   }
@@ -3697,14 +3726,17 @@ var __spreadValues$9 = (a, b) => {
 };
 var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 class TextBaseColumn extends ColumnType {
-  constructor(schema, schemaType = schema.stringSchema) {
+  constructor(schema, schemaType = schema.stringSchema()) {
     super(schema, schemaType);
     this.operators = Operators.text;
   }
 }
 class LimitedTextBaseColumn extends TextBaseColumn {
   constructor(schema, limit) {
-    super(schema, limit ? schema.stringMax(limit) : schema.stringSchema);
+    super(
+      schema,
+      limit ? schema.stringMax(limit) : schema.stringSchema()
+    );
     this.data.maxChars = limit;
   }
   toSQL() {
@@ -3787,7 +3819,7 @@ const textColumnToCode = (column, t) => {
     `${column.dataType}(${args})${orchidCore.stringDataToCode(data)}`
   );
 };
-const minMaxToSchema = (schema, min, max) => min ? max ? schema.stringMinMax(min, max) : schema.stringMin(min) : schema.stringSchema;
+const minMaxToSchema = (schema, min, max) => min ? max ? schema.stringMinMax(min, max) : schema.stringMin(min) : schema.stringSchema();
 class TextColumn extends TextBaseColumn {
   constructor(schema, min, max) {
     super(schema, minMaxToSchema(schema, min, max));
@@ -3800,7 +3832,7 @@ class TextColumn extends TextBaseColumn {
 }
 class ByteaColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.buffer);
+    super(schema, schema.buffer());
     this.dataType = "bytea";
     this.operators = Operators.text;
   }
@@ -3810,7 +3842,7 @@ class ByteaColumn extends ColumnType {
 }
 class PointColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "point";
     this.operators = Operators.text;
   }
@@ -3820,7 +3852,7 @@ class PointColumn extends ColumnType {
 }
 class LineColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "line";
     this.operators = Operators.text;
   }
@@ -3830,7 +3862,7 @@ class LineColumn extends ColumnType {
 }
 class LsegColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "lseg";
     this.operators = Operators.text;
   }
@@ -3840,7 +3872,7 @@ class LsegColumn extends ColumnType {
 }
 class BoxColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "box";
     this.operators = Operators.text;
   }
@@ -3850,7 +3882,7 @@ class BoxColumn extends ColumnType {
 }
 class PathColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "path";
     this.operators = Operators.text;
   }
@@ -3860,7 +3892,7 @@ class PathColumn extends ColumnType {
 }
 class PolygonColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "polygon";
     this.operators = Operators.text;
   }
@@ -3870,7 +3902,7 @@ class PolygonColumn extends ColumnType {
 }
 class CircleColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "circle";
     this.operators = Operators.text;
   }
@@ -3880,7 +3912,7 @@ class CircleColumn extends ColumnType {
 }
 class MoneyColumn extends NumberBaseColumn {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "money";
     this.parseFn = Object.assign(
       function(input) {
@@ -3897,7 +3929,7 @@ class MoneyColumn extends NumberBaseColumn {
 }
 class CidrColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "cidr";
     this.operators = Operators.text;
   }
@@ -3907,7 +3939,7 @@ class CidrColumn extends ColumnType {
 }
 class InetColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "inet";
     this.operators = Operators.text;
   }
@@ -3917,7 +3949,7 @@ class InetColumn extends ColumnType {
 }
 class MacAddrColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "macaddr";
     this.operators = Operators.text;
   }
@@ -3927,7 +3959,7 @@ class MacAddrColumn extends ColumnType {
 }
 class MacAddr8Column extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "macaddr8";
     this.operators = Operators.text;
   }
@@ -3973,7 +4005,7 @@ class BitVaryingColumn extends ColumnType {
 }
 class TsVectorColumn extends ColumnType {
   constructor(schema, defaultLanguage = orchidCore.getDefaultLanguage()) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.defaultLanguage = defaultLanguage;
     this.dataType = "tsvector";
     this.operators = Operators.text;
@@ -4027,7 +4059,7 @@ class TsVectorColumn extends ColumnType {
 }
 class TsQueryColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "tsquery";
     this.operators = Operators.text;
   }
@@ -4039,7 +4071,7 @@ const uuidDefaultSQL = "gen_random_uuid()";
 const uuidDefault = new RawSQL(uuidDefaultSQL);
 class UUIDColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.uuid);
+    super(schema, schema.uuid());
     this.dataType = "uuid";
     this.operators = Operators.text;
   }
@@ -4062,7 +4094,7 @@ class UUIDColumn extends ColumnType {
 }
 class XMLColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "xml";
     this.operators = Operators.text;
   }
@@ -4083,7 +4115,7 @@ class CitextColumn extends TextBaseColumn {
 
 class BooleanColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.boolean);
+    super(schema, schema.boolean());
     this.dataType = "boolean";
     this.operators = Operators.boolean;
     this.parseItem = (input) => input[0] === "t";
@@ -4095,7 +4127,12 @@ class BooleanColumn extends ColumnType {
 
 class CustomTypeColumn extends ColumnType {
   constructor(schema, dataType) {
-    super(schema, schema.unknown, schema.unknown, schema.unknown);
+    super(
+      schema,
+      schema.unknown(),
+      schema.unknown(),
+      schema.unknown()
+    );
     this.dataType = dataType;
     this.operators = Operators.any;
     this.data.isOfCustomType = true;
@@ -4344,7 +4381,7 @@ const makeColumnTypes = (schema) => {
 RawSQL.prototype.columnTypes = makeColumnTypes;
 
 class VirtualColumn extends ColumnType {
-  constructor(schema, inputSchema = schema.never) {
+  constructor(schema, inputSchema = schema.never()) {
     super(schema, inputSchema);
     this.dataType = "";
     this.operators = Operators.any;
@@ -4356,7 +4393,7 @@ class VirtualColumn extends ColumnType {
 
 class UnknownColumn extends VirtualColumn {
   constructor(schema) {
-    super(schema, schema.unknown);
+    super(schema, schema.unknown());
   }
 }
 RawSQL.prototype._type = new UnknownColumn(defaultSchemaConfig);
@@ -7334,6 +7371,35 @@ class Join {
    *
    * When no matching record is found, it will skip records of the main table.
    *
+   * When joining the same table with the same condition more than once, duplicated joins will be ignored:
+   *
+   * ```ts
+   * // joining a relation
+   * db.post.join('comments').join('comments');
+   *
+   * // joining a table with a condition
+   * db.post
+   *   .join('comments', 'comments.postId', 'post.id')
+   *   .join('comments', 'comments.postId', 'post.id');
+   * ```
+   *
+   * Both queries will produce SQL with only 1 join
+   *
+   * ```sql
+   * SELECT * FROM post JOIN comments ON comments.postId = post.id
+   * ```
+   *
+   * However, this is only possible if the join has no dynamic values:
+   *
+   * ```ts
+   * db.post
+   *   .join('comments', (q) => q.where({ rating: { gt: 5 } }))
+   *   .join('comments', (q) => q.where({ rating: { gt: 5 } }));
+   * ```
+   *
+   * Both joins above have the same `{ gt: 5 }`, but still, the `5` is a dynamic value and in this case joins will be duplicated,
+   * resulting in a database error.
+   *
    * ### join relation
    *
    * When relations are defined between the tables, you can join them by a relation name.