Merge pull request #611 from PhilanthropyDataCommons/609-switch-migration-library

Allow schema specification when migrating

Author: slifty

package-lock.json

@@ -82,7 +82,7 @@
     "jwks-rsa": "^3.1.0",
     "pino": "^8.16.2",
     "pino-http": "^8.5.1",
-    "postgres-migrations": "^5.3.0",
+    "postgres-schema-migrations": "^6.1.0",
     "require-env-variable": "^4.0.2",
     "swagger-ui-express": "^5.0.0",
     "tinypg": "^7.0.0",

package.json

@@ -1,13 +1,14 @@
 import path from 'path';
-import { migrate as pgMigrate } from 'postgres-migrations';
+import { migrate as pgMigrate } from 'postgres-schema-migrations';
 import { db } from './db';
 
-export const migrate = async (): Promise<void> => {
+export const migrate = async (schema = 'public'): Promise<void> => {
   const client = await db.getClient();
   try {
     await pgMigrate(
       { client },
       path.resolve(__dirname, 'migrations'),
+      { schema },
     );
   } finally {
     client.release();

src/database/migrate.ts

@@ -40,7 +40,7 @@ export const prepareDatabaseForCurrentWorker = async (): Promise<void> => {
   const schemaName = getSchemaNameForCurrentTestWorker();
   await createSchema(schemaName);
   await setSchema(schemaName);
-  await migrate();
+  await migrate(schemaName);
 };
 
 export const cleanupDatabaseForCurrentWorker = async (): Promise<void> => {