Fix formatting procedure parameters with spaces (RS-180392)

(cherry picked from commit cbb46a9)
red-soft-ru · May 30, 2024 · f88cb95 · f88cb95
1 parent 0e1cfd0
commit f88cb95
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/org/underworldlabs/util/SQLUtils.java b/src/org/underworldlabs/util/SQLUtils.java
@@ -687,11 +687,9 @@ public static String formattedParameters(Vector<ColumnData> tableVector, boolean
                     sb.append("(").append(cd.getSelectOperator()).append(")");
 
                 } else {
-
                     if (!variable)
                         sb.append("\t");
-                    sb.append(formattedParameter(cd));
-
+                    sb.append(formattedParameter(cd, variable));
                 }
 
                 if (variable) {
@@ -718,15 +716,11 @@ public static String formattedParameters(Vector<ColumnData> tableVector, boolean
         return sb.toString();
     }
 
-    public static String formattedParameter(ColumnData cd) {
-        return formattedParameter(cd, true);
-    }
-
-    public static String formattedParameter(ColumnData cd, boolean appendName) {
+    public static String formattedParameter(ColumnData cd, boolean variable) {
         StringBuilder sb = new StringBuilder();
 
-        if (appendName)
-            sb.append(cd.getColumnName() == null ? CreateTableSQLSyntax.EMPTY : cd.getColumnName()).append(SPACE);
+        String formattedName = variable ? cd.getColumnName() : format(cd.getColumnName(), cd.getConnection());
+        sb.append(cd.getColumnName() == null ? CreateTableSQLSyntax.EMPTY : formattedName).append(SPACE);
 
         if (MiscUtils.isNull(cd.getComputedBy())) {