orchid-orm 1.78.1 → 1.78.3

package/dist/index.mjs

@@ -343,11 +343,11 @@ const createTableFactory = (options) => {
 			id,
 			table,
 			nameInDb,
-			schema: tableOptions?.schema,
-			noPrimaryKey: tableOptions?.noPrimaryKey,
+			schema: tableOptions?.schema ?? options?.schema,
+			noPrimaryKey: tableOptions?.noPrimaryKey ?? options?.noPrimaryKey,
 			snakeCase,
 			comment: tableOptions?.comment,
-			generatorIgnore: tableOptions?.generatorIgnore,
+			generatorIgnore: tableOptions?.generatorIgnore ?? options?.generatorIgnore,
 			readOnly: tableOptions?.readOnly,
 			columns: {
 				shape,
@@ -460,6 +460,10 @@ const createTableFactory = (options) => {
 	defineTable.nowSQL = options?.nowSQL;
 	defineTable.snakeCase = options?.snakeCase;
 	defineTable.language = options?.language;
+	defineTable.extend = (extendedOptions) => createTableFactory({
+		...options,
+		...extendedOptions
+	}).defineTable;
 	const defineView = ((name, optionsOrT, maybeT) => {
 		const viewOptions = typeof optionsOrT === "function" ? void 0 : optionsOrT;
 		const materialized = viewOptions?.materialized;
@@ -587,6 +591,12 @@ const makeNestedUpdateUpsertData = (upsert, setIds) => ({
 		...setIds
 	}
 });
+const queryUnionAll = async (queries, indexAs) => {
+	const records = await queries[0].unionAll(...queries.slice(1));
+	const result = Array(queries.length);
+	for (const record of records) result[record[indexAs]] = record;
+	return result;
+};
 const makeRawSqlPlaceholders = (length) => {
 	return Array.from({ length }, () => new RawSql(""));
 };
@@ -1460,22 +1470,23 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
 		let connected;
 		if (items.length) {
 			const queries = [];
+			const indexAs = getFreeAlias(t.shape, "i");
 			for (let i = 0, len = items.length; i < len; i++) {
 				const [selfData, { connectOrCreate }] = items[i];
 				for (const item of connectOrCreate) {
 					const obj = {};
 					for (let i = 0; i < len; i++) obj[foreignKeys[i]] = selfData[primaryKeys[i]];
-					queries.push(_queryUpdate(t.where(item.where), obj));
+					queries.push(_querySelect(_queryUpdate(t.where(item.where), obj), [{ [indexAs]: new RawSql(String(queries.length)) }]));
 				}
 			}
-			connected = await Promise.all(queries);
+			connected = await queryUnionAll(queries, indexAs);
 		} else connected = [];
 		let connectedI = 0;
 		items.length = 0;
 		for (const item of data) if (item[1].connectOrCreate) {
 			const length = item[1].connectOrCreate.length;
 			connectedI += length;
-			for (let i = length; i > 0; i--) if (connected[connectedI - i] === 0) {
+			for (let i = length; i > 0; i--) if (!connected[connectedI - i]) {
 				items.push(item);
 				break;
 			}
@@ -1491,7 +1502,7 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
 					...obj
 				});
 				if (connectOrCreate) {
-					for (const item of connectOrCreate) if (connected[connectedI++] === 0) records.push({
+					for (const item of connectOrCreate) if (!connected[connectedI++]) records.push({
 						...item.create,
 						...obj
 					});
@@ -1499,23 +1510,20 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
 			}
 			await _queryCreateMany(t, records);
 		}
-		items.length = 0;
-		for (const item of data) if (item[1].upsert) items.push(item);
-		if (items.length) {
-			const queries = [];
-			for (const [selfData, { upsert }] of items) {
-				const foreignKeyValues = {};
-				for (let i = 0; i < len; i++) foreignKeyValues[foreignKeys[i]] = selfData[primaryKeys[i]];
-				for (const item of toArray(upsert)) queries.push(_queryUpsert(t.clone().where(item.findBy), {
-					update: {
-						...item.update,
-						...foreignKeyValues
-					},
-					create: makeNestedUpdateUpsertData(item, foreignKeyValues).create
-				}));
-			}
-			await Promise.all(queries);
+		const queries = [];
+		for (const [selfData, { upsert }] of data) {
+			if (!upsert) continue;
+			const obj = {};
+			for (let i = 0; i < len; i++) obj[foreignKeys[i]] = selfData[primaryKeys[i]];
+			for (const item of toArray(upsert)) queries.push(_queryUpsert(t.clone().where(item.findBy), {
+				update: {
+					...item.update,
+					...obj
+				},
+				create: makeNestedUpdateUpsertData(item, obj).create
+			}));
 		}
+		if (queries.length) await queries[0].unionAll(...queries.slice(1));
 	});
 };
 const hasManyCreate = (key, state, nestedInsertFn, self, ctx, items, rowIndexes, count) => {
@@ -1960,16 +1968,18 @@ const nestedInsert = ({ relatedTableQuery, joinTableQuery, primaryKeys, foreignK
 		let connected;
 		if (items.length) {
 			const queries = [];
-			for (const [, { connect }] of items) for (const item of connect) queries.push(_queryFindBy(t.select(...throughPrimaryKeys), item));
-			connected = await Promise.all(queries);
+			const indexAs = getFreeAlias(t.shape, "i");
+			for (const [, { connect }] of items) for (const item of connect) queries.push(_queryFindBy(t.select(...throughPrimaryKeys, { [indexAs]: new RawSql(String(queries.length)) }), item));
+			connected = await queryUnionAll(queries, indexAs);
 		} else connected = [];
 		items.length = 0;
 		for (const item of data) if (item[1].connectOrCreate) items.push(item);
 		let connectOrCreated;
 		if (items.length) {
 			const queries = [];
-			for (const [, { connectOrCreate }] of items) for (const item of connectOrCreate) queries.push(_queryFindByOptional(t.select(...throughPrimaryKeys), item.where));
-			connectOrCreated = await Promise.all(queries);
+			const indexAs = getFreeAlias(t.shape, "i");
+			for (const [, { connectOrCreate }] of items) for (const item of connectOrCreate) queries.push(_queryFindByOptional(t.select(...throughPrimaryKeys, { [indexAs]: new RawSql(String(queries.length)) }), item.where));
+			connectOrCreated = await queryUnionAll(queries, indexAs);
 		} else connectOrCreated = [];
 		let connectOrCreateI = 0;
 		items.length = 0;
@@ -2755,6 +2765,7 @@ const privateOrchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPr
 		$withRecursive: qb.withRecursive.bind(qb),
 		$withSql: qb.withSql.bind(qb),
 		$from: qb.from.bind(qb),
+		$select: ((selection) => qb.select(selection).take()),
 		$close: adapter.close.bind(adapter),
 		$withOptions: qb.withOptions.bind(qb)
 	};