orchid-orm 1.77.0 → 1.77.1

package/dist/index.mjs

@@ -818,7 +818,8 @@ var BelongsToVirtualColumn = class extends VirtualColumn {
 				_onUpsertUpdate(queryForCreate, (as) => {
 					createWhereNotExists._sql = `NOT EXISTS (SELECT 1 FROM "${as}")`;
 				});
-				createQuery = _queryInsertManyFrom(selectPKeys, _queryWhere(_queryTake(_querySelect(_clone(query.qb), [{}])), [createWhereNotExists]), create.values);
+				const sourceQuery = _queryWhere(_queryTake(_querySelect(_clone(query.qb), [{}])), [createWhereNotExists]);
+				createQuery = _queryInsertManyFrom(selectPKeys, sourceQuery, create.values);
 			} else createQuery = _queryInsertMany(selectPKeys, create.values);
 			const setForeignKeys = (as) => {
 				const count = create.items.length;
@@ -903,7 +904,8 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys, len }) => {
 	return ((self, update, params) => {
 		if (params.create) {
 			const createQuery = _querySelect(_queryCreate(query.clone(), params.create), primaryKeys);
-			_prependWith(self, setForeignKeysFromCte(update, primaryKeys, foreignKeys), createQuery);
+			const asFn = setForeignKeysFromCte(update, primaryKeys, foreignKeys);
+			_prependWith(self, asFn, createQuery);
 		} else if (params.update) {
 			let appendedAs;
 			_hookSelectColumns(self, foreignKeys, (aliasedForeignKeys) => {
@@ -917,7 +919,8 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys, len }) => {
 			if (isQueryReturnsAll(self)) throw new Error("`upsert` option is not allowed in a batch update");
 			const { relQuery } = relWithSelectIds(self, query, primaryKeys, foreignKeys);
 			const upsertQuery = _querySelect(_queryUpsert(relQuery, params.upsert), primaryKeys);
-			_prependWith(self, setForeignKeysFromCte(update, primaryKeys, foreignKeys), upsertQuery);
+			const asFn = setForeignKeysFromCte(update, primaryKeys, foreignKeys);
+			_prependWith(self, asFn, upsertQuery);
 		} else if (params.delete) {
 			_hookSelectColumns(self, foreignKeys, noop);
 			disconnect(update, foreignKeys);
@@ -939,7 +942,10 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys, len }) => {
 					(loadForeignKeys ??= []).push(foreignKeys[i]);
 				}
 			}
-			if (loadPrimaryKeys) _prependWith(self, setForeignKeysFromCte(update, loadPrimaryKeys, loadForeignKeys, true), _queryFindBy(query.select(...loadPrimaryKeys), params.set));
+			if (loadPrimaryKeys) {
+				const asFn = setForeignKeysFromCte(update, loadPrimaryKeys, loadForeignKeys, true);
+				_prependWith(self, asFn, _queryFindBy(query.select(...loadPrimaryKeys), params.set));
+			}
 		}
 	});
 };
@@ -1118,11 +1124,13 @@ var HasOneVirtualColumn = class extends VirtualColumn {
 			const nullifyOrDeleteQuery = params.update ? _queryUpdate(ids.existingRelQuery, params.update) : params.upsert ? _queryUpsert(ids.existingRelQuery, makeNestedUpdateUpsertData(params.upsert, ids.setIds)) : params.delete ? _queryDelete(ids.existingRelQuery) : _queryUpdate(ids.existingRelQuery, this.setNulls);
 			nullifyOrDeleteQuery.q.returnType = "void";
 			_appendQuery(querySelf, nullifyOrDeleteQuery, ids.setAppendedAs);
-			if (params.create) _appendQuery(querySelf, _queryInsert(_clone(relQuery), {
-				...params.create,
-				...ids.setIds
-			}), noop);
-			else if (params.set) {
+			if (params.create) {
+				const createQuery = _queryInsert(_clone(relQuery), {
+					...params.create,
+					...ids.setIds
+				});
+				_appendQuery(querySelf, createQuery, noop);
+			} else if (params.set) {
 				const setQuery = _queryUpdate(_queryWhere(_clone(relQuery), [params.set]), ids.setIds);
 				setQuery.q.returnType = "void";
 				_appendQuery(querySelf, setQuery, noop);
@@ -1606,10 +1614,11 @@ const nestedUpdateUpsert = (querySelf, state, upsert) => {
 		parentIdsSql._sql = selectCteColumnsSql(parentAs, aliasedPrimaryKeys);
 		for (let i = 0; i < state.foreignKeys.length; i++) parentValues[i]._sql = selectCteColumnSql(parentAs, aliasedPrimaryKeys[i]);
 	});
-	const upsertQuery = _querySelect(_queryUpsert(_queryWhereExists(_queryWhere(_clone(state.relatedTableQuery), [upsert.findBy]), state.joinTableQuery, [(q) => {
+	const existingRelQuery = _queryWhereExists(_queryWhere(_clone(state.relatedTableQuery), [upsert.findBy]), state.joinTableQuery, [(q) => {
 		for (let i = 0; i < state.throughPrimaryKeys.length; i++) _queryJoinOn(q, [state.throughForeignKeysFull[i], state.throughPrimaryKeysFull[i]]);
 		return _queryWhereIn(q, true, state.foreignKeysFull, parentIdsSql);
-	}]), {
+	}]);
+	const upsertQuery = _querySelect(_queryUpsert(existingRelQuery, {
 		update: upsert.update,
 		create: upsert.create || {}
 	}), state.throughPrimaryKeys);
@@ -1912,7 +1921,8 @@ const nestedUpdate = (state) => {
 		}
 		if (params.disconnect) await _queryDelete(queryJoinTable(state, data, params.disconnect));
 		if (params.delete) {
-			const idsRows = await _queryDelete(_queryRows(_querySelect(queryJoinTable(state, data, params.delete), state.throughForeignKeys)));
+			const j = queryJoinTable(state, data, params.delete);
+			const idsRows = await _queryDelete(_queryRows(_querySelect(j, state.throughForeignKeys)));
 			await _queryDelete(state.relatedTableQuery.where({ IN: {
 				columns: state.throughPrimaryKeys,
 				values: idsRows
@@ -1921,7 +1931,10 @@ const nestedUpdate = (state) => {
 		if (params.set) {
 			const j = queryJoinTable(state, data);
 			await _queryDelete(j);
-			if (Array.isArray(params.set) ? params.set.length : objectHasValues(params.set)) await insertToJoinTable(state, j, data, await _queryRows(_querySelect(state.relatedTableQuery.where(conditionsToWhereArg(params.set)), state.throughPrimaryKeys)));
+			if (Array.isArray(params.set) ? params.set.length : objectHasValues(params.set)) {
+				const idsRows = await _queryRows(_querySelect(state.relatedTableQuery.where(conditionsToWhereArg(params.set)), state.throughPrimaryKeys));
+				await insertToJoinTable(state, j, data, idsRows);
+			}
 		}
 	});
 };