pqb 0.71.0 → 0.71.1

package/dist/index.mjs

@@ -1413,6 +1413,7 @@ const indexInnerToCode = (index, t) => {
 		"name",
 		"using",
 		"nullsNotDistinct",
+		"deferrable",
 		"include",
 		"with",
 		"tablespace",
@@ -1594,6 +1595,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)},`
@@ -5596,20 +5598,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
@@ -10946,6 +10935,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);