orchid-orm 1.72.8 → 1.72.9

package/dist/migrations/index.mjs

@@ -1,10 +1,18 @@
 import { astToMigration, concatSchemaAndName, createMigrationInterface, dbColumnToAst, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeStructureToAstCtx, migrate, migrateAndClose, promptSelect, rakeDbCommands, saveMigratedVersion, structureToAst, tableToAst, writeMigrationFile } from "rake-db";
-import { ArrayColumn, DomainColumn, EnumColumn, RawSql, UnknownColumn, VirtualColumn, addCode, codeToString, colors, columnsShapeToCode, deepCompare, emptyArray, emptyObject, exhaustive, getColumnBaseType, getDriverErrorCode, getFreeSetAlias, getImportPath, getQuerySchema, getSupportedDefaultPrivileges, pathToLog, pluralize, pushTableDataCode, quoteObjectKey, raw, singleQuote, toArray, toCamelCase, toPascalCase, toSnakeCase } from "pqb/internal";
+import { ArrayColumn, DomainColumn, EnumColumn, RawSql, UnknownColumn, VirtualColumn, addCode, codeToString, colors, columnsShapeToCode, deepCompare, emptyArray, emptyObject, exhaustive, getColumnBaseType, getDriverErrorCode, getFreeSetAlias, getImportPath, getQuerySchema, getSupportedDefaultPrivileges, pathToLog, pluralize, pushTableDataCode, queryToSql, quoteObjectKey, raw, rawSqlToSql, singleQuote, sqlToRawSql, toArray, toCamelCase, toPascalCase, toSnakeCase } from "pqb/internal";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import fs from "node:fs/promises";
 import typescript from "typescript";
 export * from "rake-db";
