orchid-orm 1.63.5 → 1.64.0

package/dist/migrations/index.js

@@ -197,12 +197,12 @@ const renameSchemaInStructures = (items, from, to) => {
   }
 };
 
-const processExtensions = (config, ast, dbStructure, {
+const processExtensions = (ast, dbStructure, {
   currentSchema,
   internal: { extensions, generatorIgnore }
 }) => {
   const codeExtensions = extensions?.map((ext) => {
-    const [schema, name] = rakeDb.getSchemaAndTableFromName(config, ext.name);
+    const [schema, name] = rakeDb.getSchemaAndTableFromName(currentSchema, ext.name);
     return { schema, name, version: ext.version };
   });
   for (const dbExt of dbStructure.extensions) {
@@ -400,7 +400,6 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
       dbColumnStructure
     );
     const action = await compareColumns(
-      config,
       adapter,
       domainsMap,
       ast,
@@ -438,13 +437,13 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
     }
   }
 };
-const compareColumns = async (config, adapter, domainsMap, ast, currentSchema, compareSql, changeTableData, typeCastsCache, verifying, key, dbName, dbColumn, codeColumn) => {
+const compareColumns = async (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(config, dbColumn, currentSchema);
-  const codeType = getColumnDbType(config, codeColumn, currentSchema);
+  const dbType = getColumnDbType(dbColumn, currentSchema);
+  const codeType = getColumnDbType(codeColumn, currentSchema);
   if (dbType !== codeType) {
     const typeCasts = await getTypeCasts(adapter, typeCastsCache);
     const dbBaseType = pqb.getColumnBaseType(dbColumn, domainsMap, dbType);
@@ -602,10 +601,10 @@ const changeColumn = (changeTableData, key, dbName, dbColumn, codeColumn) => {
     to: { column: simpleCodeColumn }
   };
 };
-const getColumnDbType = (config, column, currentSchema) => {
+const getColumnDbType = (column, currentSchema) => {
   if (column instanceof pqb.EnumColumn) {
     const [schema = currentSchema, name] = rakeDb.getSchemaAndTableFromName(
-      config,
+      currentSchema,
       column.enumName
     );
     return `${schema}.${name}`;
@@ -633,7 +632,7 @@ const renameColumn = (columns, from, to) => {
   }
 };
 
-const processDomains = async (config, ast, adapter, domainsMap, dbStructure, {
+const processDomains = async (ast, adapter, domainsMap, dbStructure, {
   codeItems: { domains },
   structureToAstCtx,
   currentSchema,
@@ -643,7 +642,7 @@ const processDomains = async (config, ast, adapter, domainsMap, dbStructure, {
   if (domains) {
     for (const { schemaName, name, column } of domains) {
       codeDomains.push(
-        makeComparableDomain(config, currentSchema, schemaName, name, column)
+        makeComparableDomain(currentSchema, schemaName, name, column)
       );
     }
   }
@@ -679,7 +678,6 @@ const processDomains = async (config, ast, adapter, domainsMap, dbStructure, {
       }));
     }
     const dbDomain = makeComparableDomain(
-      config,
       currentSchema,
       domain.schemaName,
       domain.name,
@@ -696,7 +694,6 @@ const processDomains = async (config, ast, adapter, domainsMap, dbStructure, {
       pushCompareDefault(compare, domain, found);
       pushCompareChecks(compare, domain, found);
       const source = `(VALUES (NULL::${getColumnDbType(
-        config,
         dbColumn,
         currentSchema
       )})) t(value)`;
@@ -750,7 +747,7 @@ const processDomains = async (config, ast, adapter, domainsMap, dbStructure, {
     }
   }
 };
-const makeComparableDomain = (config, currentSchema, schemaName, name, column) => {
+const makeComparableDomain = (currentSchema, schemaName, name, column) => {
   let arrayDims = 0;
   const isNullable = column.data.isNullable ?? false;
   let inner = column;
@@ -758,9 +755,9 @@ const makeComparableDomain = (config, currentSchema, schemaName, name, column) =
     inner = inner.data.item;
     arrayDims++;
   }
-  const fullType = getColumnDbType(config, inner, currentSchema);
+  const fullType = getColumnDbType(inner, currentSchema);
   const [typeSchema = "pg_catalog", type] = rakeDb.getSchemaAndTableFromName(
-    config,
+    currentSchema,
     fullType
   );
   return {
@@ -1668,7 +1665,7 @@ const fnOrTableToString = (fnOrTable) => {
 };
 const parseForeignKey = (config, codeConstraint, references, currentSchema) => {
   const { fnOrTable, columns, foreignColumns, options } = references;
-  const [schema, table] = rakeDb.getSchemaAndTableFromName(config, fnOrTable);
+  const [schema, table] = rakeDb.getSchemaAndTableFromName(currentSchema, fnOrTable);
   return {
     references: {
       foreignSchema: schema ?? currentSchema,
@@ -1854,6 +1851,7 @@ const processTables = async (ast, domainsMap, adapter, dbStructure, config, {
   const compareSql = { values: [], expressions: [] };
   const tableExpressions = [];
   const { changeTables, changeTableSchemas, dropTables, tableShapes } = collectChangeAndDropTables(
+    adapter,
     config,
     tables,
     dbStructure,
@@ -1909,19 +1907,19 @@ const collectCreateTables = (tables, dbStructure, currentSchema) => {
     return acc;
   }, []);
 };
-const collectChangeAndDropTables = (config, tables, dbStructure, currentSchema, createTables, generatorIgnore) => {
+const collectChangeAndDropTables = (adapter, config, tables, dbStructure, currentSchema, createTables, generatorIgnore) => {
   const changeTables = [];
   const changeTableSchemas = [];
   const dropTables = [];
   const tableShapes = {};
   const ignoreTables = generatorIgnore?.tables?.map((name) => {
     const [schema = currentSchema, table] = rakeDb.getSchemaAndTableFromName(
-      config,
+      currentSchema,
       name
     );
     return { schema, table };
   });
-  const { schema: migrationsSchema = "public", table: migrationsTable } = rakeDb.getMigrationsSchemaAndTable(config);
+  const { schema: migrationsSchema = "public", table: migrationsTable } = rakeDb.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
@@ -2179,10 +2177,9 @@ const composeMigration = async (adapter, config, ast, dbStructure, params) => {
   const { structureToAstCtx, currentSchema } = params;
   const domainsMap = rakeDb.makeDomainsMap(structureToAstCtx, dbStructure);
   await processSchemas(ast, dbStructure, params);
-  processExtensions(config, ast, dbStructure, params);
+  processExtensions(ast, dbStructure, params);
   const pendingDbTypes = new PendingDbTypes();
   await processDomains(
-    config,
     ast,
     adapter,
     domainsMap,
@@ -2208,7 +2205,7 @@ const verifyMigration = async (adapter, config, migrationCode, generateMigration
   const migrationFn = new Function("change", migrationCode);
   let code;
   try {
-    await adapter.transaction(void 0, async (trx) => {
+    await adapter.transaction(async (trx) => {
       const changeFns = [];
       migrationFn((changeCb) => {
         changeFns.push(changeCb);
@@ -2325,7 +2322,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(config, 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(column, currentSchema)}${column.data.isNullable ? " nullable" : ""}${primaryKey ? " primary key" : ""}${foreignKeys ? ` references ${foreignKeys.map((fk) => {
                   return `${fnOrTableToString(
                     fk.fnOrTable
                   )}(${fk.foreignColumns.join(", ")})`;
@@ -2386,7 +2383,7 @@ const report = (ast, config, currentSchema) => {
           for (const { references } of a.drop.constraints) {
             if (!references) continue;
             const [schema, name] = rakeDb.getSchemaAndTableFromName(
-              config,
+              currentSchema,
               references.fnOrTable
             );
             inner.push(
@@ -2577,11 +2574,11 @@ const generate = async (adapters, config, args, afterPull) => {
     afterPull
   );
   const [adapter] = adapters;
-  const currentSchema = (typeof config.schema === "function" ? config.schema() : config.schema) ?? "public";
+  const adapterSchema = adapter.getSchema();
+  const currentSchema = (typeof adapterSchema === "function" ? adapterSchema() : adapterSchema) ?? "public";
   const db = await getDbFromConfig(config, dbPath);
   const { columnTypes, internal } = db.$qb;
   const codeItems = await getActualItems(
-    config,
     db,
     currentSchema,
     internal,
@@ -2738,7 +2735,7 @@ const compareDbStructures = (a, b, i, path2) => {
     throw new Error(`${path2} in the db 0 does not match db ${i}`);
   }
 };
-const getActualItems = async (config, db, currentSchema, internal, columnTypes) => {
+const getActualItems = async (db, currentSchema, internal, columnTypes) => {
   const tableNames = /* @__PURE__ */ new Set();
   const habtmTables = /* @__PURE__ */ new Map();
   const codeItems = {
@@ -2781,7 +2778,7 @@ const getActualItems = async (config, db, currentSchema, internal, columnTypes)
         delete table.shape[key2];
       } else if (column instanceof pqb.DomainColumn) {
         const [schemaName = currentSchema, name2] = rakeDb.getSchemaAndTableFromName(
-          config,
+          currentSchema,
           column.dataType
         );
         domains.set(column.dataType, {
@@ -2792,21 +2789,21 @@ const getActualItems = async (config, 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(config, en, currentSchema, codeItems);
+          processEnumColumn(en, currentSchema, codeItems);
         }
       }
     }
   }
   if (internal.extensions) {
     for (const extension of internal.extensions) {
-      const [schema] = rakeDb.getSchemaAndTableFromName(config, extension.name);
+      const [schema] = rakeDb.getSchemaAndTableFromName(currentSchema, extension.name);
       if (schema) codeItems.schemas.add(schema);
     }
   }
   if (internal.domains) {
     for (const key in internal.domains) {
       const [schemaName = currentSchema, name] = rakeDb.getSchemaAndTableFromName(
-        config,
+        currentSchema,
         key
       );
       const column = internal.domains[key](columnTypes);
@@ -2823,9 +2820,9 @@ const getActualItems = async (config, db, currentSchema, internal, columnTypes)
   }
   return codeItems;
 };
-const processEnumColumn = (config, column, currentSchema, codeItems) => {
+const processEnumColumn = (column, currentSchema, codeItems) => {
   const { enumName, options } = column;
-  const [schema, name] = rakeDb.getSchemaAndTableFromName(config, enumName);
+  const [schema, name] = rakeDb.getSchemaAndTableFromName(currentSchema, enumName);
   const enumSchema = schema ?? currentSchema;
   codeItems.enums.set(`${enumSchema}.${name}`, {
     schema: enumSchema,
@@ -3169,7 +3166,8 @@ const pull = async (adapters, config) => {
   const baseTablePath = config.baseTable.getFilePath();
   const baseTableExportedAs = config.baseTable.exportAs;
   const [adapter] = adapters;
-  const currentSchema = (typeof config.schema === "function" ? config.schema() : config.schema) ?? "public";
+  const adapterSchema = adapter.getSchema();
+  const currentSchema = (typeof adapterSchema === "function" ? adapterSchema() : adapterSchema) ?? "public";
   const ctx = rakeDb.makeStructureToAstCtx(config, currentSchema);
   const asts = await rakeDb.structureToAst(ctx, adapter, config);
   const { tableInfos, fkeys } = getTableInfosAndFKeys(asts, config);