rake-db 2.3.8 → 2.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rake-db",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "Migrations tool for Postgresql DB",
   "homepage": "https://orchid-orm.netlify.app/guide/migration-setup-and-overview.html",
   "repository": {

package/src/commands/migrateOrRollback.test.ts

@@ -71,10 +71,18 @@ describe('migrateOrRollback', () => {
     it('should work properly', async () => {
       migrationFiles = files;
       migratedVersions = ['1'];
+      const conf = {
+        ...config,
+        beforeMigrate: jest.fn(),
+        afterMigrate: jest.fn(),
+      };
 
-      await migrate(options, config, []);
+      await migrate(options, conf, []);
 
-      expect(getMigrationFiles).toBeCalledWith(config, true);
+      expect(getMigrationFiles).toBeCalledWith(conf, true);
+
+      expect(conf.beforeMigrate).toBeCalled();
+      expect(conf.afterMigrate).toBeCalled();
 
       expect(requireTsMock).toBeCalledWith('file2');
       expect(requireTsMock).toBeCalledWith('file3');
@@ -171,10 +179,18 @@ describe('migrateOrRollback', () => {
     it('should work properly', async () => {
       migrationFiles = files.reverse();
       migratedVersions = ['1', '2'];
+      const conf = {
+        ...config,
+        beforeRollback: jest.fn(),
+        afterRollback: jest.fn(),
+      };
 
-      await rollback(options, config, []);
+      await rollback(options, conf, []);
 
-      expect(getMigrationFiles).toBeCalledWith(config, false);
+      expect(conf.beforeRollback).toBeCalled();
+      expect(conf.afterRollback).toBeCalled();
+
+      expect(getMigrationFiles).toBeCalledWith(conf, false);
 
       expect(requireTsMock).toBeCalledTimes(1);
       expect(requireTsMock).toBeCalledWith('file2');

package/src/commands/migrateOrRollback.ts

@@ -1,4 +1,12 @@
-import { Adapter, AdapterOptions, MaybeArray, toArray } from 'pqb';
+import {
+  Adapter,
+  AdapterOptions,
+  columnTypes,
+  createDb,
+  DbResult,
+  MaybeArray,
+  toArray,
+} from 'pqb';
 import {
   createSchemaMigrations,
   getMigrationFiles,
@@ -16,6 +24,8 @@ import {
 } from '../migration/change';
 import { createMigrationInterface } from '../migration/migration';
 
+const getDb = (adapter: Adapter) => createDb({ adapter, columnTypes });
+
 const migrateOrRollback = async (
   options: MaybeArray<AdapterOptions>,
   config: RakeDbConfig,
@@ -43,8 +53,16 @@ const migrateOrRollback = async (
   const appCodeUpdaterCache = {};
 
   for (const opts of toArray(options)) {
-    const db = new Adapter(opts);
-    const migratedVersions = await getMigratedVersionsMap(db, config);
+    const adapter = new Adapter(opts);
+    let db: DbResult<typeof columnTypes> | undefined;
+
+    if (up) {
+      await config.beforeMigrate?.((db ??= getDb(adapter)));
+    } else {
+      await config.beforeRollback?.((db ??= getDb(adapter)));
+    }
+
+    const migratedVersions = await getMigratedVersionsMap(adapter, config);
     try {
       for (const file of files) {
         if (
@@ -56,11 +74,24 @@ const migrateOrRollback = async (
 
         if (count-- <= 0) break;
 
-        await processMigration(db, up, file, config, opts, appCodeUpdaterCache);
+        await processMigration(
+          adapter,
+          up,
+          file,
+          config,
+          opts,
+          appCodeUpdaterCache,
+        );
         config.logger?.log(`${file.path} ${up ? 'migrated' : 'rolled back'}`);
       }
+
+      if (up) {
+        await config.afterMigrate?.((db ??= getDb(adapter)));
+      } else {
+        await config.afterRollback?.((db ??= getDb(adapter)));
+      }
     } finally {
-      await db.close();
+      await adapter.close();
     }
     // use appCodeUpdater only for the first provided options
     delete config.appCodeUpdater;

package/src/common.ts

@@ -1,6 +1,8 @@
 import {
   Adapter,
   AdapterOptions,
+  columnTypes,
+  DbResult,
   NoPrimaryKeyOption,
   QueryLogOptions,
   singleQuote,
@@ -10,6 +12,8 @@ import path from 'path';
 import { readdir } from 'fs/promises';
 import { RakeDbAst } from './ast';
 
+type Db = DbResult<typeof columnTypes>;
+
 export type RakeDbConfig = {
   migrationsPath: string;
   migrationsTable: string;
@@ -17,6 +21,10 @@ export type RakeDbConfig = {
   noPrimaryKey?: NoPrimaryKeyOption;
   appCodeUpdater?: AppCodeUpdater;
   useCodeUpdater?: boolean;
+  beforeMigrate?(db: Db): Promise<void>;
+  afterMigrate?(db: Db): Promise<void>;
+  beforeRollback?(db: Db): Promise<void>;
+  afterRollback?(db: Db): Promise<void>;
 } & QueryLogOptions;
 
 export type AppCodeUpdater = (params: {