Add db identifier to fix migration file directory (airbytehq#5851)

Jimao · Sep 6, 2021 · 8b62fb2 · 8b62fb2
1 parent 71a96f5
commit 8b62fb2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/...b/lib/src/main/java/io/airbyte/db/instance/configs/ConfigsDatabaseMigrationDevCenter.java b/...b/lib/src/main/java/io/airbyte/db/instance/configs/ConfigsDatabaseMigrationDevCenter.java
@@ -36,7 +36,7 @@
 public class ConfigsDatabaseMigrationDevCenter extends MigrationDevCenter {
 
   public ConfigsDatabaseMigrationDevCenter() {
-    super("src/main/resources/configs_database/schema_dump.txt");
+    super("configs", "src/main/resources/configs_database/schema_dump.txt");
   }
 
   @Override

diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/instance/development/MigrationDevCenter.java b/airbyte-db/lib/src/main/java/io/airbyte/db/instance/development/MigrationDevCenter.java
@@ -47,15 +47,11 @@ private enum Command {
     DUMP_SCHEMA
   }
 
-  /**
-   * Directory under which a new migration will be created. This should match the database's name and
-   * match the {@link Db} enum. Set in main to enforce correct implementation.
-   */
-  private static String migrationDirectory;
-
+  private final String dbIdentifier;
   private final String schemaDumpFile;
 
-  protected MigrationDevCenter(String schemaDumpFile) {
+  protected MigrationDevCenter(String dbIdentifier, String schemaDumpFile) {
+    this.dbIdentifier = dbIdentifier;
     this.schemaDumpFile = schemaDumpFile;
   }
 
@@ -75,7 +71,7 @@ private static PostgreSQLContainer<?> createContainer() {
   private void createMigration() {
     try (PostgreSQLContainer<?> container = createContainer(); Database database = getDatabase(container)) {
       FlywayDatabaseMigrator migrator = getMigrator(database);
-      MigrationDevHelper.createNextMigrationFile(migrationDirectory, migrator);
+      MigrationDevHelper.createNextMigrationFile(dbIdentifier, migrator);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -109,14 +105,8 @@ public static void main(String[] args) {
 
     Db db = Db.valueOf(args[0].toUpperCase());
     switch (db) {
-      case CONFIGS -> {
-        devCenter = new ConfigsDatabaseMigrationDevCenter();
-        migrationDirectory = "configs";
-      }
-      case JOBS -> {
-        devCenter = new JobsDatabaseMigrationDevCenter();
-        migrationDirectory = "jobs";
-      }
+      case CONFIGS -> devCenter = new ConfigsDatabaseMigrationDevCenter();
+      case JOBS -> devCenter = new JobsDatabaseMigrationDevCenter();
       default -> throw new IllegalArgumentException("Unexpected database: " + args[0]);
     }
 

diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/instance/jobs/JobsDatabaseMigrationDevCenter.java b/airbyte-db/lib/src/main/java/io/airbyte/db/instance/jobs/JobsDatabaseMigrationDevCenter.java
@@ -36,7 +36,7 @@
 public class JobsDatabaseMigrationDevCenter extends MigrationDevCenter {
 
   public JobsDatabaseMigrationDevCenter() {
-    super("src/main/resources/jobs_database/schema_dump.txt");
+    super("jobs", "src/main/resources/jobs_database/schema_dump.txt");
   }
 
   @Override