orchid-orm 1.47.1 → 1.49.0

package/dist/migrations.js

@@ -120,7 +120,11 @@ const checkForColumnAddOrDrop = (shape, key) => {
   return false;
 };
 
-const processSchemas = async (ast, schemas, dbStructure, verifying) => {
+const processSchemas = async (ast, dbStructure, {
+  codeItems: { schemas },
+  verifying,
+  internal: { generatorIgnore }
+}) => {
   const createSchemas = [];
   const dropSchemas = [];
   for (const schema of schemas) {
@@ -129,7 +133,7 @@ const processSchemas = async (ast, schemas, dbStructure, verifying) => {
     }
   }
   for (const schema of dbStructure.schemas) {
-    if (!schemas.has(schema) && schema !== "public") {
+    if (!schemas.has(schema) && schema !== "public" && !generatorIgnore?.schemas?.includes(schema)) {
       dropSchemas.push(schema);
     }
   }
@@ -190,12 +194,18 @@ const renameSchemaInStructures = (items, from, to) => {
   }
 };
 
-const processExtensions = (ast, dbStructure, currentSchema, extensions) => {
+const processExtensions = (ast, dbStructure, {
+  currentSchema,
+  internal: { extensions, generatorIgnore }
+}) => {
   const codeExtensions = extensions?.map((ext) => {
     const [schema, name] = rakeDb.getSchemaAndTableFromName(ext.name);
     return { schema, name, version: ext.version };
   });
   for (const dbExt of dbStructure.extensions) {
+    if (generatorIgnore?.schemas?.includes(dbExt.schemaName) || generatorIgnore?.extensions?.includes(dbExt.name)) {
+      continue;
+    }
     if (codeExtensions) {
       let found = false;
       for (let i = 0; i < codeExtensions.length; i++) {
@@ -594,7 +604,12 @@ const renameColumn = (columns, from, to) => {
   }
 };
 
-const processDomains = async (ast, adapter, structureToAstCtx, domainsMap, dbStructure, currentSchema, domains) => {
+const processDomains = async (ast, adapter, domainsMap, dbStructure, {
+  codeItems: { domains },
+  structureToAstCtx,
+  currentSchema,
+  internal: { generatorIgnore }
+}) => {
   const codeDomains = [];
   if (domains) {
     for (const { schemaName, name, column } of domains) {
@@ -606,6 +621,9 @@ const processDomains = async (ast, adapter, structureToAstCtx, domainsMap, dbStr
   const tableExpressions = [];
   const holdCodeDomains = /* @__PURE__ */ new Set();
   for (const domain of dbStructure.domains) {
+    if (generatorIgnore?.schemas?.includes(domain.schemaName) || generatorIgnore?.domains?.includes(domain.name)) {
+      continue;
+    }
     const dbColumn = rakeDb.instantiateDbColumn(
       structureToAstCtx,
       dbStructure,
@@ -771,7 +789,12 @@ const createAst = (codeDomain) => ({
   baseType: codeDomain.column
 });
 
-const processEnums = async (ast, enums, dbStructure, currentSchema, verifying) => {
+const processEnums = async (ast, dbStructure, {
+  codeItems: { enums },
+  currentSchema,
+  verifying,
+  internal: { generatorIgnore }
+}) => {
   const createEnums = [];
   const dropEnums = [];
   for (const [, codeEnum] of enums) {
@@ -784,6 +807,9 @@ const processEnums = async (ast, enums, dbStructure, currentSchema, verifying) =
     }
   }
   for (const dbEnum of dbStructure.enums) {
+    if (generatorIgnore?.schemas?.includes(dbEnum.schemaName) || generatorIgnore?.enums?.includes(dbEnum.name)) {
+      continue;
+    }
     const codeEnum = enums.get(`${dbEnum.schemaName}.${dbEnum.name}`);
     if (codeEnum) {
       changeEnum(ast, dbEnum, codeEnum);
@@ -1785,7 +1811,13 @@ const dropCheck = ({ changeTableAst: { drop }, changingColumns }, dbCheck, name)
   }
 };
 
-const processTables = async (ast, structureToAstCtx, domainsMap, adapter, tables, dbStructure, currentSchema, config, generatorIgnore, verifying) => {
+const processTables = async (ast, domainsMap, adapter, dbStructure, config, {
+  structureToAstCtx,
+  codeItems: { tables },
+  currentSchema,
+  internal: { generatorIgnore },
+  verifying
+}) => {
   const createTables = collectCreateTables(
     tables,
     dbStructure,
@@ -1858,7 +1890,7 @@ const collectChangeAndDropTables = (config, tables, dbStructure, currentSchema,
     return { schema, table };
   });
   for (const dbTable of dbStructure.tables) {
-    if (dbTable.name === config.migrationsTable || ignoreTables?.some(
+    if (dbTable.name === config.migrationsTable || generatorIgnore?.schemas?.includes(dbTable.schemaName) || ignoreTables?.some(
       ({ schema, table }) => table === dbTable.name && schema === dbTable.schemaName
     ))
       continue;
@@ -2072,38 +2104,14 @@ const processTableChange = async (adapter, structureToAstCtx, dbStructure, domai
   }
 };
 
-const composeMigration = async (adapter, config, ast, dbStructure, {
-  structureToAstCtx,
-  codeItems: { schemas, enums, tables, domains },
-  currentSchema,
-  internal,
-  verifying
-}) => {
+const composeMigration = async (adapter, config, ast, dbStructure, params) => {
+  const { structureToAstCtx, currentSchema } = params;
   const domainsMap = rakeDb.makeDomainsMap(structureToAstCtx, dbStructure);
-  await processSchemas(ast, schemas, dbStructure, verifying);
-  processExtensions(ast, dbStructure, currentSchema, internal.extensions);
-  await processDomains(
-    ast,
-    adapter,
-    structureToAstCtx,
-    domainsMap,
-    dbStructure,
-    currentSchema,
-    domains
-  );
-  await processEnums(ast, enums, dbStructure, currentSchema, verifying);
-  await processTables(
-    ast,
-    structureToAstCtx,
-    domainsMap,
-    adapter,
-    tables,
-    dbStructure,
-    currentSchema,
-    config,
-    internal.generatorIgnore,
-    verifying
-  );
+  await processSchemas(ast, dbStructure, params);
+  processExtensions(ast, dbStructure, params);
+  await processDomains(ast, adapter, domainsMap, dbStructure, params);
+  await processEnums(ast, dbStructure, params);
+  await processTables(ast, domainsMap, adapter, dbStructure, config, params);
   return rakeDb.astToMigration(currentSchema, config, ast);
 };