Fix migration validation issue (#6154)

Resolves #6151.
airbytehq · Sep 16, 2021 · fc64d88 · fc64d88
1 parent 06128ab
commit fc64d88
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/...yte/db/instance/jobs/migrations/V0_29_15_001__Add_temporalWorkflowId_col_to_Attempts.java b/...yte/db/instance/jobs/migrations/V0_29_15_001__Add_temporalWorkflowId_col_to_Attempts.java
@@ -38,7 +38,8 @@ public void migrate(Context context) throws Exception {
     // As database schema changes, the generated jOOQ code can be deprecated. So
     // old migration may not compile if there is any generated code.
     DSLContext ctx = DSL.using(context.getConnection());
-    ctx.alterTable("attempts").addColumn(DSL.field("temporal_workflow_id", SQLDataType.VARCHAR(256).nullable(true)))
+    ctx.alterTable("attempts")
+        .addColumnIfNotExists(DSL.field("temporal_workflow_id", SQLDataType.VARCHAR(256).nullable(true)))
         .execute();
   }
 

diff --git a/airbyte-db/lib/src/main/resources/jobs_database/Attempts.yaml b/airbyte-db/lib/src/main/resources/jobs_database/Attempts.yaml
@@ -11,7 +11,7 @@ required:
   - status
   - created_at
   - updated_at
-additionalProperties: false
+additionalProperties: true
 properties:
   id:
     type: number
@@ -25,8 +25,6 @@ properties:
     type: ["null", object]
   status:
     type: string
-  temporal_workflow_id:
-    type: ["null", string]
   created_at:
     # todo should be datetime.
     type: string

diff --git a/airbyte-migration/src/main/resources/migrations/migrationV0_14_0/airbyte_db/Attempts.yaml b/airbyte-migration/src/main/resources/migrations/migrationV0_14_0/airbyte_db/Attempts.yaml
@@ -11,7 +11,7 @@ required:
   - status
   - created_at
   - updated_at
-additionalProperties: false
+additionalProperties: true
 properties:
   id:
     type: number