0005942: SQLAnywhere DDL problems with dropping indexes and triggers,

and trigger syntax issue for version 11 and earlier
JumpMind · Jul 31, 2023 · 30fc2d1 · 30fc2d1
1 parent ebbdbbd
commit 30fc2d1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/...ent/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhere12TriggerTemplate.java b/...ent/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhere12TriggerTemplate.java
@@ -182,4 +182,8 @@ public SqlAnywhere12TriggerTemplate(ISymmetricDialect symmetricDialect) {
         sqlTemplates.put("initialLoadSqlTemplate",
                 "select $(columns) from $(schemaName)$(tableName) t where $(whereClause)                                                                                                                                ");
     }
+
+    protected String appendSemicolonAfterDeclare() {
+        return ";";
+    }
 }
diff --git a/...ient/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhereSymmetricDialect.java b/...ient/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhereSymmetricDialect.java
@@ -26,6 +26,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import org.apache.commons.lang3.StringUtils;
 import org.jumpmind.db.model.Table;
 import org.jumpmind.db.platform.IDatabasePlatform;
 import org.jumpmind.db.sql.IConnectionCallback;
@@ -136,10 +137,10 @@ public void dropRequiredDatabaseObjects() {
     @Override
     public void removeTrigger(StringBuilder sqlBuffer, final String catalogName, String schemaName,
             final String triggerName, String tableName, ISqlTransaction transaction) {
-        final String sql = "drop trigger " + schemaName + "." + tableName + "." + triggerName;
+        final String sql = "drop trigger " + (StringUtils.isBlank(schemaName) ? platform.getDefaultSchema() : schemaName) + "." + tableName + "." + triggerName;
         logSql(sql, sqlBuffer);
         if (parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) {
-            log.info("Dropping {} trigger for {}", triggerName, schemaName + "." + tableName + "." + triggerName);
+            log.info("Dropping {} trigger for {}", triggerName, (StringUtils.isBlank(schemaName) ? platform.getDefaultSchema() : schemaName) + "." + tableName + "." + triggerName);
             ((JdbcSqlTransaction) transaction)
                     .executeCallback(new IConnectionCallback<Boolean>() {
                         public Boolean execute(Connection con) throws SQLException {

diff --git a/...lient/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhereTriggerTemplate.java b/...lient/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhereTriggerTemplate.java
@@ -280,8 +280,12 @@ protected String buildKeyVariablesDeclare(Column[] columns, String prefix) {
                     throw new NotImplementedException(columns[i] + " is of type "
                             + columns[i].getMappedType());
             }
-            text += ";";
+            text += appendSemicolonAfterDeclare();
         }
         return text;
     }
+
+    protected String appendSemicolonAfterDeclare() {
+        return "";
+    }
 }
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlBuilder.java
@@ -193,7 +193,7 @@ protected void writeExternalForeignKeyDropStmt(Table table, ForeignKey foreignKe
     @Override
     public void writeExternalIndexDropStmt(Table table, IIndex index, StringBuilder ddl) {
         ddl.append("DROP INDEX ");
-        ddl.append(getFullyQualifiedTableNameShorten(table));
+        ddl.append(table.getSchema()).append(".").append(table.getName());
         ddl.append(".");
         printIdentifier(getIndexName(index), ddl);
         printEndOfStatement(ddl);