rake-db 2.4.19 → 2.4.23

package/dist/index.d.ts

@@ -247,6 +247,7 @@ declare const migrateOrRollback: (options: MaybeArray<AdapterOptions>, config: R
 declare const changeCache: Record<string, ChangeCallback[] | undefined>;
 declare const migrate: (options: MaybeArray<AdapterOptions>, config: RakeDbConfig, args?: string[]) => Promise<void>;
 declare const rollback: (options: MaybeArray<AdapterOptions>, config: RakeDbConfig, args?: string[]) => Promise<void>;
+declare const redo: (options: MaybeArray<AdapterOptions>, config: RakeDbConfig, args?: string[]) => Promise<void>;
 
 declare const rakeDb: (options: MaybeArray<AdapterOptions>, partialConfig?: Partial<RakeDbConfig>, args?: string[]) => Promise<void>;
 
@@ -254,4 +255,4 @@ declare const saveMigratedVersion: (db: Adapter, version: string, config: RakeDb
 declare const removeMigratedVersion: (db: Adapter, version: string, config: RakeDbConfig) => Promise<void>;
 declare const getMigratedVersionsMap: (db: Adapter, config: RakeDbConfig) => Promise<Record<string, boolean>>;
 
-export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
+export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };

package/dist/index.js

@@ -1565,6 +1565,10 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
 };
 const migrate = (options, config, args = []) => migrateOrRollback(options, config, args, true);
 const rollback = (options, config, args = []) => migrateOrRollback(options, config, args, false);
+const redo = async (options, config, args = []) => {
+  await migrateOrRollback(options, config, args, false);
+  await migrateOrRollback(options, config, args, true);
+};
 
 const execute = async (options, sql) => {
   const db = new pqb.Adapter(options);
@@ -2133,11 +2137,6 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-class RakeDbEnumColumn extends pqb.EnumColumn {
-  toCode(t) {
-    return pqb.columnCode(this, t, `enum('${this.enumName}')`);
-  }
-}
 const matchMap = {
   s: void 0,
   f: "FULL",
@@ -2330,7 +2329,7 @@ const getColumn = (ctx, data, domains, _a) => {
         (item) => item.name === type && item.schemaName === typeSchema
       );
       if (enumType) {
-        column = new RakeDbEnumColumn({}, type, enumType.values);
+        column = new pqb.EnumColumn({}, type, enumType.values);
       } else {
         column = new pqb.CustomTypeColumn({}, type);
         ((_b2 = (_a2 = ctx.unsupportedTypes)[type]) != null ? _b2 : _a2[type] = []).push(
@@ -2598,7 +2597,7 @@ const createTable = (config, ast) => {
     if (hasTimestamps && (key === "createdAt" || key === "updatedAt"))
       continue;
     const line = [`${orchidCore.quoteObjectKey(key)}: `];
-    for (const part of ast.shape[key].toCode("t")) {
+    for (const part of ast.shape[key].toCode("t", true)) {
       orchidCore.addCode(line, part);
     }
     orchidCore.addCode(line, ",");
@@ -2699,7 +2698,9 @@ const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2))
       await migrate(options, config, args.slice(1));
     } else if (command === "rollback") {
       await rollback(options, config, args.slice(1));
-    } else if (command === "g" || command === "generate") {
+    } else if (command === "redo") {
+      await redo(options, config, args.slice(1));
+    } else if (command === "new") {
       await generate(config, args.slice(1));
     } else if (command === "pull") {
       await pullDbStructure(orchidCore.toArray(options)[0], config);
@@ -2722,9 +2723,10 @@ Commands:
   create                  create databases
   drop                    drop databases
   reset                   drop, create and migrate databases
-  g, generate             generate migration file, see below
+  new                     create new migration file, see below
   migrate                 migrate pending migrations
   rollback                rollback the last migrated
+  redo                    rollback and migrate
   no or unknown command   prints this message
   
 Migrate arguments:
@@ -2740,7 +2742,7 @@ Migrate and rollback common arguments:
   --code                  run code updater, overrides \`useCodeUpdater\` option
   --code false            do not run code updater
   
-Generate arguments:
+New migration file arguments:
 - (required) first argument is migration name
   * create*               template for create table
   * change*               template for change table
@@ -2749,7 +2751,7 @@ Generate arguments:
   * drop*                 template for drop table
 
 - other arguments considered as columns with types and optional methods:
-  rake-db g createTable id:serial.primaryKey name:text.nullable
+  rake-db new createTable id:serial.primaryKey name:text.nullable
 `;
 
 exports.MigrationBase = MigrationBase;
@@ -2764,6 +2766,7 @@ exports.makeFileTimeStamp = makeFileTimeStamp;
 exports.migrate = migrate;
 exports.migrateOrRollback = migrateOrRollback;
 exports.rakeDb = rakeDb;
+exports.redo = redo;
 exports.removeMigratedVersion = removeMigratedVersion;
 exports.resetDb = resetDb;
 exports.rollback = rollback;