rake-db 2.4.2 → 2.4.4

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ColumnType, EnumColumn, ColumnTypes, ColumnsShape, DbResult, DefaultColumnTypes, TransactionAdapter, AdapterOptions, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, QueryLogOptions } from 'pqb';
+import { ColumnType, EnumColumn, ColumnTypes, ColumnsShape, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
 import { EmptyObject, RawExpression, ColumnTypesBase, raw, MaybeArray } from 'orchid-core';
 
 declare function add(this: ColumnTypesBase, item: ColumnType, options?: {
@@ -52,14 +52,13 @@ declare type ColumnComment = {
     comment: string | null;
 };
 declare type Migration = DbResult<DefaultColumnTypes> & MigrationBase;
-declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, options: RakeDbConfig, adapterOptions: AdapterOptions, appCodeUpdaterCache: object) => Migration;
+declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, options: RakeDbConfig) => Migration;
 declare class MigrationBase {
     adapter: TransactionAdapter;
     log?: QueryLogObject;
     up: boolean;
     options: RakeDbConfig;
-    adapterOptions: AdapterOptions;
-    appCodeUpdaterCache: object;
+    migratedAsts: RakeDbAst[];
     createTable(tableName: string, options: TableOptions, fn: ColumnsShapeCallback): Promise<void>;
     createTable(tableName: string, fn: ColumnsShapeCallback): Promise<void>;
     dropTable(tableName: string, options: TableOptions, fn: ColumnsShapeCallback): Promise<void>;
@@ -84,13 +83,12 @@ declare class MigrationBase {
     dropSchema(schemaName: string): Promise<void>;
     createExtension(name: string, options?: Omit<RakeDbAst.Extension, 'type' | 'action' | 'name'>): Promise<void>;
     dropExtension(name: string, options?: Omit<RakeDbAst.Extension, 'type' | 'action' | 'name' | 'values'>): Promise<void>;
-    createEnum(name: string, values: string[], options?: Omit<RakeDbAst.Enum, 'type' | 'action' | 'name' | 'values'>): Promise<void>;
-    dropEnum(name: string, values: string[], options?: Omit<RakeDbAst.Enum, 'type' | 'action' | 'name' | 'values'>): Promise<void>;
+    createEnum(name: string, values: [string, ...string[]], options?: Omit<RakeDbAst.Enum, 'type' | 'action' | 'name' | 'values'>): Promise<void>;
+    dropEnum(name: string, values: [string, ...string[]], options?: Omit<RakeDbAst.Enum, 'type' | 'action' | 'name' | 'values'>): Promise<void>;
     tableExists(tableName: string): Promise<boolean>;
     columnExists(tableName: string, columnName: string): Promise<boolean>;
     constraintExists(constraintName: string): Promise<boolean>;
 }
-declare const runCodeUpdater: (migration: MigrationBase, ast: RakeDbAst) => Promise<void> | undefined;
 
 declare type RakeDbAst = RakeDbAst.Table | RakeDbAst.ChangeTable | RakeDbAst.RenameTable | RakeDbAst.Schema | RakeDbAst.Extension | RakeDbAst.Enum | RakeDbAst.ForeignKey;
 declare namespace RakeDbAst {
@@ -174,7 +172,7 @@ declare namespace RakeDbAst {
         action: 'create' | 'drop';
         schema?: string;
         name: string;
-        values: string[];
+        values: [string, ...string[]];
         cascade?: boolean;
         dropIfExists?: boolean;
     };
@@ -211,6 +209,7 @@ declare type AppCodeUpdater = (params: {
     options: AdapterOptions;
     basePath: string;
     cache: object;
+    logger: QueryLogOptions['logger'];
 }) => Promise<void>;
 
 declare const createDb: (arg: MaybeArray<AdapterOptions>, config: RakeDbConfig) => Promise<void>;
@@ -230,4 +229,4 @@ declare const rollback: (options: MaybeArray<AdapterOptions>, config: RakeDbConf
 
 declare const rakeDb: (options: MaybeArray<AdapterOptions>, partialConfig?: Partial<RakeDbConfig>, args?: string[]) => Promise<void>;
 
-export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, migrate, migrateOrRollback, rakeDb, resetDb, rollback, runCodeUpdater, writeMigrationFile };
+export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, migrate, migrateOrRollback, rakeDb, resetDb, rollback, writeMigrationFile };

package/dist/index.js

@@ -65,10 +65,15 @@ const migrationConfigDefaults = {
 const processRakeDbConfig = (config) => {
   var _a;
   const result = __spreadValues$6(__spreadValues$6({}, migrationConfigDefaults), config);
+  if (!result.log) {
+    delete result.logger;
+  }
   if (!result.basePath) {
     let stack;
+    const original = Error.prepareStackTrace;
     Error.prepareStackTrace = (_, s) => stack = s;
     new Error().stack;
+    Error.prepareStackTrace = original;
     if (stack) {
       const thisFile = (_a = stack[0]) == null ? void 0 : _a.getFileName();
       const thisDir = thisFile && path__default["default"].dirname(thisFile);
@@ -165,16 +170,17 @@ const setAdminCredentialsToOptions = async (options, create) => {
   }));
 };
 const createSchemaMigrations = async (db, config) => {
+  var _a, _b;
   try {
     await db.query(
       `CREATE TABLE ${quoteWithSchema({
         name: config.migrationsTable
       })} ( version TEXT NOT NULL )`
     );
-    console.log("Created versions table");
+    (_a = config.logger) == null ? void 0 : _a.log("Created versions table");
   } catch (err) {
     if (err.code === "42P07") {
-      console.log("Versions table exists");
+      (_b = config.logger) == null ? void 0 : _b.log("Versions table exists");
     } else {
       throw err;
     }
@@ -528,7 +534,7 @@ const createTable$1 = async (migration, up, tableName, options, fn) => {
     const result = await migration.adapter.arrays(query);
     then == null ? void 0 : then(result);
   }
-  await runCodeUpdater(migration, ast);
+  migration.migratedAsts.push(ast);
 };
 const makeAst$1 = (up, tableName, shape, tableData, options, noPrimaryKey) => {
   const shapePKeys = [];
@@ -786,7 +792,7 @@ const changeTable = async (migration, up, tableName, options, fn) => {
     const result = await migration.adapter.arrays(query);
     (_a = query.then) == null ? void 0 : _a.call(query, result);
   }
-  await runCodeUpdater(migration, ast);
+  migration.migratedAsts.push(ast);
 };
 const makeAst = (up, name, changeData, changeTableData2, options) => {
   const { comment } = options;
@@ -1024,7 +1030,7 @@ var __spreadValues$2 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-const createMigrationInterface = (tx, up, options, adapterOptions, appCodeUpdaterCache) => {
+const createMigrationInterface = (tx, up, options) => {
   const adapter = new pqb.TransactionAdapter(tx, tx.client, tx.types);
   const { query, arrays } = adapter;
   const log = pqb.logParamToLogObject(options.logger || console, options.log);
@@ -1039,13 +1045,12 @@ const createMigrationInterface = (tx, up, options, adapterOptions, appCodeUpdate
   for (const key of Object.getOwnPropertyNames(proto)) {
     db[key] = proto[key];
   }
+  db.migratedAsts = [];
   return Object.assign(db, {
     adapter,
     log,
     up,
-    options,
-    adapterOptions,
-    appCodeUpdaterCache
+    options
   });
 };
 class MigrationBase {
@@ -1082,7 +1087,7 @@ class MigrationBase {
         name: ast.to
       })}`
     );
-    await runCodeUpdater(this, ast);
+    this.migratedAsts.push(ast);
   }
   addColumn(tableName, columnName, fn) {
     return addColumn(this, this.up, tableName, columnName, fn);
@@ -1205,7 +1210,7 @@ const createSchema$1 = async (migration, up, name) => {
   await migration.adapter.query(
     `${ast.action === "create" ? "CREATE" : "DROP"} SCHEMA "${name}"`
   );
-  await runCodeUpdater(migration, ast);
+  migration.migratedAsts.push(ast);
 };
 const createExtension$1 = async (migration, up, name, options) => {
   const ast = __spreadValues$2({
@@ -1220,7 +1225,7 @@ const createExtension$1 = async (migration, up, name, options) => {
     query = `CREATE EXTENSION${ast.createIfNotExists ? " IF NOT EXISTS" : ""} "${ast.name}"${ast.schema ? ` SCHEMA "${ast.schema}"` : ""}${ast.version ? ` VERSION '${ast.version}'` : ""}${ast.cascade ? " CASCADE" : ""}`;
   }
   await migration.adapter.query(query);
-  await runCodeUpdater(migration, ast);
+  migration.migratedAsts.push(ast);
 };
 const createEnum$1 = async (migration, up, name, values, options = {}) => {
   const [schema, enumName] = getSchemaAndTableFromName(name);
@@ -1239,20 +1244,11 @@ const createEnum$1 = async (migration, up, name, values, options = {}) => {
     query = `DROP TYPE${ast.dropIfExists ? " IF EXISTS" : ""} ${quotedName}${ast.cascade ? " CASCADE" : ""}`;
   }
   await migration.adapter.query(query);
-  await runCodeUpdater(migration, ast);
+  migration.migratedAsts.push(ast);
 };
 const queryExists = (db, sql) => {
   return db.adapter.query(sql).then(({ rowCount }) => rowCount > 0);
 };
-const runCodeUpdater = (migration, ast) => {
-  var _a, _b;
-  return (_b = (_a = migration.options).appCodeUpdater) == null ? void 0 : _b.call(_a, {
-    ast,
-    options: migration.adapterOptions,
-    basePath: migration.options.basePath,
-    cache: migration.appCodeUpdaterCache
-  });
-};
 
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
@@ -1313,7 +1309,9 @@ const migrateOrRollback = async (options, config, args, up) => {
           opts,
           appCodeUpdaterCache
         );
-        (_c = config.logger) == null ? void 0 : _c.log(`${file.path} ${up ? "migrated" : "rolled back"}`);
+        (_c = config.logger) == null ? void 0 : _c.log(
+          `${up ? "Migrated" : "Rolled back"} ${orchidCore.pathToLog(file.path)}`
+        );
       }
       if (up) {
         await ((_d = config.afterMigrate) == null ? void 0 : _d.call(config, db != null ? db : db = getDb(adapter)));
@@ -1328,14 +1326,9 @@ const migrateOrRollback = async (options, config, args, up) => {
 };
 const changeCache = {};
 const processMigration = async (db, up, file, config, options, appCodeUpdaterCache) => {
-  await db.transaction(async (tx) => {
-    const db2 = createMigrationInterface(
-      tx,
-      up,
-      config,
-      options,
-      appCodeUpdaterCache
-    );
+  var _a;
+  const asts = await db.transaction(async (tx) => {
+    const db2 = createMigrationInterface(tx, up, config);
     clearChanges();
     let changes = changeCache[file.path];
     if (!changes) {
@@ -1357,7 +1350,17 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
       file.version,
       config
     );
+    return db2.migratedAsts;
   });
+  for (const ast of asts) {
+    await ((_a = config.appCodeUpdater) == null ? void 0 : _a.call(config, {
+      ast,
+      options,
+      basePath: config.basePath,
+      cache: appCodeUpdaterCache,
+      logger: config.logger
+    }));
+  }
 };
 const saveMigratedVersion = async (db, version, config) => {
   await db.query(
@@ -1412,17 +1415,20 @@ const execute = async (options, sql) => {
   }
 };
 const createOrDrop = async (options, adminOptions, config, args) => {
+  var _a, _b, _c, _d;
   const params = getDatabaseAndUserFromOptions(options);
   const result = await execute(
     setAdapterOptions(adminOptions, { database: "postgres" }),
     args.sql(params)
   );
   if (result === "ok") {
-    console.log(args.successMessage(params));
+    (_a = config.logger) == null ? void 0 : _a.log(args.successMessage(params));
   } else if (result === "already") {
-    console.log(args.alreadyMessage(params));
+    (_b = config.logger) == null ? void 0 : _b.log(args.alreadyMessage(params));
   } else if (result === "ssl required") {
-    console.log("SSL is required: append ?ssl=true to the database url string");
+    (_c = config.logger) == null ? void 0 : _c.log(
+      "SSL is required: append ?ssl=true to the database url string"
+    );
     return;
   } else if (result === "forbidden") {
     let message = `Permission denied to ${args.create ? "create" : "drop"} database.`;
@@ -1432,7 +1438,7 @@ const createOrDrop = async (options, adminOptions, config, args) => {
       message += `
 Don't use this command for database service providers, only for a local db.`;
     }
-    console.log(message);
+    (_d = config.logger) == null ? void 0 : _d.log(message);
     const updatedOptions = await setAdminCredentialsToOptions(
       options,
       args.create
@@ -1488,13 +1494,14 @@ const resetDb = async (arg, config) => {
 };
 
 const writeMigrationFile = async (config, name, content) => {
+  var _a;
   await promises.mkdir(config.migrationsPath, { recursive: true });
   const filePath = path__default["default"].resolve(
     config.migrationsPath,
     `${makeFileTimeStamp()}_${name}.ts`
   );
   await promises.writeFile(filePath, content);
-  console.log(`Created ${filePath}`);
+  (_a = config.logger) == null ? void 0 : _a.log(`Created ${orchidCore.pathToLog(filePath)}`);
 };
 const generate = async (config, args) => {
   const name = args[0];
@@ -1632,6 +1639,8 @@ WHERE ${filterSchema("n.nspname")}`
   table_name "tableName",
   column_name "name",
   udt_name "type",
+  udt_schema "typeSchema",
+  data_type "dataType",
   character_maximum_length AS "maxChars",
   numeric_precision AS "numericPrecision",
   numeric_scale AS "numericScale",
@@ -1871,6 +1880,11 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+class RakeDbEnumColumn extends pqb.EnumColumn {
+  toCode(t) {
+    return pqb.columnCode(this, t, `enum('${this.enumName}')`);
+  }
+}
 const matchMap = {
   s: void 0,
   f: "FULL",
@@ -2001,11 +2015,10 @@ const getIsSerial = (item) => {
   }
   return false;
 };
-const getColumnType = (item, isSerial) => {
-  if (isSerial) {
-    return item.type === "int2" ? "smallserial" : item.type === "int4" ? "serial" : "bigserial";
-  }
-  return item.type;
+const getColumnType = (type, isSerial) => {
+  if (!isSerial)
+    return type;
+  return type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial";
 };
 const pushTableAst = (ast, data, table, pendingTables, innerFKeys = data.foreignKeys) => {
   const { schemaName, name } = table;
@@ -2024,11 +2037,26 @@ const pushTableAst = (ast, data, table, pendingTables, innerFKeys = data.foreign
     if (isSerial) {
       item = __spreadProps(__spreadValues({}, item), { default: void 0 });
     }
-    const klass = pqb.columnsByType[getColumnType(item, isSerial)];
-    if (!klass) {
-      throw new Error(`Column type \`${item.type}\` is not supported`);
+    let column;
+    const isArray = item.dataType === "ARRAY";
+    const type = isArray ? item.type.slice(1) : item.type;
+    const klass = pqb.columnsByType[getColumnType(type, isSerial)];
+    if (klass) {
+      column = pqb.instantiateColumn(klass, item);
+    } else {
+      const { type: type2, typeSchema } = item;
+      const enumType = data.enums.find(
+        (item2) => item2.name === type2 && item2.schemaName === typeSchema
+      );
+      if (!enumType) {
+        throw new Error(
+          `Cannot handle column ${item.schemaName}.${item.tableName}.${item.name}: column type \`${item.type}\` is not supported`
+        );
+      }
+      column = new RakeDbEnumColumn({}, type2, enumType.values);
     }
-    let column = pqb.instantiateColumn(klass, item);
+    if (isArray)
+      column = new pqb.ArrayColumn({}, column);
     if ((primaryKey == null ? void 0 : primaryKey.columnNames.length) === 1 && (primaryKey == null ? void 0 : primaryKey.columnNames[0]) === item.name) {
       column = column.primaryKey();
     }
@@ -2268,7 +2296,7 @@ const pullDbStructure = async (options, config) => {
 };
 
 const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2)) => {
-  var _a;
+  var _a, _b, _c;
   const config = processRakeDbConfig(partialConfig);
   const command = (_a = args[0]) == null ? void 0 : _a.split(":")[0];
   try {
@@ -2289,18 +2317,17 @@ const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2))
     } else if (config.commands[command]) {
       await config.commands[command](orchidCore.toArray(options), config, args.slice(1));
     } else {
-      printHelp();
+      (_b = config.logger) == null ? void 0 : _b.log(help);
     }
   } catch (err) {
     if (err instanceof RakeDbError) {
-      console.error(err.message);
+      (_c = config.logger) == null ? void 0 : _c.error(err.message);
       process.exit(1);
     }
     throw err;
   }
 };
-const printHelp = () => console.log(
-  `Usage: rake-db [command] [arguments]
+const help = `Usage: rake-db [command] [arguments]
 
 Commands:
   create                  create databases
@@ -2334,8 +2361,7 @@ Generate arguments:
 
 - other arguments considered as columns with types and optional methods:
   rake-db g createTable id:serial.primaryKey name:text.nullable
-`
-);
+`;
 
 exports.MigrationBase = MigrationBase;
 exports.change = change;
@@ -2349,6 +2375,5 @@ exports.migrateOrRollback = migrateOrRollback;
 exports.rakeDb = rakeDb;
 exports.resetDb = resetDb;
 exports.rollback = rollback;
-exports.runCodeUpdater = runCodeUpdater;
 exports.writeMigrationFile = writeMigrationFile;
 //# sourceMappingURL=index.js.map