pqb 0.67.2 → 0.67.3

package/dist/index.mjs

@@ -4540,7 +4540,11 @@ const loadRelations = async (state, result, savepointState, renames) => {
 	const q = state.query;
 	const primaryKeys = requirePrimaryKeys(q, "Cannot select a relation of a table that has no primary keys");
 	const selectQuery = _unscope(q, "nonDeleted");
-	selectQuery.q.type = selectQuery.q.returnType = void 0;
+	selectQuery.q.type = void 0;
+	selectQuery.q.returnType = void 0;
+	selectQuery.q.with = void 0;
+	selectQuery.q.appendQueries = void 0;
+	selectQuery.q.valuesJoinedAs = void 0;
 	const matchSourceTableIds = {};
 	for (const pkey of primaryKeys) matchSourceTableIds[pkey] = { in: result.map((row) => row[pkey]) };
 	(selectQuery.q.and ??= []).push(matchSourceTableIds);
@@ -6938,22 +6942,33 @@ const setMutativeQueriesSelectRelationsSqlState = (d, as, rel) => {
 const handleInsertAndUpdateSelectRelationsSqlState = (ctx, state) => {
 	if (state) ctx.topCtx.mutativeQueriesSelectRelationsSqlState = state;
 };
+const unsetValuesJoinedAsForMutativeSelectRelations = (query) => {
+	if (!query.q.selectRelation || !query.q.valuesJoinedAs) return;
+	const { valuesJoinedAs } = query.q;
+	query.q.valuesJoinedAs = void 0;
+	return valuesJoinedAs;
+};
+const restoreValuesJoinedAsForMutativeSelectRelations = (query, valuesJoinedAs) => {
+	if (valuesJoinedAs) query.q.valuesJoinedAs = valuesJoinedAs;
+};
 const handleDeleteSelectRelationsSqlState = (ctx, query, relationSelectState) => {
 	const selectRelations = relationSelectState?.value;
 	if (!selectRelations) return;
 	const selectPrimaryKeysQuery = prepareSubQueryForSql(query, _clone(query));
+	selectPrimaryKeysQuery.q.valuesJoinedAs = void 0;
 	const primaryKeys = requirePrimaryKeys(query, "primary keys are required for selecting relation in delete");
 	_addToHookSelect(selectPrimaryKeysQuery, primaryKeys, true);
 	const { as: cteAs } = moveQueryToCte(ctx, selectPrimaryKeysQuery, void 0, true);
 	const relKeys = Object.keys(selectRelations);
 	const hookSelect = selectPrimaryKeysQuery.q.hookSelect;
+	const queryAs = getQueryAs(query);
 	const join = {
 		type: "JOIN",
 		args: {
 			w: cteAs,
 			a: [Object.fromEntries(primaryKeys.map((key) => {
 				const selected = hookSelect.get(key);
-				return [cteAs + "." + (selected.as || selected.select), key];
+				return [cteAs + "." + (selected.as || selected.select), `${queryAs}.${key}`];
 			}))]
 		}
 	};
@@ -7688,6 +7703,14 @@ function pushLimitSQL(sql, values, q) {
 	}
 }
 const pushUpdateSql = (ctx, query, q, quotedAs, isSubSql) => {
+	const valuesJoinedAs = unsetValuesJoinedAsForMutativeSelectRelations(query);
+	try {
+		return pushUpdateSqlWithoutValuesJoinedAs(ctx, query, q, quotedAs, isSubSql);
+	} finally {
+		restoreValuesJoinedAsForMutativeSelectRelations(query, valuesJoinedAs);
+	}
+};
+const pushUpdateSqlWithoutValuesJoinedAs = (ctx, query, q, quotedAs, isSubSql) => {
 	const quotedTable = `"${query.table || q.from}"`;
 	const from = quoteTableWithSchema(query);
 	const set = [];
@@ -9546,6 +9569,8 @@ const toSql = (table, type, topCtx, isSubSql, cteName, calledByThen, dontAddTabl
 					_queryInsert(upsertOrCreate, query.upsertInsert());
 					upsertOrCreate.q.type = "upsert";
 				}
+				upsertOrCreate.q.appendQueries = query.upsertCreateAppendQueries;
+				upsertOrCreate.q.asFns = query.upsertCreateAsFns;
 				const { makeSql: makeSecondSql } = moveMutativeQueryToCteBase(toSql, ctx, upsertOrCreate, "insert");
 				sql.push(makeFirstSql(isSubSql), "UNION ALL", makeSecondSql(isSubSql));
 			} else {
@@ -9701,9 +9726,9 @@ const addTopCteInternal = (place, ctx, item, type, dontAddTableHook) => {
 	topCTE.stack.pop();
 };
 const addWithToSql = (ctx, sql, isSubSql) => {
-	if (!isSubSql && ctx.topCtx.topCTE) {
+	if (!isSubSql && ctx.topCtx.topCTE?.append.length) {
 		const sqls = [];
-		if (!isSubSql && ctx.topCtx.topCTE) for (const append of ctx.topCtx.topCTE.append) sqls.push(...append);
+		for (const append of ctx.topCtx.topCTE.append) sqls.push(...append);
 		sql.text = "WITH " + sqls.join(", ") + " " + sql.text;
 	}
 };
@@ -12347,6 +12372,9 @@ var QueryExpressions = class {
 const _appendQuery = (main, append, asFn) => {
 	return pushQueryValueImmutable(pushQueryValueImmutable(main, "appendQueries", prepareSubQueryForSql(main, append)), "asFns", asFn);
 };
+const _appendQueryOnUpsertCreate = (main, append, asFn) => {
+	return pushQueryValueImmutable(pushQueryValueImmutable(main, "upsertCreateAppendQueries", prepareSubQueryForSql(main, append)), "upsertCreateAsFns", asFn);
+};
 const mergableObjects = new Set([
 	"shape",
 	"withShapes",
@@ -14309,6 +14337,6 @@ const testTransaction = {
 		if (db.internal[trxForTest]?.length === 0) return db.q.adapter.close();
 	}
 };
-export { AdapterClass, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Column, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, Expression, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, Operators, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryError, QueryHookUtils, QueryHooks, RawSql, RealColumn, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, TransactionAdapterClass, TsQueryColumn, TsVectorColumn, UUIDColumn, UnknownColumn, VarCharColumn, VirtualColumn, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, copyTableData, createDbWithAdapter, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
+export { AdapterClass, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Column, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, Expression, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, Operators, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryError, QueryHookUtils, QueryHooks, RawSql, RealColumn, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, TransactionAdapterClass, TsQueryColumn, TsVectorColumn, UUIDColumn, UnknownColumn, VarCharColumn, VirtualColumn, XMLColumn, _appendQuery, _appendQueryOnUpsertCreate, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, copyTableData, createDbWithAdapter, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
 
 //# sourceMappingURL=index.mjs.map