pqb 0.73.2 → 0.73.4

package/dist/index.js

@@ -349,6 +349,17 @@ const templateLiteralSQLToCode = (sql) => {
 	code += parts[i];
 	return code + "`";
 };
+var ValExpression = class extends Expression {
+	constructor(value) {
+		super();
+		this.value = value;
+		this.result = { value: emptyObject };
+		this.q = { expr: this };
+	}
+	makeSQL(ctx) {
+		return addValue(ctx.values, this.value);
+	}
+};
 var SqlJoinExpression = class extends Expression {
 	constructor(items, separator) {
 		super();
@@ -499,6 +510,7 @@ const sqlFn = ((...args) => {
 sqlFn.ref = (name) => new SqlRefExpression(name);
 sqlFn.join = (items, separator) => new SqlJoinExpression(items, separator);
 sqlFn.unsafe = (sql) => new UnsafeSqlExpression(sql);
+sqlFn.val = (value) => new ValExpression(value);
 var UnsafeSqlExpression = class extends Expression {
 	constructor(sql) {
 		super();
@@ -4124,6 +4136,81 @@ const getResetSetConfigSql = (parentSetConfig, options) => {
 const setConfigSql = (key, value) => {
 	return `set_config('${key.replace(/'/g, "''")}', '${typeof value === "string" ? value.replace(/'/g, "''") : value === void 0 ? "" : value}', true)`;
 };
+var Rollback = class extends Error {};
+const trxForTest = Symbol("trxForTest");
+const argToDb = (arg) => "$qb" in arg ? arg.$qb : arg;
+const testTransaction = {
+	/**
+	* Start a test transaction.
+	* The returned promise is resolved immediately when transaction starts, not waiting for it to end.
+	*
+	* @param arg - ORM instance or a queryable instance (such as db.someTable).
+	*/
+	start(arg) {
+		const db = argToDb(arg);
+		const { asyncStorage } = db.internal;
+		const { getStore } = asyncStorage;
+		const { adapter } = db.baseQuery.q;
+		const data = { adapter: {
+			query: adapter.query,
+			arrays: adapter.arrays,
+			transaction: adapter.transaction
+		} };
+		(db.internal[trxForTest] ??= []).push(data);
+		return new Promise((resolve) => {
+			data.promise = db.transaction(() => {
+				resolve();
+				return new Promise((_, rej) => {
+					const state = asyncStorage.getStore();
+					db.internal.asyncStorage.getStore = () => state;
+					const t = state?.transactionAdapter;
+					if (t) {
+						adapter.query = t.query.bind(t);
+						adapter.arrays = t.arrays.bind(t);
+						adapter.transaction = t.transaction.bind(t);
+						state.testTransactionCount = state.testTransactionCount ? state.testTransactionCount + 1 : 1;
+					}
+					data.reject = rej;
+				});
+			}).catch((err) => {
+				if (!(err instanceof Rollback)) throw err;
+			}).finally(() => {
+				const state = db.internal.asyncStorage.getStore();
+				if (state?.testTransactionCount) state.testTransactionCount--;
+				db.internal.asyncStorage.getStore = getStore;
+			});
+		});
+	},
+	/**
+	* Rollback a test transaction.
+	*
+	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
+	*/
+	rollback(arg) {
+		const db = argToDb(arg);
+		const data = db.internal[trxForTest];
+		const last = data?.pop();
+		if (!last) return;
+		if (!data?.length) Object.assign(db.baseQuery.q.adapter, last.adapter);
+		last.reject?.(new Rollback());
+		return last.promise;
+	},
+	/**
+	* Will roll back the current `testTransaction` (won't have any effect if it was rolled back already),
+	* and if there's no nested test transactions left, it will close the db connection.
+	*
+	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
+	*/
+	async close(arg) {
+		const db = argToDb(arg);
+		await this.rollback(db);
+		if (db.internal[trxForTest]?.length === 0) return db.q.adapter.close();
+	}
+};
+const logSavepointRollback = (log, error, rollbackSql, rollbackLogData) => {
+	if (error instanceof Rollback) log.afterQuery(rollbackSql, rollbackLogData);
+	else if (error) log.onError(error, rollbackSql, rollbackLogData);
+};
 /**
 * Shared runtime adapter orchestrator over a driver-specific adapter implementation.
 */
@@ -4149,11 +4236,11 @@ var AdapterClass = class AdapterClass {
 		this.pool = this.driverAdapter.configure(this.config);
 		this.errorClass = this.driverAdapter.errorClass;
 	}
-	query(text, values, sqlSessionState) {
-		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, sqlSessionState);
+	query(text, values, sqlSessionState, prepare) {
+		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, sqlSessionState, void 0, prepare);
 	}
-	arrays(text, values, sqlSessionState) {
-		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, sqlSessionState, true);
+	arrays(text, values, sqlSessionState, prepare) {
+		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, sqlSessionState, true, prepare);
 	}
 	clone(params) {
 		return new AdapterClass({
@@ -4197,13 +4284,13 @@ var TransactionAdapterClass = class {
 		this.driverAdapter = adapter.driverAdapter;
 		this.errorClass = this.adapter.errorClass;
 	}
-	query(text, values, sqlSessionState) {
+	query(text, values, sqlSessionState, prepare) {
 		const setup = sqlSessionContextComputeSetup(sqlSessionState);
-		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, setup);
+		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, setup, void 0, prepare);
 	}
-	arrays(text, values, sqlSessionState) {
+	arrays(text, values, sqlSessionState, prepare) {
 		const setup = sqlSessionContextComputeSetup(sqlSessionState);
-		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, setup, true);
+		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, setup, true, prepare);
 	}
 	clone(params) {
 		return this.adapter.clone(params);
@@ -4256,13 +4343,13 @@ var TransactionAdapterClass = class {
 			rollbackSql = { text: `ROLLBACK TO SAVEPOINT "${name}"` };
 			rollbackLogData = log.beforeQuery(rollbackSql);
 		}, () => {
-			if (error) log.onError(error, rollbackSql, rollbackLogData);
+			logSavepointRollback(log, error, rollbackSql, rollbackLogData);
 		});
 	}
-	hackySavepoint(state, text, values, arraysMode, log) {
+	hackySavepoint(state, text, values, arraysMode, prepare, log) {
 		if (!log) return this.driverAdapter.hackySavepoint(this.client, (client) => {
 			this.client = client;
-		}, state, text, values, arraysMode);
+		}, state, text, values, arraysMode, prepare);
 		const savepointSql = { text: `SAVEPOINT "${state.name}"` };
 		const savepointLogData = log.beforeQuery(savepointSql);
 		let releaseSql;
@@ -4272,14 +4359,14 @@ var TransactionAdapterClass = class {
 		let error;
 		const result = this.driverAdapter.hackySavepoint(this.client, (client) => {
 			this.client = client;
-		}, state, text, values, arraysMode, () => log.afterQuery(savepointSql, savepointLogData), () => {
+		}, state, text, values, arraysMode, prepare, () => log.afterQuery(savepointSql, savepointLogData), () => {
 			releaseSql = { text: `RELEASE SAVEPOINT "${state.name}"` };
 			releaseLogData = log.beforeQuery(releaseSql);
 		}, () => log.afterQuery(releaseSql, releaseLogData), () => {
 			rollbackSql = { text: `ROLLBACK TO SAVEPOINT "${state.name}"` };
 			rollbackLogData = log.beforeQuery(rollbackSql);
 		}, () => {
-			if (error) log.onError(error, rollbackSql, rollbackLogData);
+			logSavepointRollback(log, error, rollbackSql, rollbackLogData);
 		});
 		const activeSavepoint = state.activeSavepoint;
 		if (activeSavepoint) {
@@ -4447,18 +4534,18 @@ const runAfterCommit = (afterCommit, result) => {
 		}
 	});
 };
-const runQueryHandlePool = async (pool, driverAdapter, text, values, sqlSessionState, arraysMode, client) => {
+const runQueryHandlePool = async (pool, driverAdapter, text, values, sqlSessionState, arraysMode, prepare, client) => {
 	const setup = sqlSessionContextComputeSetup(sqlSessionState);
-	if (client || !driverAdapter.manualPool && !setup) return runQueryHandleSetupAndCleanup(driverAdapter, client || pool, text, values, setup, arraysMode);
+	if (client || !driverAdapter.manualPool && !setup) return runQueryHandleSetupAndCleanup(driverAdapter, client || pool, text, values, setup, arraysMode, prepare);
 	client = await driverAdapter.borrow(pool);
 	try {
-		return await runQueryHandleSetupAndCleanup(driverAdapter, client, text, values, setup, arraysMode);
+		return await runQueryHandleSetupAndCleanup(driverAdapter, client, text, values, setup, arraysMode, prepare);
 	} finally {
 		driverAdapter.release(client);
 	}
 };
-const runQueryHandleSetupAndCleanup = (driverAdapter, client, text, values, setup, arraysMode) => {
-	const mainQuery = () => driverAdapter.queryClient(client, text, values, arraysMode);
+const runQueryHandleSetupAndCleanup = (driverAdapter, client, text, values, setup, arraysMode, prepare) => {
+	const mainQuery = () => driverAdapter.queryClient(client, text, values, arraysMode, prepare);
 	if (setup) return sqlSessionContextExecute((text, values) => driverAdapter.queryClient(client, text, values, true), setup, mainQuery);
 	return mainQuery();
 };
@@ -4773,8 +4860,6 @@ function maybeWrappedThen(resolve, reject, parentSavepoint) {
 	})).then(resolve, reject);
 	else return then(this, state?.transactionAdapter || this.q.adapter, state, beforeHooks, afterHooks, afterSaveHooks, afterCommitHooks, afterSaveCommitHooks, resolve, reject, shouldCatch, parentSavepoint);
 }
-const queriesNames = {};
-let nameI = 0;
 const callAfterHook = function(cb) {
 	return cb(this[0], this[1]);
 };
@@ -4806,7 +4891,7 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 		const startingSavepoint = setCatchingSavepoint(!parentSavepoint && shouldCatch && state);
 		const releasingSavepoint = checkIfShouldReleaseSavepointForMutativeQueriesSelectRelations(sql) || parentSavepoint ? void 0 : parentSavepoint || startingSavepoint;
 		if ("text" in sql) {
-			if (query.autoPreparedStatements) sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
+			if (query.autoPreparedStatements) sql.prepare = true;
 			if (log) logData = log.beforeQuery(sql);
 			const method = queryMethodByReturnType[tempReturnType];
 			queryResult = await execQuery(adapter, method, sql, log, startingSavepoint, releasingSavepoint, sqlSessionContextGetStateFromAsyncState(state));
@@ -5040,12 +5125,13 @@ const setCatchingSavepoint = (catchTrx) => {
 * because user might expect empty objects to be returned for an empty select.
 */
 const execQuery = (adapter, method, sql, log, startingSavepoint, releasingSavepoint, sqlSessionState) => {
+	const prepare = sql.prepare;
 	let promise;
 	if (startingSavepoint) if (releasingSavepoint) promise = startingSavepoint.transactionAdapter.savepoint(startingSavepoint.name, log, () => {
-		return promise = adapter[method](sql.text, sql.values, sqlSessionState);
+		return prepare ? promise = adapter[method](sql.text, sql.values, sqlSessionState, prepare) : promise = adapter[method](sql.text, sql.values, sqlSessionState);
 	});
-	else promise = startingSavepoint.transactionAdapter.hackySavepoint(startingSavepoint, sql.text, sql.values, method === "arrays", log);
-	else promise = adapter[method](sql.text, sql.values, sqlSessionState);
+	else promise = prepare ? startingSavepoint.transactionAdapter.hackySavepoint(startingSavepoint, sql.text, sql.values, method === "arrays", prepare, log) : startingSavepoint.transactionAdapter.hackySavepoint(startingSavepoint, sql.text, sql.values, method === "arrays", void 0, log);
+	else promise = prepare ? adapter[method](sql.text, sql.values, sqlSessionState, prepare) : adapter[method](sql.text, sql.values, sqlSessionState);
 	if (!startingSavepoint && releasingSavepoint) promise = promise.then(async (res) => {
 		await releasingSavepoint.activeSavepoint?.release();
 		return res;
@@ -6861,6 +6947,7 @@ const _get = (query, returnType, arg) => {
 	const q = query.q;
 	if (q.returning) q.returning = void 0;
 	q.returnType = returnType;
+	q.batchParsers = void 0;
 	let value = arg;
 	const selectAs = {};
 	let column;
@@ -11051,8 +11138,7 @@ const addParserForSelectItem = (query, as, key, arg, columnAlias, joinQuery) =>
 		}
 		return arg;
 	}
-	const joinedAs = query.q.valuesJoinedAs?.[arg];
-	return setParserForSelectedString(query, joinedAs ? joinedAs + "." + arg : arg, as, key, columnAlias);
+	return setParserForSelectedString(query, arg, as, key, columnAlias);
 };
 const collectNestedSelectBatches = (batches, rows, path) => {
 	const last = path.length - 1;
@@ -11099,7 +11185,8 @@ const processSelectAsArg = (q, selectAs, as, key, arg, columnAlias, outerReturnT
 		if (isExpression(value)) column = value.result.value;
 		else {
 			const isSelfReferencingQuery = value.q.subQuery === 1;
-			if (isRelationQuery(value) && !isSelfReferencingQuery) {
+			const isSelectingRelation = value.q.subQuery && value.q.subQuery > 1;
+			if (isRelationQuery(value) && isSelectingRelation) {
 				joinQuery = true;
 				setSelectRelation(query.q);
 				value = value.joinQuery(value, q);
@@ -11144,6 +11231,12 @@ const processSelectAsArg = (q, selectAs, as, key, arg, columnAlias, outerReturnT
 };
 const setParserForSelectedString = (query, arg, as, columnAs, columnAlias) => {
 	const { q } = query;
+	const joinedAs = q.valuesJoinedAs?.[arg];
+	if (joinedAs) {
+		const parser = q.joinedParsers?.[joinedAs]?.v;
+		if (parser) setParserToQuery(q, columnAs || arg, parser);
+		return joinedAs + "." + arg;
+	}
 	const index = arg.indexOf(".");
 	if (index === -1) return selectColumn(query, q, arg, columnAs, columnAlias);
 	const table = getFullColumnTable(query, arg, index, as);
@@ -12433,17 +12526,6 @@ var OrExpression = class extends Expression {
 	}
 };
 Object.assign(OrExpression.prototype, Operators.boolean);
-var ValExpression = class extends Expression {
-	constructor(value) {
-		super();
-		this.value = value;
-		this.result = { value: emptyObject };
-		this.q = { expr: this };
-	}
-	makeSQL(ctx) {
-		return addValue(ctx.values, this.value);
-	}
-};
 var QueryExpressions = class {
 	/**
 	* `column` references a table column, this can be used in raw SQL or when building a column expression.
@@ -12513,9 +12595,6 @@ var QueryExpressions = class {
 		q.q.returnType = void 0;
 		return new RefExpression(column || UnknownColumn.instance, q, arg);
 	}
-	val(value) {
-		return new ValExpression(value);
-	}
 	/**
 	* `fn` allows to call an arbitrary SQL function.
 	*
@@ -13104,6 +13183,7 @@ var QueryPluck = class {
 	pluck(select) {
 		const q = _clone(this);
 		q.q.returnType = "pluck";
+		q.q.batchParsers = void 0;
 		let selected;
 		const selectAs = {};
 		const item = processSelectAsArg(q, selectAs, q.q.as || q.table, "pluck", select, void 0, "value");
@@ -14418,6 +14498,7 @@ function _createDbSqlMethod(columnTypes) {
 	fn.ref = sqlFn.ref;
 	fn.join = sqlFn.join;
 	fn.unsafe = sqlFn.unsafe;
+	fn.val = sqlFn.val;
 	return fn;
 }
 const _initQueryBuilder = (adapter, columnTypes, asyncStorage, commonOptions, options) => {
@@ -14585,77 +14666,6 @@ function copyTableData(query, arg) {
 	q.toSQL = () => makeCopySql(q, arg);
 	return q;
 }
-var Rollback = class extends Error {};
-const trxForTest = Symbol("trxForTest");
-const argToDb = (arg) => "$qb" in arg ? arg.$qb : arg;
-const testTransaction = {
-	/**
-	* Start a test transaction.
-	* The returned promise is resolved immediately when transaction starts, not waiting for it to end.
-	*
-	* @param arg - ORM instance or a queryable instance (such as db.someTable).
-	*/
-	start(arg) {
-		const db = argToDb(arg);
-		const { asyncStorage } = db.internal;
-		const { getStore } = asyncStorage;
-		const { adapter } = db.baseQuery.q;
-		const data = { adapter: {
-			query: adapter.query,
-			arrays: adapter.arrays,
-			transaction: adapter.transaction
-		} };
-		(db.internal[trxForTest] ??= []).push(data);
-		return new Promise((resolve) => {
-			data.promise = db.transaction(() => {
-				resolve();
-				return new Promise((_, rej) => {
-					const state = asyncStorage.getStore();
-					db.internal.asyncStorage.getStore = () => state;
-					const t = state?.transactionAdapter;
-					if (t) {
-						adapter.query = t.query.bind(t);
-						adapter.arrays = t.arrays.bind(t);
-						adapter.transaction = t.transaction.bind(t);
-						state.testTransactionCount = state.testTransactionCount ? state.testTransactionCount + 1 : 1;
-					}
-					data.reject = rej;
-				});
-			}).catch((err) => {
-				if (!(err instanceof Rollback)) throw err;
-			}).finally(() => {
-				const state = db.internal.asyncStorage.getStore();
-				if (state?.testTransactionCount) state.testTransactionCount--;
-				db.internal.asyncStorage.getStore = getStore;
-			});
-		});
-	},
-	/**
-	* Rollback a test transaction.
-	*
-	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
-	*/
-	rollback(arg) {
-		const db = argToDb(arg);
-		const data = db.internal[trxForTest];
-		const last = data?.pop();
-		if (!last) return;
-		if (!data?.length) Object.assign(db.baseQuery.q.adapter, last.adapter);
-		last.reject?.(new Rollback());
-		return last.promise;
-	},
-	/**
-	* Will roll back the current `testTransaction` (won't have any effect if it was rolled back already),
-	* and if there's no nested test transactions left, it will close the db connection.
-	*
-	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
-	*/
-	async close(arg) {
-		const db = argToDb(arg);
-		await this.rollback(db);
-		if (db.internal[trxForTest]?.length === 0) return db.q.adapter.close();
-	}
-};
 exports.AdapterClass = AdapterClass;
 exports.ArrayColumn = ArrayColumn;
 exports.BigIntColumn = BigIntColumn;
@@ -14721,6 +14731,7 @@ exports.TsQueryColumn = TsQueryColumn;
 exports.TsVectorColumn = TsVectorColumn;
 exports.UUIDColumn = UUIDColumn;
 exports.UnknownColumn = UnknownColumn;
+exports.ValExpression = ValExpression;
 exports.VarCharColumn = VarCharColumn;
 exports.VirtualColumn = VirtualColumn;
 exports.XMLColumn = XMLColumn;