orchid-orm 1.74.0 → 1.76.0

package/dist/migrations/index.js

@@ -1299,10 +1299,12 @@ const collectCodeFkeys = (config, { codeTable, changeTableAst: { shape } }, curr
 };
 const fnOrTableToString = (fnOrTable) => {
 	if (typeof fnOrTable !== "string") {
-		const { schema, table } = new (fnOrTable())();
+		const { schema, table, nameInDb } = new (fnOrTable())();
+		const name = nameInDb || table;
+		if (!name) throw new Error("Referenced table is missing table property");
 		fnOrTable = (0, rake_db.concatSchemaAndName)({
 			schema,
-			name: table
+			name
 		});
 	}
 	return fnOrTable;
@@ -3354,15 +3356,16 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
 		const table = db[key];
 		if (!table.table) throw new Error(`Table ${key} is missing table property`);
 		const schema = (0, pqb_internal.getQuerySchema)(table);
+		const tableName = getQueryNameInDb(table);
 		const name = (0, rake_db.concatSchemaAndName)({
 			schema,
-			name: table.table
+			name: tableName
 		});
 		if (tableNames.has(name)) throw new Error(`Table ${name} is defined more than once`);
 		tableNames.add(name);
 		if (schema) codeItems.schemas.add(schema);
 		codeItems.tables.push({
-			table: table.table,
+			table: tableName,
 			shape: table.shape,
 			internal: {
 				...table.internal,
@@ -3380,9 +3383,10 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
 	if (views) for (const key in views) {
 		const view = views[key];
 		const schema = (0, pqb_internal.getQuerySchema)(view);
+		const viewName = getQueryNameInDb(view);
 		if (schema) codeItems.schemas.add(schema);
 		codeItems.views.push({
-			name: view.table,
+			name: viewName,
 			shape: view.shape,
 			internal: view.internal,
 			q: { schema },
@@ -3416,6 +3420,9 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
 	if (internal.grants) for (const grant of internal.grants) addGrantSchemas(codeItems.schemas, currentSchema, grant);
 	return codeItems;
 };
+const getQueryNameInDb = (query) => {
+	return query.q.nameInDb || query.table;
+};
 const processCodeItemShape = (shape, currentSchema, codeItems, domains) => {
 	for (const key in shape) {
 		const column = shape[key];