Used SQL that's more universal for several DBs in DBSetup

arjantijms · arjantijms · commit 24dd78da3297 · 2018-08-16T15:00:02.000+01:00
diff --git a/servlet/security-digest/src/main/java/org/javaee7/servlet/security/digest/DatabaseSetup.java b/servlet/security-digest/src/main/java/org/javaee7/servlet/security/digest/DatabaseSetup.java
@@ -40,27 +40,23 @@ public void contextInitialized(ServletContextEvent sce) {
         
         System.out.println("ha1=" + ha1);
         
-        execute(dataSource, "DROP TABLE IF EXISTS usertable");
-        execute(dataSource, "DROP TABLE IF EXISTS grouptable");
+        tryDropTables();
         
         System.out.println("Adding user u1 with group g1 to database");
         
-        execute(dataSource, "CREATE TABLE IF NOT EXISTS usertable(username VARCHAR(32) PRIMARY KEY, password VARCHAR(127))");
-        execute(dataSource, "CREATE TABLE IF NOT EXISTS grouptable(username VARCHAR(64), groupname VARCHAR(64))");
+        execute(dataSource, "CREATE TABLE usertable(username VARCHAR(32) PRIMARY KEY, password VARCHAR(127))");
+        execute(dataSource, "CREATE TABLE grouptable(username VARCHAR(64), groupname VARCHAR(64))");
         
         execute(dataSource, "INSERT INTO usertable VALUES('u1', '" + ha1 + "')");
         
         execute(dataSource, "INSERT INTO grouptable VALUES('u1', 'g1')");
+        
+        System.out.println("Done creating DB tables");
     }
     
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
-        try {
-            execute(dataSource, "DROP TABLE IF EXISTS usertable");
-            execute(dataSource, "DROP TABLE IF EXISTS grouptable");
-        } catch (Exception e) {
-        }
-        
+        tryDropTables();
     }
     
     private void execute(DataSource dataSource, String query) {
@@ -74,4 +70,18 @@ private void execute(DataSource dataSource, String query) {
         }
     }
     
+    private void tryDropTables() {
+        try {
+            execute(dataSource, "DROP TABLE IF EXISTS usertable");
+            execute(dataSource, "DROP TABLE IF EXISTS grouptable");
+        } catch (Exception e) {
+            try {
+                execute(dataSource, "DROP TABLE usertable");
+                execute(dataSource, "DROP TABLE grouptable");
+            } catch (Exception ee) {
+            }
+        }
+        
+    }
+    
 }
