orchid-orm 1.74.0 → 1.76.0

package/dist/index.mjs

@@ -67,6 +67,8 @@ function createBaseTable({ schemaConfig = defaultSchemaConfig, columnTypes: colu
 			let instance = instances.get(this);
 			if (!instance) {
 				instance = new this();
+				const name = instance.table || instance.name;
+				if (instance.nameInDb === void 0 && name) instance.nameInDb = instance.snakeCase ? toSnakeCase(name) : name;
 				instances.set(this, instance);
 			}
 			return instance;
@@ -214,7 +216,7 @@ function joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)
 	return q;
 }
 const addAutoForeignKey = (tableConfig, from, to, primaryKeys, foreignKeys, options, originalForeignKeys) => {
-	const toTable = to.table;
+	const toTable = to.q.nameInDb || to.table;
 	let fkeyOptions = options.foreignKey !== void 0 ? options.foreignKey : tableConfig.autoForeignKeys;
 	if (!fkeyOptions) return;
 	if (fkeyOptions === true) fkeyOptions = tableConfig.autoForeignKeys || emptyObject;
@@ -228,7 +230,10 @@ const addAutoForeignKey = (tableConfig, from, to, primaryKeys, foreignKeys, opti
 				if (typeof fkey.fnOrTable === "string") {
 					fkeyTable = fkey.fnOrTable;
 					fkeyColumn = getColumnKeyFromDbName(to, fkeyColumn);
-				} else fkeyTable = fkey.fnOrTable().instance().table;
+				} else {
+					const instance = fkey.fnOrTable().instance();
+					fkeyTable = instance.nameInDb || instance.table;
+				}
 				if (toTable === fkeyTable && pkey === fkeyColumn) return;
 			}
 		}
@@ -239,7 +244,13 @@ const addAutoForeignKey = (tableConfig, from, to, primaryKeys, foreignKeys, opti
 		const sortedFkeys = [...foreignKeys].sort();
 		for (const { references: refs } of constraints) {
 			if (!refs) continue;
-			if (refs.columns.length === sortedFkeys.length && refs.columns.every((column, i) => column === sortedFkeys[i]) && refs.foreignColumns.length === sortedPkeys.length && (typeof refs.fnOrTable === "string" ? refs.fnOrTable === toTable && refs.foreignColumns.every((column, i) => getColumnKeyFromDbName(to, column) === sortedPkeys[i]) : refs.fnOrTable().instance().table === toTable && refs.foreignColumns.every((column, i) => column === sortedPkeys[i]))) return;
+			let sameForeignTable = false;
+			if (typeof refs.fnOrTable === "string") sameForeignTable = refs.fnOrTable === toTable && refs.foreignColumns.every((column, i) => getColumnKeyFromDbName(to, column) === sortedPkeys[i]);
+			else {
+				const instance = refs.fnOrTable().instance();
+				sameForeignTable = (instance.nameInDb || instance.table) === toTable && refs.foreignColumns.every((column, i) => column === sortedPkeys[i]);
+			}
+			if (refs.columns.length === sortedFkeys.length && refs.columns.every((column, i) => column === sortedFkeys[i]) && refs.foreignColumns.length === sortedPkeys.length && sameForeignTable) return;
 		}
 	}
 	(from.internal.tableData.constraints ??= []).push({
@@ -410,9 +421,10 @@ var BelongsToVirtualColumn = class extends VirtualColumn {
 		this.nestedUpdate(queryForUpdate, set, data);
 	}
 };
-const getBelongsToRequired = (tableConfig, relation) => {
+const getBelongsToRequired = (tableConfig, relatedTableConfig, relation) => {
 	const { required } = relation.options;
 	if (typeof required === "boolean") return required;
+	if (relatedTableConfig.softDelete) return false;
 	return relation.options.columns.every((key) => {
 		return !tableConfig.columns.shape[key].data.isNullable;
 	});
@@ -1359,6 +1371,7 @@ const applyRelations = (qb, tables, result, schema) => {
 			const data = {
 				relationName,
 				relation,
+				otherTable: otherTable[1],
 				dbTable,
 				otherDbTable
 			};
@@ -1402,7 +1415,7 @@ const delayRelation = (delayedRelations, table, relationName, data) => {
 	if (tableRelations[relationName]) tableRelations[relationName].push(data);
 	else tableRelations[relationName] = [data];
 };
-const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTable }, delayedRelations, schema) => {
+const applyRelation = (table, qb, { relationName, relation, otherTable, dbTable, otherDbTable }, delayedRelations, schema) => {
 	const baseQuery = Object.create(otherDbTable);
 	baseQuery.baseQuery = baseQuery;
 	const query = baseQuery.as(relationName);
@@ -1415,21 +1428,12 @@ const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTabl
 	else if (type === "hasAndBelongsToMany") data = makeHasAndBelongsToManyMethod(table, dbTable, qb, relation, relationName, query, schema);
 	else throw new Error(`Unknown relation type ${type}`);
 	if (data.returns === "one") {
-		if (type === "belongsTo" ? getBelongsToRequired(table, relation) : relation.options.required) _queryTake(query);
+		if (type === "belongsTo" ? getBelongsToRequired(table, otherTable, relation) : relation.options.required) _queryTake(query);
 		else _queryTakeOptional(query);
 		query.q.returnsOne = true;
 	}
 	if (data.virtualColumn) dbTable.shape[relationName] = dbTable.q.selectShape[relationName] = data.virtualColumn;
 	baseQuery.joinQuery = data.joinQuery;
-	const { join: originalJoin } = baseQuery;
-	baseQuery.join = function(...args) {
-		if (args.length) return originalJoin.apply(this, args);
-		else {
-			const q = this.clone();
-			q.q.innerJoinLateral = true;
-			return q;
-		}
-	};
 	dbTable.relations[relationName] = {
 		table: otherDbTable,
 		query,
@@ -1486,6 +1490,7 @@ const assignTablesToOrm = (isTable, tables, result, adapter, qb, asyncStorage, c
 			scopes: table.scopes,
 			softDelete: table.softDelete,
 			snakeCase: table.snakeCase,
+			nameInDb: table.nameInDb,
 			comment: table.comment,
 			readOnly: isTable ? table.readOnly ? true : void 0 : table.materialized || table.readOnly !== false ? true : void 0,
 			materialized: !isTable && table.materialized ? true : void 0,
@@ -1615,12 +1620,12 @@ const privateOrchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPr
 		viewInstances = assignTablesToOrm(false, views, result.$views, adapter, qb, asyncStorage, commonOptions, schema);
 		const tableDbNames = Object.values(tableInstances).map((table) => {
 			const s = typeof table.schema === "function" ? table.schema() : table.schema;
-			return `${s ? s + "." : ""}${table.table}`;
+			return `${s ? s + "." : ""}${table.nameInDb}`;
 		});
 		for (const key in views) {
 			const view = viewInstances[key];
 			const s = typeof view.schema === "function" ? view.schema() : view.schema;
-			const name = `${s ? s + "." : ""}${view.name}`;
+			const name = `${s ? s + "." : ""}${view.nameInDb}`;
 			if (tableDbNames.includes(name)) throw new Error(`Cannot configure both a table and a view for database relation ${name}`);
 		}
 	}