pqb 0.68.0 → 0.68.1

package/dist/index.mjs

@@ -1842,6 +1842,8 @@ const quoteLikeValue = (arg, ctx, quotedAs, jsonArray) => {
 const base = {
 	equals: make((key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, ctx, quotedAs)}`),
 	not: make((key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, ctx, quotedAs)}`),
+	isDistinctFrom: make((key, value, ctx, quotedAs) => `${key} IS DISTINCT FROM ${quoteValue(value, ctx, quotedAs)}`),
+	isNotDistinctFrom: make((key, value, ctx, quotedAs) => `${key} IS NOT DISTINCT FROM ${quoteValue(value, ctx, quotedAs)}`),
 	in: make((key, value, ctx, quotedAs) => Array.isArray(value) && !value.length ? "false" : `${key} IN ${quoteValue(value, ctx, quotedAs, true)}`),
 	notIn: make((key, value, ctx, quotedAs) => Array.isArray(value) && !value.length ? "true" : `NOT ${key} IN ${quoteValue(value, ctx, quotedAs, true)}`)
 };
@@ -1902,6 +1904,8 @@ const Operators = {
 		...ord,
 		equals: make((key, value, ctx, quotedAs) => value === null ? `nullif(${key}, 'null'::jsonb) IS NULL` : `${key} = ${quoteJsonValue(value, ctx, quotedAs)}`),
 		not: make((key, value, ctx, quotedAs) => value === null ? `nullif(${key}, 'null'::jsonb) IS NOT NULL` : `${key} != ${quoteJsonValue(value, ctx, quotedAs)}`),
+		isDistinctFrom: make((key, value, ctx, quotedAs) => `${key} IS DISTINCT FROM ${quoteJsonValue(value, ctx, quotedAs)}`),
+		isNotDistinctFrom: make((key, value, ctx, quotedAs) => `${key} IS NOT DISTINCT FROM ${quoteJsonValue(value, ctx, quotedAs)}`),
 		in: make((key, value, ctx, quotedAs) => Array.isArray(value) && !value.length ? "false" : `${key} IN ${quoteJsonValue(value, ctx, quotedAs, true)}`),
 		notIn: make((key, value, ctx, quotedAs) => Array.isArray(value) && !value.length ? "true" : `NOT ${key} IN ${quoteJsonValue(value, ctx, quotedAs, true)}`),
 		jsonPathQueryFirst: Object.assign(function(path, options) {
@@ -6517,130 +6521,75 @@ const resolveSubQueryCallback = (q, cb) => {
 	_setSubQueryAliases(arg);
 	return cb(arg);
 };
-/**
-* Acts as {@link simpleExistingColumnToSQL} except that the column is optional and will return quoted key if no column.
-*/
-function simpleColumnToSQL(ctx, key, column, quotedAs) {
-	if (!column) return `"${key}"`;
-	const { data } = column;
-	return data.computed ? `(${data.computed.toSQL(ctx, quotedAs)})` : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
-}
-function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
-	const { data } = column;
-	return data.computed ? `(${data.computed.toSQL(ctx, quotedAs)})` : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
-}
-const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
-	let index = column.indexOf(".");
-	if (index === -1) {
-		const joinAs = data.valuesJoinedAs?.[column];
-		if (joinAs) {
-			column = joinAs + "." + column;
-			index = joinAs.length;
-		}
-	}
-	if (index !== -1) return columnWithDotToSql(ctx, data, shape, column, index, quotedAs, select);
-	return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
-};
-const selectedColumnToSql = (ctx, data, shape, column, quotedAs) => {
-	const index = column.indexOf(".");
-	return index !== -1 ? selectedColumnWithDotToSql(ctx, data, shape, column, index, quotedAs) : selectedSimpleColumnToSql(ctx, column, shape[column], quotedAs);
-};
-const selectedSimpleColumnToSql = (ctx, key, column, quotedAs) => {
-	if (!column) return `"${key}"`;
-	const { data } = column;
-	return data.selectSql ? `(${data.selectSql.toSQL(ctx, quotedAs)})` : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
-};
-/**
-* in a case when ordering or grouping by a column which was selected as expression:
-* ```ts
-* table.select({ x: (q) => q.sum('x') }).group('x').order('x')
-* ```
-* the column must not be prefixed with a table name.
-*/
-const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
-	const index = column.indexOf(".");
-	if (index !== -1) return columnWithDotToSql(ctx, data, data.shape, column, index, quotedAs);
-	else {
-		if (data.joinedShapes?.[column]) return `"${column}"."${column}"`;
-		if (data.select) {
-			for (const s of data.select) if (typeof s === "object" && "selectAs" in s) {
-				if (column in s.selectAs) return simpleColumnToSQL(ctx, column, data.shape[column]);
+function simpleColumnToSQL(ctx, queryData, shape, key, column, quotedAs, select, as, jsonList, useSelectList, skipSelectSql) {
+	let sql;
+	let dontAlias;
+	if (useSelectList && queryData.select) {
+		for (const s of queryData.select) if (typeof s === "object" && "selectAs" in s) {
+			if (key in s.selectAs) {
+				dontAlias = true;
+				sql = simpleColumnToSQL(ctx, queryData, shape, key, shape[key]);
+				break;
 			}
 		}
-		return simpleColumnToSQL(ctx, column, data.shape[column], quotedAs);
-	}
-};
-const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
-	const table = column.slice(0, index);
-	const key = column.slice(index + 1);
-	if (key === "*") {
-		const shape = data.joinedShapes?.[table];
-		return shape ? select ? makeRowToJson(ctx, table, shape, true) : `"${table}".*` : column;
-	}
-	const tableName = _getQueryAliasOrName(data, table);
-	const quoted = `"${table}"`;
-	const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
-	if (col) {
-		if (col.data.name) return `"${tableName}"."${col.data.name}"`;
-		if (col.data.computed) return `(${col.data.computed.toSQL(ctx, quoted)})`;
-		return `"${tableName}"."${key}"`;
 	}
-	return `"${tableName}"."${key}"`;
-};
-const selectedColumnWithDotToSql = (ctx, data, shape, column, index, quotedAs) => {
-	const table = column.slice(0, index);
-	const key = column.slice(index + 1);
-	if (key === "*") {
-		const shape = data.joinedShapes?.[table];
-		return shape ? makeRowToJson(ctx, table, shape, true) : column;
-	}
-	const tableName = _getQueryAliasOrName(data, table);
-	const quoted = `"${table}"`;
-	const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
-	if (col) {
-		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quoted)})`;
-		if (col.data.name) return `"${tableName}"."${col.data.name}"`;
+	if (!sql) if (!column) {
+		dontAlias = key === as;
+		sql = `${quotedAs ? `${quotedAs}.` : ""}"${key}"`;
+	} else {
+		if (jsonList && as) jsonList[as] = column && getSelectedColumnData(column);
+		const { data } = column;
+		if (select && data.selectSql && !skipSelectSql) sql = `(${data.selectSql.toSQL(ctx, quotedAs)})`;
+		else if (data.computed) sql = `(${data.computed.toSQL(ctx, quotedAs)})`;
+		else {
+			const name = data.name || key;
+			dontAlias = name === as;
+			sql = `${quotedAs ? `${quotedAs}.` : ""}"${name}"`;
+		}
 	}
-	return `"${tableName}"."${key}"`;
-};
-const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
-	const index = column.indexOf(".");
-	return index !== -1 ? tableColumnToSqlWithAs(ctx, data, column, column.slice(0, index), column.slice(index + 1), as, quotedAs, select, jsonList) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select, jsonList);
-};
-const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select, jsonList) => {
+	if (as && !dontAlias) sql = `${sql} "${as}"`;
+	return sql;
+}
+const tableColumnToSql = (ctx, data, shape, table, key, quotedAs, select, as, jsonList) => {
+	let sql;
+	let dontAlias;
 	if (key === "*") {
-		if (jsonList) jsonList[as] = void 0;
+		if (jsonList && as) jsonList[as] = void 0;
 		const shape = data.joinedShapes?.[table];
-		if (shape) {
-			if (select) return makeRowToJson(ctx, table, shape, true) + ` "${as}"`;
-			return `"${table}"."${table}" "${as}"`;
+		if (shape) sql = select ? makeRowToJson(ctx, table, shape, true) : `"${table}".*`;
+		else {
+			sql = `"${table}"."${key}"`;
+			dontAlias = true;
+		}
+	} else {
+		const tableName = _getQueryAliasOrName(data, table);
+		const quoted = `"${table}"`;
+		const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
+		if (jsonList && as) jsonList[as] = col && getSelectedColumnData(col);
+		if (col?.data.selectSql) sql = `(${col.data.selectSql.toSQL(ctx, quoted)})`;
+		else if (col?.data.name) sql = `"${tableName}"."${col.data.name}"`;
+		else if (col?.data.computed) sql = `(${col.data.computed.toSQL(ctx, quoted)})`;
+		else {
+			sql = `"${tableName}"."${key}"`;
+			dontAlias = key === as;
 		}
-		return column;
-	}
-	const tableName = _getQueryAliasOrName(data, table);
-	const quoted = `"${table}"`;
-	const col = quoted === quotedAs ? data.shape[key] : data.joinedShapes?.[tableName][key];
-	if (jsonList) jsonList[as] = col && getSelectedColumnData(col);
-	if (col) {
-		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quoted)}) "${as}"`;
-		if (col.data.name && col.data.name !== key) return `"${tableName}"."${col.data.name}" "${as}"`;
 	}
-	return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
+	if (as && !dontAlias) sql = `${sql} "${as}"`;
+	return sql;
 };
