pqb 0.70.0 → 0.71.0

package/dist/index.mjs

@@ -147,7 +147,7 @@ const toPascalCase = (str) => {
 * @param str - string to translate
 */
 const toSnakeCase = (str) => {
-	return str.replace(/[A-Z]/g, (a) => `_${a.toLowerCase()}`);
+	return str.replace(/[A-Z]/g, (a, i) => `${i ? "_" : ""}${a.toLowerCase()}`);
 };
 /**
 * Compare two values deeply.
@@ -6602,12 +6602,12 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
 		ctx.aliasValue = aliasValue;
 	} else if ("j" in args) {
 		const { j, s, r } = args;
-		const tableName = typeof j.q.from === "string" ? j.q.from : j.table;
-		const joinTable = requireTableOrStringFrom(j);
+		const joinTable = j.q.nameInDb || requireTableOrStringFrom(j);
 		target = quoteFromWithSchema(getQuerySchema$1(j), joinTable);
 		const as = j.q.as;
 		const joinAs = `"${as}"`;
-		if (as !== tableName) target += ` ${joinAs}`;
+		const alias = getQueryRelationAliasForAs(j, as);
+		if (alias) target += ` ${alias}`;
 		if (r && s) target = subJoinToSql(ctx, j, `"${joinTable}"`, !forbidLateral, joinAs, true);
 		else on = whereToSql(ctx, j, j.q, joinAs);
 	} else if ("w" in args) {
@@ -6665,16 +6665,16 @@ const getArgQueryTarget = (ctx, first, lateral, joinSubQuery, cloned) => {
 	const quotedFrom = typeof joinQuery.from === "string" ? `"${joinQuery.from}"` : void 0;
 	let joinAs = quotedFrom || `"${first.table}"`;
 	const qAs = joinQuery.as ? `"${joinQuery.as}"` : void 0;
-	const addAs = qAs && qAs !== joinAs;
+	const aliasToAdd = getQueryRelationAliasForAs(first, joinQuery.as);
 	if (joinSubQuery) return {
 		target: subJoinToSql(ctx, first, joinAs, lateral, qAs, cloned),
-		joinAs: addAs ? qAs : joinAs
+		joinAs: qAs || joinAs
 	};
 	else {
 		let target = quotedFrom || quoteTableWithSchema(first);
-		if (addAs) {
-			joinAs = qAs;
-			target += ` ${qAs}`;
+		if (aliasToAdd) {
+			joinAs = aliasToAdd;
+			target += ` ${aliasToAdd}`;
 		}
 		return {
 			target,
@@ -7432,14 +7432,18 @@ const makeInsertSql = (ctx, q, query, quotedAs, isSubSql) => {
 		}
 	}
 	const hasNonSelect = ctx.hasNonSelect;
+	const returningQuotedAs = query.as ? `"${query.as}"` : quotedAs;
+	const insertAlias = getQueryRelationAliasForAs(q, query.as);
+	quotedAs = insertAlias || quotedAs;
 	const sqlState = {
 		ctx,
 		q,
 		query,
 		quotedAs,
+		returningQuotedAs,
 		isSubSql,
 		returningPos: 0,
-		insertSql: `INSERT INTO ${quoteTableWithSchema(q)}${quotedColumns.length ? "(" + quotedColumns.join(", ") + ")" : ""}`
+		insertSql: `INSERT INTO ${quoteTableWithSchema(q)}${insertAlias ? ` AS ${insertAlias}` : ""}${quotedColumns.length ? "(" + quotedColumns.join(", ") + ")" : ""}`
 	};
 	ctx.sql.push(null, null);
 	const hasOnConflictWhere = pushOnConflictSql(ctx, q, query, quotedAs, columns, quotedColumns, runtimeDefaultColumns);
@@ -7552,7 +7556,7 @@ const applySqlState = (sqlState) => {
 	const insertSql = sqlState.selectFromSql ? sqlState.insertSql + sqlState.selectFromSql : sqlState.insertSql;
 	const wrapInCte = getShouldWrapMainQueryInCte(ctx, sqlState.query, "insert", sqlState.isSubSql);
 	if ("valuesSql" in sqlState) ctx.sql[1] = sqlState.valuesPrepend + sqlState.valuesSql.join(", ") + sqlState.valuesAppend;
-	const returning = makeReturningSql(ctx, sqlState.q, sqlState.query, sqlState.quotedAs, sqlState.relationSelectState, "Create", void 0, sqlState.isSubSql || !!ctx.topCtx.cteHooks);
+	const returning = makeReturningSql(ctx, sqlState.q, sqlState.query, sqlState.returningQuotedAs, sqlState.relationSelectState, "Create", void 0, sqlState.isSubSql || !!ctx.topCtx.cteHooks);
 	if (returning) ctx.sql[sqlState.returningPos] = "RETURNING " + returning;
 	ctx.sql[0] = insertSql;
 	if (wrapInCte) wrapMainQueryInCte(ctx, sqlState.query);
@@ -7713,8 +7717,9 @@ const pushUpdateSql = (ctx, query, q, quotedAs, isSubSql) => {
 	}
 };
 const pushUpdateSqlWithoutValuesJoinedAs = (ctx, query, q, quotedAs, isSubSql) => {
-	const quotedTable = `"${query.table || q.from}"`;
 	const from = quoteTableWithSchema(query);
+	const alias = getQueryRelationAliasForAs(query, q.as);
+	quotedAs = alias || quotedAs;
 	const set = [];
 	const hookSet = q.hookUpdateSet ? Object.fromEntries(q.hookUpdateSet.flatMap((item) => Object.entries(item))) : emptyObject;
 	const relationSelectState = newMutativeQueriesSelectRelationsSqlState(query);
@@ -7729,7 +7734,7 @@ const pushUpdateSqlWithoutValuesJoinedAs = (ctx, query, q, quotedAs, isSubSql) =
 	if (!set.length) pushSelectForEmptySet(ctx, query, q, quotedAs, from, isSubSql, updateManyValuesSql, relationSelectState);
 	else {
 		ctx.sql.push(`UPDATE ${from}`);
-		if (quotedTable !== quotedAs) ctx.sql.push(quotedAs);
+		if (alias) ctx.sql.push(alias);
 		ctx.sql.push("SET", set.join(", "));
 		let fromWhereSql;
 		if (updateManyValuesSql) {
@@ -7746,6 +7751,8 @@ const pushSelectForEmptySet = (ctx, query, q, quotedAs, from, isSubSql, updateMa
 	if (!q.select) q.select = countSelect;
 	pushUpdateReturning(ctx, query, q, quotedAs, "SELECT", relationSelectState, isSubSql);
 	let fromSql = `FROM ${from}`;
+	const alias = getQueryRelationAliasForAs(query, q.as);
+	if (alias) fromSql += ` ${alias}`;
 	if (updateManyValuesSql) fromSql += `, ${updateManyValuesSql}`;
 	ctx.sql.push(fromSql);
 	pushWhereStatementSql(ctx, query, q, quotedAs);
@@ -7860,7 +7867,8 @@ const throwOnDifferentColumns = (query, keysSet, row, i) => {
 const pushDeleteSql = (ctx, query, q, quotedAs, isSubSql) => {
 	const from = quoteTableWithSchema(query);
 	ctx.sql.push(`DELETE FROM ${from}`);
-	if (q.as && query.table !== q.as) ctx.sql.push(quotedAs);
+	const alias = getQueryRelationAliasForAs(query, q.as);
+	if (alias) ctx.sql.push(alias);
 	const relationSelectState = newMutativeQueriesSelectRelationsSqlState(query);
 	let returning = makeReturningSql(ctx, query, q, quotedAs, relationSelectState, "Delete", void 0, isSubSql);
 	const selectRelations = handleDeleteSelectRelationsSqlState(ctx, query, relationSelectState);
@@ -9445,7 +9453,8 @@ const getFrom = (ctx, query, data, quotedAs) => {
 		return fromToSql(ctx, query, data, from, quotedAs);
 	}
 	let sql = quoteTableWithSchema(query);
-	if (data.as && query.table !== data.as) sql += ` ${quotedAs}`;
+	const alias = getQueryRelationAliasForAs(query, data.as);
+	if (alias) sql += ` ${alias}`;
 	if (data.only) sql = `ONLY ${sql}`;
 	return sql;
 };
@@ -9457,7 +9466,7 @@ const fromToSql = (ctx, query, data, from, quotedAs) => {
 		only = from.q.only;
 		if (!from.table) sql = `(${moveMutativeQueryToCte(ctx, from)})`;
 		else if (!checkIfASimpleQuery(from)) sql = `(${moveMutativeQueryToCte(ctx, from)}) ${quotedAs || `"${getQueryAs(from)}"`}`;
-		else sql = quoteTableWithSchema(from);
+		else sql = quoteTableWithSchemaAndAlias(from);
 		fromQuery = from;
 	}
 	else sql = quoteFromWithSchema(getQuerySchema$1(query), from);
@@ -9758,7 +9767,18 @@ const requireTableOrStringFrom = (query) => {
 	if (!table) throw new OrchidOrmInternalError(query, "The query object does not have a table and doesn't define a `from` string");
 	return table;
 };
-const quoteTableWithSchema = (query) => quoteFromWithSchema(getQuerySchema$1(query), requireTableOrStringFrom(query));
+const getQueryRelationAlias = (query) => query.table && query.q.nameInDb && query.table !== query.q.nameInDb ? `"${query.table}"` : void 0;
+const getQueryRelationAliasForAs = (query, as) => {
+	if (!as) return getQueryRelationAlias(query);
+	const nameInDb = query.q.nameInDb || requireTableOrStringFrom(query);
+	return nameInDb && as !== nameInDb ? `"${as}"` : void 0;
+};
+const quoteTableWithSchema = (query) => quoteFromWithSchema(getQuerySchema$1(query), query.q.nameInDb || requireTableOrStringFrom(query));
+const quoteTableWithSchemaAndAlias = (query) => {
+	const table = quoteTableWithSchema(query);
+	const alias = getQueryRelationAlias(query);
+	return alias ? `${table} ${alias}` : table;
+};
 const quoteFromWithSchema = (schema, table) => {
 	const s = typeof schema === "function" ? schema() : schema;
 	return s ? `"${s}"."${table}"` : `"${table}"`;
@@ -10026,7 +10046,7 @@ const _joinLateral = (self, type, joinQuery, as, innerJoinLateral) => {
 		const joinedAs = getQueryAs(query);
 		setObjectValueImmutable(joinQuery.q, "joinedShapes", joinedAs, query.q.selectShape);
 	}
-	const shape = getShapeFromSelect(joinQuery, true);
+	const shape = joinQuery.table && joinQuery.q.joinedShapes?.[joinQuery.table] || joinQuery.q.joinedShapes?.[joinAs] || getShapeFromSelect(joinQuery, true);
 	setObjectValueImmutable(query.q, "joinedShapes", joinAs, shape);
 	if (joinValue) setObjectValueImmutable(query.q, "valuesJoinedAs", joinAs, joinValueAs);
 	setObjectValueImmutable(query.q, "joinedParsers", joinValueAs || joinAs, getQueryParsers(joinQuery));
@@ -13872,6 +13892,7 @@ const performQuery = async (q, args, method) => {
 		throw err;
 	}
 };
+const getTableNameInDb = (table, nameInDb, snakeCase) => table && (nameInDb || (snakeCase ? toSnakeCase(table) : table));
 var Db = class extends QueryMethods {
 	constructor(adapterNotInTransaction, qb, table = void 0, shape, columnTypes, asyncStorage, options, tableData = {}, viewData) {
 		super();
@@ -13949,6 +13970,7 @@ var Db = class extends QueryMethods {
 		this.q = {
 			adapter: adapterNotInTransaction,
 			selectShape: shape,
+			nameInDb: getTableNameInDb(table, options.nameInDb, snakeCase),
 			handleResult,
 			logger,
 			log: logParamToLogObject(logger, options.log),
@@ -14285,7 +14307,7 @@ const _initQueryBuilder = (adapter, columnTypes, asyncStorage, commonOptions, op
 const makeColumnInfoSql = (query, column) => {
 	const values = [];
 	const schema = getQuerySchema(query);
-	let text = `SELECT * FROM information_schema.columns WHERE table_name = ${addValue(values, query.table)} AND table_catalog = current_database() AND table_schema = ${schema ? addValue(values, schema) : "current_schema()"}`;
+	let text = `SELECT * FROM information_schema.columns WHERE table_name = ${addValue(values, query.q.nameInDb || query.table)} AND table_catalog = current_database() AND table_schema = ${schema ? addValue(values, schema) : "current_schema()"}`;
 	if (column) text += ` AND column_name = ${addValue(values, query.shape[column]?.data.name || column)}`;
 	return {
 		text,