orchid-orm 1.61.2 → 1.62.0

package/dist/migrations/index.d.ts

@@ -1,13 +1,13 @@
-import { ColumnSchemaConfig, DefaultColumnTypes, DefaultSchemaConfig } from 'pqb';
+import { ColumnSchemaConfig } from 'pqb';
 export * from 'rake-db';
 
 declare module 'rake-db' {
-    interface RakeDbConfig<SchemaConfig extends ColumnSchemaConfig, CT = DefaultColumnTypes<DefaultSchemaConfig>> {
+    interface RakeDbConfig {
         dbPath?: string;
         dbExportedAs?: string;
         generateTableTo?(tableName: string): string;
     }
-    interface InputRakeDbConfigBase<SchemaConfig extends ColumnSchemaConfig, CT> {
+    interface RakeDbCliConfigInputBase<SchemaConfig extends ColumnSchemaConfig, CT> {
         dbPath?: string;
         dbExportedAs?: string;
         generateTableTo?(tableName: string): string;

package/dist/migrations/index.js

@@ -125,7 +125,8 @@ const checkForColumnAddOrDrop = (shape, key) => {
 const processSchemas = async (ast, dbStructure, {
   codeItems: { schemas },
   verifying,
-  internal: { generatorIgnore }
+  internal: { generatorIgnore },
+  currentSchema
 }) => {
   const createSchemas = [];
   const dropSchemas = [];
@@ -135,7 +136,7 @@ const processSchemas = async (ast, dbStructure, {
     }
   }
   for (const schema of dbStructure.schemas) {
-    if (!schemas.has(schema) && schema !== "public" && !generatorIgnore?.schemas?.includes(schema)) {
+    if (!schemas.has(schema) && schema !== "public" && schema !== currentSchema && !generatorIgnore?.schemas?.includes(schema)) {
       dropSchemas.push(schema);
     }
   }
@@ -196,12 +197,12 @@ const renameSchemaInStructures = (items, from, to) => {
   }
 };
 
-const processExtensions = (ast, dbStructure, {
+const processExtensions = (config, ast, dbStructure, {
   currentSchema,
   internal: { extensions, generatorIgnore }
 }) => {
   const codeExtensions = extensions?.map((ext) => {
-    const [schema, name] = rakeDb.getSchemaAndTableFromName(ext.name);
+    const [schema, name] = rakeDb.getSchemaAndTableFromName(config, ext.name);
     return { schema, name, version: ext.version };
   });
   for (const dbExt of dbStructure.extensions) {
@@ -399,6 +400,7 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
       dbColumnStructure
     );
     const action = await compareColumns(
+      config,
       adapter,
       domainsMap,
       ast,
@@ -436,13 +438,13 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
     }
   }
 };
-const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSql, changeTableData, typeCastsCache, verifying, key, dbName, dbColumn, codeColumn) => {
+const compareColumns = async (config, adapter, domainsMap, ast, currentSchema, compareSql, changeTableData, typeCastsCache, verifying, key, dbName, dbColumn, codeColumn) => {
   if (dbColumn instanceof pqb.ArrayColumn && codeColumn instanceof pqb.ArrayColumn) {
     dbColumn = dbColumn.data.item;
     codeColumn = codeColumn.data.item;
   }
-  const dbType = getColumnDbType(dbColumn, currentSchema);
-  const codeType = getColumnDbType(codeColumn, currentSchema);
+  const dbType = getColumnDbType(config, dbColumn, currentSchema);
+  const codeType = getColumnDbType(config, codeColumn, currentSchema);
   if (dbType !== codeType) {
     const typeCasts = await getTypeCasts(adapter, typeCastsCache);
     const dbBaseType = pqb.getColumnBaseType(dbColumn, domainsMap, dbType);
@@ -599,9 +601,10 @@ const changeColumn = (changeTableData, key, dbName, dbColumn, codeColumn) => {
     to: { column: simpleCodeColumn }
   };
 };
-const getColumnDbType = (column, currentSchema) => {
+const getColumnDbType = (config, column, currentSchema) => {
   if (column instanceof pqb.EnumColumn) {
     const [schema = currentSchema, name] = rakeDb.getSchemaAndTableFromName(
+      config,
       column.enumName
     );
     return `${schema}.${name}`;
@@ -629,7 +632,7 @@ const renameColumn = (columns, from, to) => {
   }
 };
 
-const processDomains = async (ast, adapter, domainsMap, dbStructure, {
+const processDomains = async (config, ast, adapter, domainsMap, dbStructure, {
   codeItems: { domains },
   structureToAstCtx,
   currentSchema,
@@ -639,7 +642,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
   if (domains) {
     for (const { schemaName, name, column } of domains) {
       codeDomains.push(
-        makeComparableDomain(currentSchema, schemaName, name, column)
+        makeComparableDomain(config, currentSchema, schemaName, name, column)
       );
     }
   }
@@ -675,6 +678,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
       }));
     }
     const dbDomain = makeComparableDomain(
+      config,
       currentSchema,
       domain.schemaName,
       domain.name,
@@ -691,6 +695,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
       pushCompareDefault(compare, domain, found);
       pushCompareChecks(compare, domain, found);
       const source = `(VALUES (NULL::${getColumnDbType(
+        config,
         dbColumn,
         currentSchema
       )})) t(value)`;
@@ -744,7 +749,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
     }
   }
 };
-const makeComparableDomain = (currentSchema, schemaName, name, column) => {
+const makeComparableDomain = (config, currentSchema, schemaName, name, column) => {
   let arrayDims = 0;
   const isNullable = column.data.isNullable ?? false;
   let inner = column;
@@ -752,8 +757,11 @@ const makeComparableDomain = (currentSchema, schemaName, name, column) => {
     inner = inner.data.item;
     arrayDims++;
   }
-  const fullType = getColumnDbType(inner, currentSchema);
-  const [typeSchema = "pg_catalog", type] = rakeDb.getSchemaAndTableFromName(fullType);
+  const fullType = getColumnDbType(config, inner, currentSchema);
+  const [typeSchema = "pg_catalog", type] = rakeDb.getSchemaAndTableFromName(
+    config,
+    fullType
+  );
   return {
     schemaName,
     name,
@@ -1384,6 +1392,7 @@ const findMatchingItemWithoutSql = (dbItem, codeComparableItems, codeItems, skip
         const {
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
           columnKeys,
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
           includeKeys,
           ...codeItemWithoutKeys
         } = codeItem;
@@ -1658,7 +1667,7 @@ const fnOrTableToString = (fnOrTable) => {
 };
 const parseForeignKey = (config, codeConstraint, references, currentSchema) => {
   const { fnOrTable, columns, foreignColumns, options } = references;
-  const [schema, table] = rakeDb.getSchemaAndTableFromName(fnOrTable);
+  const [schema, table] = rakeDb.getSchemaAndTableFromName(config, fnOrTable);
   return {
     references: {
       foreignSchema: schema ?? currentSchema,
@@ -1905,7 +1914,10 @@ const collectChangeAndDropTables = (config, tables, dbStructure, currentSchema,
   const dropTables = [];
   const tableShapes = {};
   const ignoreTables = generatorIgnore?.tables?.map((name) => {
-    const [schema = currentSchema, table] = rakeDb.getSchemaAndTableFromName(name);
+    const [schema = currentSchema, table] = rakeDb.getSchemaAndTableFromName(
+      config,
+      name
+    );
     return { schema, table };
   });
   const { schema: migrationsSchema = "public", table: migrationsTable } = rakeDb.getMigrationsSchemaAndTable(config);
@@ -2163,9 +2175,10 @@ const composeMigration = async (adapter, config, ast, dbStructure, params) => {
   const { structureToAstCtx, currentSchema } = params;
   const domainsMap = rakeDb.makeDomainsMap(structureToAstCtx, dbStructure);
   await processSchemas(ast, dbStructure, params);
-  processExtensions(ast, dbStructure, params);
+  processExtensions(config, ast, dbStructure, params);
   const pendingDbTypes = new PendingDbTypes();
   await processDomains(
+    config,
     ast,
     adapter,
     domainsMap,
@@ -2308,7 +2321,7 @@ const report = (ast, config, currentSchema) => {
               const column = change.item;
               const { primaryKey, indexes, excludes, foreignKeys, checks } = column.data;
               inner.push(
-                `${change.type === "add" ? green("+ add column") : red("- drop column")} ${key} ${column.data.alias ?? getColumnDbType(column, currentSchema)}${column.data.isNullable ? " nullable" : ""}${primaryKey ? " primary key" : ""}${foreignKeys ? ` references ${foreignKeys.map((fk) => {
+                `${change.type === "add" ? green("+ add column") : red("- drop column")} ${key} ${column.data.alias ?? getColumnDbType(config, column, currentSchema)}${column.data.isNullable ? " nullable" : ""}${primaryKey ? " primary key" : ""}${foreignKeys ? ` references ${foreignKeys.map((fk) => {
                   return `${fnOrTableToString(
                     fk.fnOrTable
                   )}(${fk.foreignColumns.join(", ")})`;
@@ -2320,14 +2333,18 @@ const report = (ast, config, currentSchema) => {
               const changes2 = [];
               inner.push(`${yellow("~ change column")} ${name}:`, changes2);
               changes2.push(`${yellow("from")}: `);
-              const fromCode = change.from.column.toCode(toCodeCtx, key);
-              for (const code2 of fromCode) {
-                pqb.addCode(changes2, code2);
+              const fromCode = change.from.column?.toCode(toCodeCtx, key);
+              if (fromCode) {
+                for (const code2 of fromCode) {
+                  pqb.addCode(changes2, code2);
+                }
               }
               changes2.push(`  ${yellow("to")}: `);
-              const toCode = change.to.column.toCode(toCodeCtx, key);
-              for (const code2 of toCode) {
-                pqb.addCode(changes2, code2);
+              const toCode = change.to.column?.toCode(toCodeCtx, key);
+              if (toCode) {
+                for (const code2 of toCode) {
+                  pqb.addCode(changes2, code2);
+                }
               }
             } else if (change.type === "rename") {
               inner.push(
@@ -2365,6 +2382,7 @@ const report = (ast, config, currentSchema) => {
           for (const { references } of a.drop.constraints) {
             if (!references) continue;
             const [schema, name] = rakeDb.getSchemaAndTableFromName(
+              config,
               references.fnOrTable
             );
             inner.push(
@@ -2555,10 +2573,11 @@ const generate = async (adapters, config, args, afterPull) => {
     afterPull
   );
   const [adapter] = adapters;
-  const currentSchema = config.schema ?? "public";
+  const currentSchema = (typeof config.schema === "function" ? config.schema() : config.schema) ?? "public";
   const db = await getDbFromConfig(config, dbPath);
   const { columnTypes, internal } = db.$qb;
   const codeItems = await getActualItems(
+    config,
     db,
     currentSchema,
     internal,
@@ -2630,7 +2649,7 @@ ${msg}`);
   }
   if (up) {
     for (const adapter2 of adapters) {
-      await rakeDb.migrateAndClose({ adapter: adapter2, config });
+      await rakeDb.migrateAndClose(adapter2, config);
     }
   } else if (!afterPull) {
     await closeAdapters(adapters);
@@ -2670,7 +2689,7 @@ const migrateAndPullStructures = async (adapters, config, afterPull) => {
     };
   }
   for (const adapter of adapters) {
-    await rakeDb.migrate({ adapter, config });
+    await rakeDb.migrate(adapter, config);
   }
   const dbStructures = await Promise.all(
     adapters.map((adapter) => rakeDb.introspectDbSchema(adapter))
@@ -2715,7 +2734,7 @@ const compareDbStructures = (a, b, i, path2) => {
     throw new Error(`${path2} in the db 0 does not match db ${i}`);
   }
 };
-const getActualItems = async (db, currentSchema, internal, columnTypes) => {
+const getActualItems = async (config, db, currentSchema, internal, columnTypes) => {
   const tableNames = /* @__PURE__ */ new Set();
   const habtmTables = /* @__PURE__ */ new Map();
   const codeItems = {
@@ -2758,6 +2777,7 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
         delete table.shape[key2];
       } else if (column instanceof pqb.DomainColumn) {
         const [schemaName = currentSchema, name2] = rakeDb.getSchemaAndTableFromName(
+          config,
           column.dataType
         );
         domains.set(column.dataType, {
@@ -2768,20 +2788,23 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
       } else {
         const en = column.dataType === "enum" ? column : column instanceof pqb.ArrayColumn && column.data.item.dataType === "enum" ? column.data.item : void 0;
         if (en) {
-          processEnumColumn(en, currentSchema, codeItems);
+          processEnumColumn(config, en, currentSchema, codeItems);
         }
       }
     }
   }
   if (internal.extensions) {
     for (const extension of internal.extensions) {
-      const [schema] = rakeDb.getSchemaAndTableFromName(extension.name);
+      const [schema] = rakeDb.getSchemaAndTableFromName(config, extension.name);
       if (schema) codeItems.schemas.add(schema);
     }
   }
   if (internal.domains) {
     for (const key in internal.domains) {
-      const [schemaName = currentSchema, name] = rakeDb.getSchemaAndTableFromName(key);
+      const [schemaName = currentSchema, name] = rakeDb.getSchemaAndTableFromName(
+        config,
+        key
+      );
       const column = internal.domains[key](columnTypes);
       domains.set(key, {
         schemaName,
@@ -2796,9 +2819,9 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
   }
   return codeItems;
 };
-const processEnumColumn = (column, currentSchema, codeItems) => {
+const processEnumColumn = (config, column, currentSchema, codeItems) => {
   const { enumName, options } = column;
-  const [schema, name] = rakeDb.getSchemaAndTableFromName(enumName);
+  const [schema, name] = rakeDb.getSchemaAndTableFromName(config, enumName);
   const enumSchema = schema ?? currentSchema;
   codeItems.enums.set(`${enumSchema}.${name}`, {
     schema: enumSchema,
@@ -3142,7 +3165,7 @@ const pull = async (adapters, config) => {
   const baseTablePath = config.baseTable.getFilePath();
   const baseTableExportedAs = config.baseTable.exportAs;
   const [adapter] = adapters;
-  const currentSchema = config.schema || "public";
+  const currentSchema = (typeof config.schema === "function" ? config.schema() : config.schema) ?? "public";
   const ctx = rakeDb.makeStructureToAstCtx(config, currentSchema);
   const asts = await rakeDb.structureToAst(ctx, adapter, config);
   const { tableInfos, fkeys } = getTableInfosAndFKeys(asts, config);