Merge remote-tracking branch 'origin/3.10' into 3.11

JumpMind · Mar 17, 2020 · 280bfd1 · 280bfd1
2 parents e214665 + 6b57e89
commit 280bfd1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java
@@ -87,15 +87,14 @@ protected String getSystemSchemaName() {
 
     @Override
     public void createRequiredDatabaseObjects() {
-        String sql = "select " + getSourceNodeExpression() + " from " + parameterService.getTablePrefix() + "_node_identity";
+        String sql = "select " + getSourceNodeExpression() + " from sysibm.sysdummy1";
         try {
             platform.getSqlTemplate().query(sql);
         } catch (Exception e) {
             log.debug("Failed checking for variable (usually means it doesn't exist yet) '" + sql + "'", e);
             platform.getSqlTemplate().update("create variable " + getSourceNodeExpression() + " varchar(50)");
         }
-        sql = "select " + parameterService.getTablePrefix() + VAR_TRIGGER_DISABLED + " from " + parameterService.getTablePrefix()
-                + "_node_identity";
+        sql = "select " + parameterService.getTablePrefix() + VAR_TRIGGER_DISABLED + " from sysibm.sysdummy1";
         try {
             platform.getSqlTemplate().query(sql);
         } catch (Exception e) {

diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java
@@ -213,6 +213,11 @@ public void createRequiredDatabaseObjects() {
                     + "    END $(functionName);                           \r\n";
             install(sql, wkt2geom);
         }
+    }
+
+    @Override
+    public boolean createOrAlterTablesIfNecessary(String... tableNames) {
+        boolean isAltered = super.createOrAlterTablesIfNecessary(tableNames);
 
         boolean isNoOrder = parameterService.is(ParameterConstants.DBDIALECT_ORACLE_SEQUENCE_NOORDER, false);
         String seqName = getSequenceName(SequenceIdentifier.DATA).toUpperCase();
@@ -228,8 +233,9 @@ public void createRequiredDatabaseObjects() {
             log.info("DDL applied: " + sql);
             platform.getSqlTemplate().update(sql);
         }
+        return isAltered;
     }
-
+    
     @Override
     public void dropRequiredDatabaseObjects() {
         String blobToClob = this.parameterService.getTablePrefix() + "_" + "blob2clob";

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java
@@ -156,8 +156,8 @@ public void verifyDatabaseIsCompatible() {
     }
 
     public void initTablesAndDatabaseObjects() {
-        createOrAlterTablesIfNecessary();
         createRequiredDatabaseObjects();
+        createOrAlterTablesIfNecessary();
         platform.resetCachedTableModel();
     }