pqb 0.71.0 → 0.71.1

package/dist/index.d.ts

@@ -714,7 +714,7 @@ declare namespace TableData {
     name?: string;
   }
   export interface ColumnIndex {
-    options: Index.ColumnArg & Index.Options;
+    options: Index.ColumnOptionsData;
   }
   export interface ColumnExclude extends ColumnIndex {
     with: string;
@@ -765,7 +765,11 @@ declare namespace TableData {
       order?: string;
       weight?: SearchWeight;
     }
-    export interface UniqueOptionsArg<Name extends string = string> {
+    /**
+     * Controls when Postgres checks a unique constraint.
+     */
+    export type UniqueDeferrable = false | 'immediate' | 'deferred';
+    export interface BaseUniqueOptionsArg<Name extends string = string> {
       name?: Name;
       nullsNotDistinct?: boolean;
       using?: string;
@@ -775,23 +779,45 @@ declare namespace TableData {
       where?: string;
       dropMode?: DropMode;
     }
-    export interface OptionsArg extends UniqueOptionsArg {
+    export interface UniqueOptionsArg<Name extends string = string> extends BaseUniqueOptionsArg<Name> {
+      /**
+       * Makes this unique definition a deferrable Postgres constraint.
+       */
+      deferrable?: UniqueDeferrable;
+    }
+    export interface NonUniqueIndexOptionsArg<Name extends string = string> extends BaseUniqueOptionsArg<Name> {
+      unique?: false;
+      deferrable?: never;
+    }
+    export interface UniqueIndexOptionsArg<Name extends string = string> extends UniqueOptionsArg<Name> {
+      unique: true;
+    }
+    export type OptionsArg<Name extends string = string> = NonUniqueIndexOptionsArg<Name> | UniqueIndexOptionsArg<Name>;
+    export type TsVectorArg = OptionsArg & TsVectorOptions;
+    export interface Options extends UniqueOptionsArg, TsVectorOptions {
       unique?: boolean;
     }
-    export interface TsVectorArg extends OptionsArg, TsVectorOptions {}
-    export type Options = TsVectorArg;
     export interface UniqueColumnArg<Name extends string = string> extends ColumnOptions, UniqueOptionsArg<Name> {
       expression?: string;
     }
-    export interface ColumnArg extends UniqueColumnArg {
-      unique?: boolean;
+    export interface NonUniqueColumnArg<Name extends string = string> extends ColumnOptions, BaseUniqueOptionsArg<Name> {
+      expression?: string;
+      unique?: false;
+      deferrable?: never;
+    }
+    export interface UniqueIndexColumnArg<Name extends string = string> extends UniqueColumnArg<Name> {
+      unique: true;
+    }
+    export interface ColumnOptionsData extends ColumnOptions, Options {
+      expression?: string;
     }
+    export type ColumnArg<Name extends string = string> = NonUniqueColumnArg<Name> | UniqueIndexColumnArg<Name>;
     interface TsVectorOptions {
       language?: string;
       languageColumn?: string;
       tsVector?: boolean;
     }
-    export interface TsVectorColumnArg extends ColumnArg, TsVectorOptions {}
+    export type TsVectorColumnArg = ColumnArg & TsVectorOptions;
     export interface ExpressionOptions extends ColumnOptions {
       expression: string;
     }
@@ -7597,7 +7623,7 @@ declare abstract class Column {
     data: Column['data'];
     dataType: string;
   }>(this: T, ...args: [options?: TableData.Index.TsVectorColumnArg]): T;
-  unique<T extends Column.Pick.Data, const Options extends TableData.Index.ColumnArg>(this: T, ...args: [options?: Options]): T & Column.Modifiers.IsUnique<Options['name'] & string>;
+  unique<T extends Column.Pick.Data, const Options extends TableData.Index.UniqueColumnArg>(this: T, ...args: [options?: Options]): T & Column.Modifiers.IsUnique<Options['name'] & string>;
   /**
    * Add [EXCLUDE constraint](https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-EXCLUDE) to the column.
    *

package/dist/index.js

@@ -1436,6 +1436,7 @@ const indexInnerToCode = (index, t) => {
 		"name",
 		"using",
 		"nullsNotDistinct",
+		"deferrable",
 		"include",
 		"with",
 		"tablespace",
@@ -1617,6 +1618,7 @@ const columnIndexesToCode = (items) => {
 			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,`,
+			options.deferrable && `deferrable: ${singleQuote(options.deferrable)},`,
 			options.with && `with: ${singleQuote(options.with)},`,
 			options.tablespace && `tablespace: ${singleQuote(options.tablespace)},`,
 			options.where && `where: ${singleQuote(options.where)},`
@@ -5619,20 +5621,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, shape, whereExists,
 	const args0 = args.length ? args[0] : returnArg;
 	if (typeof args0 === "function") {
 		let q = first;
-		if (q.joinQueryAfterCallback) {
-			let base = q.baseQuery;
-			if (q.q.as) base = base.as(q.q.as);
-			const { q: query } = q.joinQueryAfterCallback(base, joinTo);
-			if (query.and || query.or || query.scopes) {
-				q = _clone(q);
-				if (query.and) pushQueryArrayImmutable(q, "and", query.and);
-				if (query.or) pushQueryArrayImmutable(q, "or", query.or);
-				if (query.scopes) q.q.scopes = {
-					...q.q.scopes,
-					...query.scopes
-				};
-			}
-		}
+		if (q.joinQueryAfterCallback) q = q.joinQueryAfterCallback(q, joinTo);
 		const joinedShapes = {
 			...joinTo.q.joinedShapes,
 			[joinTo.q.as || joinTo.table]: joinTo.shape
@@ -10969,6 +10958,7 @@ const processNestedSelectPathEntry = (batches, path, thisKey, thisReturnType, i,
 		key: thisKey
 	});
 	else {
+		if (!data) return;
 		const { key, returnType } = path[++i];
 		if (!thisReturnType || thisReturnType === "all") for (const row of data) processNestedSelectPathEntry(batches, path, key, returnType, i, last, row);
 		else processNestedSelectPathEntry(batches, path, key, returnType, i, last, data);