Skip to content

Commit 9f5bc07

Browse files
authored
Bug/1486 OKR_Demo_DB resetted nicht richtig (#1693)
* fix(migration): add an if condition for the tenant in migration #1486 * style: add a visual border #1486 * refactor(migration): remove the useless if condition #1486
1 parent d5adae9 commit 9f5bc07

File tree

4 files changed

+5434
-5439
lines changed

4 files changed

+5434
-5439
lines changed

backend/src/main/java/ch/puzzle/okr/multitenancy/FlywayMultitenantMigrationInitializer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ch.puzzle.okr.multitenancy;
22

33
import jakarta.persistence.EntityNotFoundException;
4+
import java.util.Map;
45
import org.flywaydb.core.Flyway;
56
import org.springframework.beans.factory.annotation.Value;
67
import org.springframework.stereotype.Component;
@@ -28,6 +29,7 @@ public void migrateFlyway() {
2829
.configure() //
2930
.dataSource(dataSourceConfig.url(), dataSourceConfig.name(), dataSourceConfig.password()) //
3031
.locations(scriptLocations) //
32+
.placeholders(Map.of("tenant", tenantConfig.tenantId())) //
3133
.baselineOnMigrate(Boolean.TRUE) //
3234
.schemas(dataSourceConfig.schema()) //
3335
.load();
Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
1-
truncate table okr_acme.alignment cascade;
2-
truncate table okr_acme.action cascade;
3-
truncate table okr_acme.check_in cascade;
4-
truncate table okr_acme.key_result cascade;
5-
truncate table okr_acme.completed cascade;
6-
truncate table okr_acme.objective cascade;
7-
truncate table okr_acme.person cascade;
8-
truncate table okr_acme.quarter cascade;
9-
truncate table okr_acme.team cascade;
10-
truncate table okr_acme.person_team cascade;
11-
truncate table okr_acme.unit cascade;
1+
truncate table alignment cascade;
2+
truncate table action cascade;
3+
truncate table check_in cascade;
4+
truncate table key_result cascade;
5+
truncate table completed cascade;
6+
truncate table objective cascade;
7+
truncate table person cascade;
8+
truncate table quarter cascade;
9+
truncate table team cascade;
10+
truncate table person_team cascade;
11+
truncate table unit cascade;
1212

13-
truncate table okr_pitc.alignment cascade;
14-
truncate table okr_pitc.action cascade;
15-
truncate table okr_pitc.check_in cascade;
16-
truncate table okr_pitc.key_result cascade;
17-
truncate table okr_pitc.completed cascade;
18-
truncate table okr_pitc.objective cascade;
19-
truncate table okr_pitc.person cascade;
20-
truncate table okr_pitc.quarter cascade;
21-
truncate table okr_pitc.team cascade;
22-
truncate table okr_pitc.person_team cascade;
23-
truncate table okr_pitc.unit cascade;

0 commit comments

Comments
 (0)