#41: disable calling DomainHandler.createTable()

cristal-ise · Dec 30, 2018 · 1cb92d7 · 1cb92d7
1 parent 04af641
commit 1cb92d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/org/cristalise/storage/jooqdb/JooqClusterStorage.java b/src/main/java/org/cristalise/storage/jooqdb/JooqClusterStorage.java
@@ -20,6 +20,10 @@
  */
 package org.cristalise.storage.jooqdb;
 
+import static org.cristalise.storage.jooqdb.JooqHandler.JOOQ_DOMAIN_HANDLERS;
+import static org.cristalise.storage.jooqdb.JooqHandler.JOOQ_AUTOCOMMIT;
+import static org.cristalise.storage.jooqdb.JooqHandler.JOOQ_DISABLE_DOMAIN_CREATE;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -62,7 +66,7 @@ public class JooqClusterStorage extends TransactionalClusterStorage {
     public void open(Authenticator auth) throws PersistencyException {
         context = JooqHandler.connect();
 
-        autoCommit = Gateway.getProperties().getBoolean(JooqHandler.JOOQ_AUTOCOMMIT, false);
+        autoCommit = Gateway.getProperties().getBoolean(JOOQ_AUTOCOMMIT, false);
 
         initialiseHandlers();
     }
@@ -87,7 +91,7 @@ public void initialiseHandlers() throws PersistencyException {
         for (JooqHandler handler: jooqHandlers.values()) handler.createTables(context);
 
         try {
-            String handlers = Gateway.getProperties().getString(JooqHandler.JOOQ_DOMAIN_HANDLERS, "");
+            String handlers = Gateway.getProperties().getString(JOOQ_DOMAIN_HANDLERS, "");
 
             for(String handlerClass: StringUtils.split(handlers, ",")) {
                 if (!handlerClass.contains(".")) handlerClass = "org.cristalise.storage."+handlerClass;
@@ -103,7 +107,9 @@ public void initialiseHandlers() throws PersistencyException {
             throw new PersistencyException("JooqClusterStorage could not instantiate domain handler:"+ex.getMessage());
         }
 
-        for (JooqDomainHandler handler: domainHandlers) handler.createTables(context);
+        if (! Gateway.getProperties().getBoolean(JOOQ_DISABLE_DOMAIN_CREATE, false)) {
+            for (JooqDomainHandler handler: domainHandlers) handler.createTables(context);
+        }
     }
 
     @Override

diff --git a/src/main/java/org/cristalise/storage/jooqdb/JooqHandler.java b/src/main/java/org/cristalise/storage/jooqdb/JooqHandler.java
@@ -23,7 +23,6 @@
 import static org.jooq.impl.DSL.select;
 import static org.jooq.impl.DSL.using;
 
-import java.sql.Blob;
 import java.sql.DriverManager;
 import java.sql.Timestamp;
 import java.util.Arrays;
@@ -74,6 +73,11 @@ public abstract class JooqHandler {
      * fully qualified class names implementing the {@link JooqDomainHandler} interface.
      */
     public static final String JOOQ_DOMAIN_HANDLERS = "JOOQ.domainHandlers";
+    /**
+     * Defines the key (value:{@value}) to retrieve the boolean value to disable the invocation of
+     * {@link JooqDomainHandler#createTables(DSLContext)}. Default is 'false'
+     */
+    public static final String JOOQ_DISABLE_DOMAIN_CREATE = "JOOQ.disableDomainCreateTables";
 
     public static final DataType<UUID>           UUID_TYPE      = SQLDataType.UUID;
     public static final DataType<String>         NAME_TYPE      = SQLDataType.VARCHAR.length(64);