+const viewDataToSql = (viewData, viewName) => {
+	return sqlToRawSql(viewDataToQuerySql(viewData, viewName));
+};
+const viewDataToQuerySql = (viewData, viewName) => {
+	if (viewData.query) return queryToSql(viewData.query);
+	if (viewData.sql !== void 0) return rawSqlToSql(viewData.sql);
+	throw new Error(`Either sql or query is required for view ${viewName}`);
+};
 const compareSqlExpressions = async (expressions, adapter) => {
 	if (!expressions.length) return;
 	let id = 1;
@@ -1725,6 +1733,7 @@ const processTables = async (ast, domainsMap, adapter, dbStructure, config, { st
 };
 const collectCreateTables = (tables, dbStructure, currentSchema) => {
 	return tables.reduce((acc, codeTable) => {
+		if (codeTable.internal.generatorIgnored) return acc;
 		const tableSchema = codeTable.q.schema ?? currentSchema;
 		if (!dbStructure.tables.some((t) => t.name === codeTable.table && t.schemaName === tableSchema)) acc.push(codeTable);
 		return acc;
@@ -1744,7 +1753,7 @@ const collectChangeAndDropTables = (adapter, config, tables, dbStructure, curren
 	});
 	const { schema: migrationsSchema = "public", table: migrationsTable } = getMigrationsSchemaAndTable(adapter, config);
 	for (const dbTable of dbStructure.tables) {
-		if (dbTable.name === migrationsTable && dbTable.schemaName === migrationsSchema || generatorIgnore?.schemas?.includes(dbTable.schemaName) || ignoreTables?.some(({ schema, table }) => table === dbTable.name && schema === dbTable.schemaName)) continue;
+		if (dbTable.name === migrationsTable && dbTable.schemaName === migrationsSchema || generatorIgnore?.schemas?.includes(dbTable.schemaName) || ignoreTables?.some(({ schema, table }) => table === dbTable.name && schema === dbTable.schemaName) || isDefinitionIgnoredDbTable(tables, dbTable, currentSchema)) continue;
 		const codeTable = tables.find((t) => t.table === dbTable.name && (t.q.schema ?? currentSchema) === dbTable.schemaName);
 		if (codeTable) {
 			addChangeTable(dbStructure, changeTables, tableShapes, currentSchema, dbTable, codeTable);
@@ -1769,6 +1778,15 @@ const collectChangeAndDropTables = (adapter, config, tables, dbStructure, curren
 		tableShapes
 	};
 };
+const isDefinitionIgnoredDbTable = (tables, dbTable, currentSchema) => {
+	let hasIgnoredSameName = false;
+	for (const codeTable of tables) {
+		if (codeTable.table !== dbTable.name) continue;
+		if ((codeTable.q.schema ?? currentSchema) === dbTable.schemaName) return !!codeTable.internal.generatorIgnored;
+		if (codeTable.internal.generatorIgnored) hasIgnoredSameName = true;
+	}
+	return hasIgnoredSameName;
+};
 const applyChangeTableSchemas = (changeTableSchemas, currentSchema, ast) => {
 	for (const { codeTable, dbTable } of changeTableSchemas) {
 		const fromSchema = dbTable.schemaName;
@@ -2553,7 +2571,7 @@ const pushRecreateView$1 = (ast, from, to) => {
 };
 const codeViewToAst$1 = (view, currentSchema, action) => {
 	const schema = view.q.schema ?? currentSchema;
-	const sql = typeof view.viewData.sql === "string" ? raw({ raw: view.viewData.sql }) : view.viewData.sql ?? raw({ raw: "" });
+	const sql = viewDataToSql(view.viewData, view.name);
 	return {
 		type: "view",
 		action,
@@ -2691,7 +2709,7 @@ const pushRecreateView = (ast, from, to) => {
 };
 const codeViewToAst = (view, currentSchema, action) => {
 	const schema = view.q.schema ?? currentSchema;
-	const sql = typeof view.viewData.sql === "string" ? raw({ raw: view.viewData.sql }) : view.viewData.sql ?? raw({ raw: "" });
+	const sql = viewDataToSql(view.viewData, view.name);
 	return {
 		type: "materializedView",
 		action,
@@ -3136,6 +3154,7 @@ const generate = async (adapters, config, args, afterPull) => {
 	const adapterSchema = adapter.getSchema();
 	const currentSchema = (typeof adapterSchema === "function" ? adapterSchema() : adapterSchema) ?? "public";
 	const codeItems = await getActualItems(db, currentSchema, internal, columnTypes);
+	const generatorIgnore = getGeneratorIgnoreWithDefinitionIgnoredTableLikes(internal.generatorIgnore, codeItems.tables, codeItems.views);
 	const effectiveGrants = getEffectiveGrants(internal.grants, codeItems);
 	const generateMigrationParams = {
 		structureToAstCtx: makeStructureToAstCtx(config, currentSchema),
@@ -3143,6 +3162,7 @@ const generate = async (adapters, config, args, afterPull) => {
 		currentSchema,
 		internal: {
 			...internal,
+			generatorIgnore,
 			grants: effectiveGrants
 		}
 	};
@@ -3265,6 +3285,26 @@ const getEffectiveGrants = (grants, codeItems) => {
 	}
 	return effectiveGrants.length ? effectiveGrants : void 0;
 };
+const getGeneratorIgnoreWithDefinitionIgnoredTableLikes = (generatorIgnore, tables, views) => {
+	const ignoredTables = new Set(generatorIgnore?.tables);
+	const ignoredViews = new Set(generatorIgnore?.views);
+	let hasDefinitionIgnoredTableLikes = false;
+	for (const table of tables) {
+		if (!table.internal.generatorIgnored) continue;
+		hasDefinitionIgnoredTableLikes = true;
+		ignoredTables.add(table.q.schema ? `${table.q.schema}.${table.table}` : table.table);
+	}
+	for (const view of views) {
+		if (!view.internal.generatorIgnored) continue;
+		hasDefinitionIgnoredTableLikes = true;
+		ignoredViews.add(view.q.schema ? `${view.q.schema}.${view.name}` : view.name);
+	}
+	return hasDefinitionIgnoredTableLikes ? {
+		...generatorIgnore,
+		tables: [...ignoredTables],
+		views: [...ignoredViews]
+	} : generatorIgnore;
+};
 const compareDbStructures = (a, b, i, path) => {
 	let err;
 	if (typeof a !== typeof b) err = true;
@@ -3307,7 +3347,7 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
 			},
 			q: { schema: getQuerySchema(table) }
 		});
-		for (const key in table.relations) {
+		if (!table.internal.generatorIgnored) for (const key in table.relations) {
 			const column = table.shape[key];
 			if (column && "joinTable" in column) processHasAndBelongsToManyColumn(column, habtmTables, codeItems);
 		}