Fix: verifyStartup kjører nå også på Oracle (#39)

navikt · Apr 22, 2020 · ba794b9 · ba794b9
1 parent ef94359
commit ba794b9
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 14 deletions.
diff --git a/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/ProsessTaskRepositoryImpl.java b/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/ProsessTaskRepositoryImpl.java
@@ -20,7 +20,6 @@
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
 import javax.persistence.LockModeType;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
@@ -36,6 +35,7 @@
 import no.nav.vedtak.felles.prosesstask.api.ProsessTaskStatus;
 import no.nav.vedtak.felles.prosesstask.api.ProsessTaskTypeInfo;
 import no.nav.vedtak.felles.prosesstask.api.TaskStatus;
+import no.nav.vedtak.felles.prosesstask.impl.util.DatabaseUtil;
 
 /**
  * Implementasjon av repository som er tilgjengelig for å lagre og opprette nye tasks.
@@ -363,7 +363,7 @@ private List<ProsessTaskData> tilProsessTask(List<ProsessTaskEntitet> resultList
      */
     public static String getUniktProsessTaskGruppeNavn(EntityManager entityManager) throws SQLException {
         String sqlString;
-        if (isPostgres(entityManager)) {
+        if (DatabaseUtil.isPostgres(entityManager)) {
             sqlString = "SELECT nextval('seq_prosess_task_gruppe')";
         } else {
             sqlString = "SELECT seq_prosess_task_gruppe.nextval FROM dual";
@@ -372,12 +372,7 @@ public static String getUniktProsessTaskGruppeNavn(EntityManager entityManager)
         return String.valueOf(query.getSingleResult());
     }
 
-    public static Boolean isPostgres(EntityManager entityManager) {
-        EntityManagerFactory emf = entityManager.getEntityManagerFactory();
-        Map<String, Object> emfProperties = emf.getProperties();
-        String dialect = (String) emfProperties.get("hibernate.dialect");
-        return dialect.contains("PostgreSQL");
-    }
+
 
     void flushAndClear() {
         entityManager.flush();

diff --git a/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/TaskManagerRepositoryImpl.java b/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/TaskManagerRepositoryImpl.java
@@ -35,6 +35,7 @@
 
 import no.nav.vedtak.felles.prosesstask.api.ProsessTaskData;
 import no.nav.vedtak.felles.prosesstask.api.ProsessTaskStatus;
+import no.nav.vedtak.felles.prosesstask.impl.util.DatabaseUtil;
 
 @ApplicationScoped
 public class TaskManagerRepositoryImpl {
@@ -309,12 +310,22 @@ List<ProsessTaskData> tilProsessTask(List<ProsessTaskEntitet> resultList) {
     @ActivateRequestContext
     @Transactional
     void verifyStartup() {
-
-        String sql = "select current_setting('TIMEZONE') as dbtz,"
-            + "  to_char(current_timestamp, 'YYYY-MM-DD HH24:MI:SS.US+TZ') as dbtid,"
-            + "  to_char(cast(:inputTid as timestamp with time zone), 'YYYY-MM-DD HH24:MI:SS.US+TZ') as inputtid,"
-            + "  :inputTid as inputtid2,"
-            + "  (current_timestamp - :inputTid) as drift";
+        boolean isPostgres = DatabaseUtil.isPostgres(entityManager);
+        String sql;
+        if (isPostgres){
+            sql = "select current_setting('TIMEZONE') as dbtz,"
+                    + "  to_char(current_timestamp, 'YYYY-MM-DD HH24:MI:SS.US+TZ') as dbtid,"
+                    + "  to_char(cast(:inputTid as timestamp with time zone), 'YYYY-MM-DD HH24:MI:SS.US+TZ') as inputtid,"
+                    + "  :inputTid as inputtid2,"
+                    + "  (current_timestamp - :inputTid) as drift";
+        } else {
+            sql = "select DBTIMEZONE as dbtz,"
+                    + "  to_char(current_timestamp, 'YYYY-MM-DD HH24:MI:SSxFF6+TZH:TZM') as dbtid,"
+                    + "  to_char(cast(:inputTid as timestamp with time zone), 'YYYY-MM-DD HH24:MI:SSxFF6+TZH:TZM') as inputtid,"
+                    + "  :inputTid as inputtid2,"
+                    + "  (current_timestamp - :inputTid) as drift"
+                    + " from dual";
+        }
 
         LocalDateTime now = LocalDateTime.now();
         var result = (StartupData) entityManager.createNativeQuery(sql, StartupData.class)

diff --git a/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/util/DatabaseUtil.java b/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/util/DatabaseUtil.java
@@ -0,0 +1,15 @@
+package no.nav.vedtak.felles.prosesstask.impl.util;
+
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+public class DatabaseUtil {
+    public static boolean isPostgres(EntityManager entityManager) {
+        EntityManagerFactory emf = entityManager.getEntityManagerFactory();
+        Map<String, Object> emfProperties = emf.getProperties();
+        String dialect = (String) emfProperties.get("hibernate.dialect");
+        return dialect.contains("PostgreSQL");
+    }
+}