Merge pull request #25 from FigureTechnologies/hyperschwartz/allow-dy…

…namic-file-locations-based-on-sql-type Bugfix: SQL Dialect Unique Files
FigureTechnologies · Sep 26, 2022 · c814c68 · c814c68
2 parents 9e82c96 + d943ba7
commit c814c68
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 9 deletions.
diff --git a/server/src/main/kotlin/tech/figure/objectstore/gateway/configuration/DataConfig.kt b/server/src/main/kotlin/tech/figure/objectstore/gateway/configuration/DataConfig.kt
@@ -74,12 +74,10 @@ class DataConfig {
 
     @Bean
     fun flyway(dataSource: DataSource, databaseProperties: DatabaseProperties): Flyway = Flyway(
-        FluentConfiguration().dataSource(dataSource).baselineOnMigrate(databaseProperties.baselineOnMigrate).apply {
-            if (databaseProperties.type != "postgresql") {
-                // skip initial 1_0__Init_UUID migration for non-postgres dbs as this isn't supported for sqlite/memory
-                baselineVersion("1.0")
-            }
-        }
+        FluentConfiguration().dataSource(dataSource).baselineOnMigrate(databaseProperties.baselineOnMigrate)
+            // Dynamically set the location for migration files based on the database type, allowing for multiple
+            // dialects to specify their own migrations as necessary
+            .locations("db/migration/common", "db/migration/${databaseProperties.type}")
     ).apply {
         if (databaseProperties.type != "postgresql") {
             baseline()

diff --git a/...ain/resources/db/migration/V1_1__Init.sql → ...ources/db/migration/common/V1_1__Init.sql b/...ain/resources/db/migration/V1_1__Init.sql → ...ources/db/migration/common/V1_1__Init.sql
diff --git a/...db/migration/V2_0__Object_Permissions.sql → ...ation/common/V2_0__Object_Permissions.sql b/...db/migration/V2_0__Object_Permissions.sql → ...ation/common/V2_0__Object_Permissions.sql
diff --git a/...tion/V3_0__Scope_Permissions_Grant_ID.sql → ...mmon/V3_1__Scope_Permissions_Grant_ID.sql b/...tion/V3_0__Scope_Permissions_Grant_ID.sql → ...mmon/V3_1__Scope_Permissions_Grant_ID.sql
@@ -2,9 +2,6 @@ ALTER TABLE scope_permissions ADD COLUMN grant_id text;
 
 CREATE INDEX IF NOT EXISTS scope_permissions_grant_id_idx ON scope_permissions(grant_id);
 
--- Remove old index that enforces unique on scope_address/grantee_address/granter_address
-DROP INDEX IF EXISTS scope_permissions_scope_address_grantee_address_granter_address;
-
 -- Ensures that there can be duplicate grants from granters to grantees on a scope address, as long as the duplicate
 -- specifies a newly-unique grant id
 CREATE UNIQUE INDEX IF NOT EXISTS scope_permissions_scope_adr_grantee_adr_granter_adr_grant_id_nn

diff --git a/...migration/V4_0__Data_Storage_Accounts.sql → ...on/common/V4_0__Data_Storage_Accounts.sql b/...migration/V4_0__Data_Storage_Accounts.sql → ...on/common/V4_0__Data_Storage_Accounts.sql
diff --git a/...er/src/main/resources/db/migration/memory/V3_0__Remove_Scope_Permissions_Unique_Index.sql b/...er/src/main/resources/db/migration/memory/V3_0__Remove_Scope_Permissions_Unique_Index.sql
@@ -0,0 +1,3 @@
+-- Remove old index that enforces unique on scope_address/grantee_address/granter_address in preparation for new index
+-- in the v3_1 migration.
+DROP INDEX IF EXISTS scope_permissions_scope_address_grantee_address_granter_address;
diff --git a/...esources/db/migration/V1_0__Init_UUID.sql → .../migration/postgresql/V1_0__Init_UUID.sql b/...esources/db/migration/V1_0__Init_UUID.sql → .../migration/postgresql/V1_0__Init_UUID.sql
diff --git a/...rc/main/resources/db/migration/postgresql/V3_0__Remove_Scope_Permissions_Unique_Index.sql b/...rc/main/resources/db/migration/postgresql/V3_0__Remove_Scope_Permissions_Unique_Index.sql
@@ -0,0 +1,3 @@
+-- Remove old index that enforces unique on scope_address/grantee_address/granter_address in preparation for new index
+-- in the v3_1 migration.
+ALTER TABLE scope_permissions DROP CONSTRAINT scope_permissions_scope_address_grantee_address_granter_address;
diff --git a/...er/src/main/resources/db/migration/sqlite/V3_0__Remove_Scope_Permissions_Unique_Index.sql b/...er/src/main/resources/db/migration/sqlite/V3_0__Remove_Scope_Permissions_Unique_Index.sql
@@ -0,0 +1,3 @@
+-- Remove old index that enforces unique on scope_address/grantee_address/granter_address in preparation for new index
+-- in the v3_1 migration.
+DROP INDEX IF EXISTS scope_permissions_scope_address_grantee_address_granter_address;