fjerner flyway clean on validation error for tester ettersom det ikke…

… er støttet mot oracle
navikt · Apr 18, 2024 · 02c67bd · 02c67bd
1 parent 8b64a35
commit 02c67bd
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/test/java/no/nav/foreldrepenger/los/Databaseskjemainitialisering.java b/src/test/java/no/nav/foreldrepenger/los/Databaseskjemainitialisering.java
@@ -2,6 +2,7 @@
 
 import static java.lang.Runtime.getRuntime;
 
+import java.sql.SQLException;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -10,7 +11,6 @@
 
 import org.eclipse.jetty.plus.jndi.EnvEntry;
 import org.flywaydb.core.Flyway;
-import org.flywaydb.core.api.FlywayException;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
@@ -56,14 +56,12 @@ public static void migrerUnittestSkjemaer() {
                     throw new IllegalStateException("Forventer at denne migreringen bare kjøres lokalt");
                 }
                 flyway.migrate();
-            } catch (FlywayException fwe) {
-                try {
-                    // prøver igjen
-                    flyway.clean();
-                    flyway.migrate();
-                } catch (FlywayException fwe2) {
-                    throw new IllegalStateException("Migrering feiler", fwe2);
+                var connection = flyway.getConfiguration().getDataSource().getConnection();
+                if (!connection.isClosed()) {
+                    connection.close();
                 }
+            } catch (SQLException sqlex) {
+                // nothing to do here
             }
         }
     }