#7930 DDL generator: extra line feeds

Former-commit-id: a336d5df

plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/generator/SQLGeneratorDDL.java

@@ -58,7 +58,7 @@ public class SQLGeneratorDDL extends SQLGenerator<DBPScriptObject> {
         } catch (DBException e) {
             throw new InvocationTargetException(e);
         }
-        result = sql.toString();
+        result = sql.toString().trim();
     }
 
     @Override

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBStructUtils.java

@@ -137,7 +137,9 @@ public final class DBStructUtils {
         if (ArrayUtils.isEmpty(singleLineComments)) {
             return "";
         }
-        return singleLineComments[0].trim() + " " + DBUtils.getObjectFullName(object, DBPEvaluationContext.DDL) + " " + comment + GeneralUtils.getDefaultLineSeparator();
+        String lf = GeneralUtils.getDefaultLineSeparator();
+        return singleLineComments[0].trim() + " " + DBUtils.getObjectFullName(object, DBPEvaluationContext.DDL) +
+            " " + comment + lf + lf;
     }
 
     private static void addDDLLine(StringBuilder sql, String ddl) {
@@ -147,8 +149,8 @@ public final class DBStructUtils {
             if (!ddl.endsWith(SQLConstants.DEFAULT_STATEMENT_DELIMITER)) {
                 sql.append(SQLConstants.DEFAULT_STATEMENT_DELIMITER);
             }
-            sql.append(GeneralUtils.getDefaultLineSeparator());
-            sql.append(GeneralUtils.getDefaultLineSeparator());
+            String lf = GeneralUtils.getDefaultLineSeparator();
+            sql.append(lf).append(lf).append(lf);
         }
     }