-const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
-	if (!select && data.joinedShapes?.[column]) {
-		if (jsonList) jsonList[as] = void 0;
-		return `"${column}"."${column}" "${as}"`;
-	}
-	const col = data.shape[column];
-	if (jsonList) jsonList[as] = col && getSelectedColumnData(col);
-	if (col) {
-		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quotedAs)}) "${as}"`;
-		if (col.data.name && col.data.name !== column) return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
+const columnToSql = (ctx, data, shape, column, quotedAs, select, as, jsonList, useSelectList) => {
+	let index = column.indexOf(".");
+	if (index === -1 && !select) {
+		const joinAs = data.valuesJoinedAs?.[column];
+		if (joinAs) {
+			column = joinAs + "." + column;
+			index = joinAs.length;
+		}
 	}
-	return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
+	if (index !== -1) return tableColumnToSql(ctx, data, shape, column.slice(0, index), column.slice(index + 1), quotedAs, select, as, jsonList);
+	return simpleColumnToSQL(ctx, data, shape, column, shape[column], quotedAs, select, as, jsonList, useSelectList);
 };
-const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
+const rawOrColumnToSql = (ctx, data, shape, expr, quotedAs, select) => {
 	return typeof expr === "string" ? columnToSql(ctx, data, shape, expr, quotedAs, select) : expr.toSQL(ctx, quotedAs);
 };
 const processJoinItem = (ctx, table, query, args, quotedAs) => {
@@ -6750,7 +6699,7 @@ const getConditionsFor3Or4LengthItem = (ctx, query, target, quotedAs, args, join
 	const [leftColumn, opOrRightColumn, maybeRightColumn] = args;
 	const op = maybeRightColumn ? opOrRightColumn : "=";
 	const rightColumn = maybeRightColumn ? maybeRightColumn : opOrRightColumn;
-	return `${rawOrColumnToSql(ctx, query, leftColumn, target, joinShape)} ${op} ${rawOrColumnToSql(ctx, query, rightColumn, quotedAs, query.shape)}`;
+	return `${rawOrColumnToSql(ctx, query, joinShape, leftColumn, target)} ${op} ${rawOrColumnToSql(ctx, query, query.shape, rightColumn, quotedAs)}`;
 };
 const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape) => {
 	if (data === true) return "true";
@@ -6760,7 +6709,7 @@ const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape)
 		const shape = query.shape;
 		for (const key in data) {
 			const value = data[key];
-			pairs.push(`${columnToSql(ctx, query, joinShape, key, joinAs)} = ${rawOrColumnToSql(ctx, query, value, quotedAs, shape)}`);
+			pairs.push(`${columnToSql(ctx, query, joinShape, key, joinAs)} = ${rawOrColumnToSql(ctx, query, shape, value, quotedAs)}`);
 		}
 		return pairs.join(", ");
 	}
@@ -6792,7 +6741,7 @@ var SelectItemExpression = class extends Expression {
 	}
 	makeSQL(ctx, quotedAs) {
 		const q = this.q;
-		return typeof this.item === "string" ? this.item === "*" ? selectAllSql(q, quotedAs, void 0, ctx).join(", ") : selectedColumnToSql(ctx, q, q.shape, this.item, quotedAs) : this.item.toSQL(ctx, quotedAs);
+		return typeof this.item === "string" ? this.item === "*" ? selectAllSql(q, quotedAs, void 0, ctx).join(", ") : columnToSql(ctx, q, q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
 	}
 };
 const _getSelectableColumn = (q, arg) => {
@@ -7085,13 +7034,13 @@ const selectToSqlList = (ctx, table, query, quotedAs, hookSelect = query.hookSel
 						(selected ??= {})[key] = `"${tableName}"`;
 						(selectedAs ??= {})[key] = key;
 					}
-					sql = tableColumnToSqlWithAs(ctx, table.q, item, tableName, key, key === "*" ? tableName : key, quotedAs, true, jsonList);
+					sql = tableColumnToSql(ctx, table.q, table.q.shape, tableName, key, quotedAs, true, key === "*" ? tableName : key, jsonList);
 				} else {
 					if (hookSelect?.get(item)) {
 						(selected ??= {})[item] = quotedAs;
 						(selectedAs ??= {})[item] = item;
 					}
-					sql = ownColumnToSqlWithAs(ctx, table.q, item, item, quotedAs, true, jsonList);
+					sql = simpleColumnToSQL(ctx, table.q, table.q.shape, item, table.q.shape[item], quotedAs, true, item, jsonList);
 				}
 			}
 			list.push(sql);
@@ -7113,7 +7062,7 @@ const selectToSqlList = (ctx, table, query, quotedAs, hookSelect = query.hookSel
 				}
 				else if (value) {
 					if (hookSelect) (selectedAs ??= {})[value] = as;
-					list.push(columnToSqlWithAs(ctx, table.q, value, as, quotedAs, true, jsonList));
+					list.push(columnToSql(ctx, table.q, table.q.shape, value, quotedAs, true, as, jsonList));
 					aliases?.push(as);
 				}
 			}
@@ -7149,12 +7098,12 @@ const selectToSqlList = (ctx, table, query, quotedAs, hookSelect = query.hookSel
 				quotedTable = `"${tableName}"`;
 				columnName = select.slice(index + 1);
 				col = table.q.joinedShapes?.[tableName]?.[columnName];
-				sql = selectedColumnToSql(ctx, table.q, table.q.shape, select, void 0);
+				sql = columnToSql(ctx, table.q, table.q.shape, select, void 0, true);
 			} else {
 				quotedTable = quotedAs;
 				columnName = select;
 				col = query.shape[select];
-				sql = selectedColumnToSql(ctx, table.q, query.shape, select, quotedAs);
+				sql = columnToSql(ctx, table.q, query.shape, select, quotedAs, true);
 			}
 		} else {
 			columnName = column;
@@ -7428,7 +7377,7 @@ const whereExprOrQuery = (ctx, ands, query, key, value, quotedAs) => {
 	else {
 		let column = query.shape[key];
 		let quotedColumn;
-		if (column) quotedColumn = simpleExistingColumnToSQL(ctx, key, column, quotedAs);
+		if (column) quotedColumn = simpleColumnToSQL(ctx, query, query.shape, key, column, quotedAs);
 		else if (!column) {
 			const index = key.indexOf(".");
 			if (index !== -1) {
@@ -7436,7 +7385,7 @@ const whereExprOrQuery = (ctx, ands, query, key, value, quotedAs) => {
 				const quoted = `"${table}"`;
 				const name = key.slice(index + 1);
 				column = quotedAs === quoted ? query.shape[name] : query.joinedShapes?.[table]?.[name];
-				quotedColumn = simpleColumnToSQL(ctx, name, column, quoted);
+				quotedColumn = simpleColumnToSQL(ctx, query, query.shape, name, column, quoted);
 			} else {
 				column = query.joinedShapes?.[key]?.value;
 				quotedColumn = `"${key}"."${key}"`;
@@ -7996,13 +7945,13 @@ const addOrder = (ctx, data, column, quotedAs, dir) => {
 		const order = dir || (!search.order || search.order === true ? emptyObject : search.order);
 		return `${order.coverDensity ? "ts_rank_cd" : "ts_rank"}(${order.weights ? `${addValue(ctx.values, `{${order.weights}}`)}, ` : ""}${search.vectorSQL}, "${column}"${order.normalization !== void 0 ? `, ${addValue(ctx.values, order.normalization)}` : ""}) ${order.dir || "DESC"}`;
 	}
-	return `${maybeSelectedColumnToSql(ctx, data, column, quotedAs)} ${dir || "ASC"}`;
+	return `${columnToSql(ctx, data, data.shape, column, quotedAs, void 0, void 0, void 0, true)} ${dir || "ASC"}`;
 };
 const windowToSql = (ctx, data, window, quotedAs) => {
 	if (typeof window === "string") return `"${window}"`;
 	if (isExpression(window)) return `(${window.toSQL(ctx, quotedAs)})`;
 	const sql = [];
-	if (window.partitionBy) sql.push(`PARTITION BY ${Array.isArray(window.partitionBy) ? window.partitionBy.map((partitionBy) => rawOrColumnToSql(ctx, data, partitionBy, quotedAs)).join(", ") : rawOrColumnToSql(ctx, data, window.partitionBy, quotedAs)}`);
+	if (window.partitionBy) sql.push(`PARTITION BY ${Array.isArray(window.partitionBy) ? window.partitionBy.map((partitionBy) => rawOrColumnToSql(ctx, data, data.shape, partitionBy, quotedAs)).join(", ") : rawOrColumnToSql(ctx, data, data.shape, window.partitionBy, quotedAs)}`);
 	if (window.order) sql.push(`ORDER BY ${orderByToSql(ctx, data, window.order, quotedAs)}`);
 	return `(${sql.join(" ")})`;
 };
@@ -8069,7 +8018,7 @@ var FnExpression = class extends Expression {
 const fnArgToSql = (ctx, data, arg, quotedAs) => {
 	if (typeof arg === "string") {
 		if (arg.endsWith(".*") || data.valuesJoinedAs?.[arg]) return columnToSql(ctx, data, data.shape, arg, quotedAs);
-		return selectedColumnToSql(ctx, data, data.shape, arg, quotedAs);
+		return columnToSql(ctx, data, data.shape, arg, quotedAs, true);
 	}
 	return arg.toSQL(ctx, quotedAs);
 };
@@ -9424,7 +9373,7 @@ var OnConflictQueryBuilder = class {
 const pushDistinctSql = (ctx, table, distinct, quotedAs) => {
 	ctx.sql.push("DISTINCT");
 	if (distinct.length) {
-		const columns = distinct?.map((item) => rawOrColumnToSql(ctx, table.q, item, quotedAs));
+		const columns = distinct?.map((item) => rawOrColumnToSql(ctx, table.q, table.q.shape, item, quotedAs));
 		ctx.sql.push(`ON (${columns?.join(", ") || ""})`);
 	}
 };
@@ -12334,7 +12283,7 @@ var ColumnRefExpression = class extends Expression {
 		Object.assign(this, value.operators);
 	}
 	makeSQL(ctx, quotedAs) {
-		return simpleExistingColumnToSQL(ctx, this.name, this.result.value, quotedAs);
+		return simpleColumnToSQL(ctx, emptyObject, emptyObject, this.name, this.result.value, quotedAs, void 0, void 0, void 0, void 0, true);
 	}
 };
 var OrExpression = class extends Expression {