pqb 0.71.0 → 0.71.2

package/dist/index.js

@@ -319,6 +319,17 @@ var Expression = class {
 		}
 		return sql;
 	}
+	/**
+	* Transform the expression value after loading it.
+	*
+	* It is meant to transform expressions selected by a query.
+	*
+	* @param fn - function to transform expression value with
+	*/
+	transform(fn) {
+		pushOrNewArrayToObjectImmutable(this.q, "transform", fn);
+		return this;
+	}
 };
 const isExpression = (arg) => arg instanceof Expression;
 const isTemplateLiteralArgs = (args) => Array.isArray(args[0]) && "raw" in args[0] && Array.isArray(args[0].raw);
@@ -391,7 +402,7 @@ const templateLiteralToSQL = (template, ctx, quotedAs) => {
 	for (let last = parts.length - 1; i < last; i++) {
 		sql += parts[i];
 		const value = template[i + 1];
-		if (value instanceof Expression) sql += value.toSQL(ctx, quotedAs);
+		if (isExpression(value)) sql += value.toSQL(ctx, quotedAs);
 		else {
 			values.push(value);
 			literalValues.push(sql.length);
@@ -1436,6 +1447,7 @@ const indexInnerToCode = (index, t) => {
 		"name",
 		"using",
 		"nullsNotDistinct",
+		"deferrable",
 		"include",
 		"with",
 		"tablespace",
@@ -1617,6 +1629,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 +5632,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
@@ -7677,7 +7677,7 @@ const encodeRow = (ctx, values, QueryClass, row, runtimeDefaults, quotedAs, hook
 };
 const encodeValue = (ctx, values, QueryClass, value, quotedAs) => {
 	if (value && typeof value === "object") {
-		if (value instanceof Expression) return value.toSQL(ctx, quotedAs);
+		if (isExpression(value)) return value.toSQL(ctx, quotedAs);
 		else if (value instanceof QueryClass) return `(${moveMutativeQueryToCte(ctx, value)})`;
 		else if ("fromHook" in value) return value.fromHook;
 	}
@@ -7996,7 +7996,7 @@ var FnExpression = class extends Expression {
 		const q = this.q;
 		sql.push(this.args.map((arg) => {
 			if (typeof arg === "string") return arg === "*" ? "*" : fnArgToSql(ctx, q, arg, quotedAs);
-			else if (arg instanceof Expression) return arg.toSQL(ctx, quotedAs);
+			else if (isExpression(arg)) return arg.toSQL(ctx, quotedAs);
 			else if ("pairs" in arg) {
 				const args = [];
 				const { pairs } = arg;
@@ -10969,6 +10969,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);
@@ -10999,7 +11000,8 @@ const processSelectAsArg = (q, selectAs, as, key, arg, columnAlias, outerReturnT
 		}
 		if (isExpression(value)) column = value.result.value;
 		else {
-			if (isRelationQuery(value) && value.q.subQuery !== 1) {
+			const isSelfReferencingQuery = value.q.subQuery === 1;
+			if (isRelationQuery(value) && !isSelfReferencingQuery) {
 				joinQuery = true;
 				setSelectRelation(query.q);
 				value = value.joinQuery(value, q);
@@ -11020,17 +11022,17 @@ const processSelectAsArg = (q, selectAs, as, key, arg, columnAlias, outerReturnT
 				if (as) value.q.joinedForSelect = _copyQueryAliasToQuery(value, q, as);
 			}
 			if (value.q.getColumn?.data.skipValueToArray) value.q.notFoundDefault ??= null;
-			else if (!value.q.type && (value.q.returnType === "value" || value.q.returnType === "valueOrThrow")) {
+			else if (!value.q.type && (value.q.returnType === "value" || value.q.returnType === "valueOrThrow") && !isSelfReferencingQuery) {
 				const column = Object.create(value.q.getColumn || UnknownColumn.instance);
 				column.data = {
 					...column.data,
-					name: void 0,
 					valueToArray: true
 				};
+				if (joinQuery) column.data.name = void 0;
 				value.q.getColumn = column;
 				if (value.q.expr) value.q.expr.q.getColumn = column;
 			}
-			if (outerReturnType === "value" && value.q.returnType === "valueOrThrow") value.q.returnType = "value";
+			if ((outerReturnType === "value" || isSelfReferencingQuery) && value.q.returnType === "valueOrThrow") value.q.returnType = "value";
 			column = value.q.getColumn;
 			value = prepareSubQueryForSql(q, value);
 		}