test(sql/postgres): bump testcontainers, truncate cascade for Postgre…

…SQL (spinnaker#820)
armory-io · Nov 13, 2020 · 0f7ba62 · 0f7ba62
1 parent 149c137
commit 0f7ba62
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/kork-sql-test/src/main/java/com/netflix/spinnaker/kork/sql/test/SqlTestUtil.java b/kork-sql-test/src/main/java/com/netflix/spinnaker/kork/sql/test/SqlTestUtil.java
@@ -265,7 +265,14 @@ public static void cleanupDb(DSLContext context) {
                     && !table.getName().equals(configuration.getDatabaseChangeLogLockTableName()))
         .forEach(
             table -> {
-              context.truncate(table.getName()).execute();
+              switch (context.dialect()) {
+                case POSTGRES:
+                  context.truncateTable(table.getName()).cascade().execute();
+                  break;
+                default:
+                  context.truncateTable(table.getName()).execute();
+                  break;
+              }
             });
     if (context.dialect() == SQLDialect.MYSQL) {
       context.execute("set foreign_key_checks=1");

diff --git a/spinnaker-dependencies/spinnaker-dependencies.gradle b/spinnaker-dependencies/spinnaker-dependencies.gradle
@@ -52,7 +52,7 @@ dependencies {
   api(platform("io.strikt:strikt-bom:0.28.0"))
   api(platform("org.spockframework:spock-bom:1.3-groovy-2.5"))
   api(platform("com.oracle.oci.sdk:oci-java-sdk-bom:1.5.17"))
-  api(platform("org.testcontainers:testcontainers-bom:1.14.3"))
+  api(platform("org.testcontainers:testcontainers-bom:1.15.0"))
   api(platform("com.google.protobuf:protobuf-bom:${versions.protobuf}"))
 
   constraints {