From 99f6eaf4592b71c5ea8d2adbaee62a2cdeb821ad Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 6 Mar 2019 22:50:43 +0300
Subject: [PATCH] #5424 DROP object comments in DDL - append delimiter

---
 .../model/impl/sql/edit/struct/SQLTableManager.java |  7 ++++++-
 .../src/org/jkiss/dbeaver/model/sql/SQLUtils.java   | 13 +++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableManager.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableManager.java
index 9917d8eefb..d78c1aabc3 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableManager.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableManager.java
@@ -190,10 +190,15 @@ public abstract class SQLTableManager<OBJECT_TYPE extends JDBCTable, CONTAINER_T
         if (isIncludeDropInDDL()) {
             actions.add(new SQLDatabasePersistActionComment(table.getDataSource(), "Drop table"));
             for (DBEPersistAction delAction : new ObjectDeleteCommand(table, ModelMessages.model_jdbc_delete_object).getPersistActions(monitor, options)) {
+                String script = delAction.getScript();
+                String delimiter = SQLUtils.getScriptLineDelimiter(SQLUtils.getDialectFromObject(table));
+                if (!script.endsWith(delimiter)) {
+                    script += delimiter;
+                }
                 actions.add(
                     new SQLDatabasePersistActionComment(
                         table.getDataSource(),
-                        delAction.getScript()));
+                        script));
             }
         }
 
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
index 2a0db205be..08ed35e7a0 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
@@ -836,10 +836,7 @@ public final class SQLUtils {
                     continue;
                 }
 
-                String delimiter = sqlDialect.getScriptDelimiter();
-                if (!delimiter.isEmpty() && Character.isLetterOrDigit(delimiter.charAt(0))) {
-                    delimiter = ' ' + delimiter;
-                }
+                String delimiter = getScriptLineDelimiter(sqlDialect);
                 if (action.isComplex() && redefiner != null) {
                     script.append(lineSeparator).append(redefiner).append(" ").append(DBEAVER_SCRIPT_DELIMITER).append(lineSeparator);
                     delimiter = DBEAVER_SCRIPT_DELIMITER;
@@ -875,6 +872,14 @@ public final class SQLUtils {
         return script.toString();
     }
 
+    public static String getScriptLineDelimiter(SQLDialect sqlDialect) {
+        String delimiter = sqlDialect.getScriptDelimiter();
+        if (!delimiter.isEmpty() && Character.isLetterOrDigit(delimiter.charAt(0))) {
+            delimiter = ' ' + delimiter;
+        }
+        return delimiter;
+    }
+
     public static String[] splitFullIdentifier(final String fullName, char nameSeparator, String[][] quoteStrings) {
         return splitFullIdentifier(fullName, String.valueOf(nameSeparator), quoteStrings, false);
     }
-- 
GitLab