Add StringUtils.quoteStringSQL(StringBuilder, String)

h2/src/main/org/h2/command/dml/ScriptCommand.java

@@ -490,7 +490,7 @@ public class ScriptCommand extends ScriptBase {
                     if (len == 0) {
                         break;
                     }
-                    buff.append(StringUtils.quoteStringSQL(new String(chars, 0, len))).
+                    StringUtils.quoteStringSQL(buff, new String(chars, 0, len)).
                         append(", NULL)");
                     String sql = buff.toString();
                     add(sql, true);

h2/src/main/org/h2/constraint/ConstraintCheck.java

@@ -56,7 +56,8 @@ public class ConstraintCheck extends Constraint {
         }
         buff.append(quotedName);
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff, comment);
         }
         buff.append(" CHECK(");
         expr.getUnenclosedSQL(buff).append(") NOCHECK");

h2/src/main/org/h2/constraint/ConstraintReferential.java

@@ -87,7 +87,8 @@ public class ConstraintReferential extends Constraint {
         }
         buff.append(quotedName);
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff.builder(), comment);
         }
         IndexColumn[] cols = columns;
         IndexColumn[] refCols = refColumns;

h2/src/main/org/h2/constraint/ConstraintUnique.java

@@ -52,7 +52,8 @@ public class ConstraintUnique extends Constraint {
         }
         buff.append(quotedName);
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff.builder(), comment);
         }
         buff.append(' ').append(getConstraintType().getSqlName()).append('(');
         for (IndexColumn c : columns) {

h2/src/main/org/h2/engine/Comment.java

@@ -74,7 +74,7 @@ public class Comment extends DbObjectBase {
         if (commentText == null) {
             buff.append("NULL");
         } else {
-            buff.append(StringUtils.quoteStringSQL(commentText));
+            StringUtils.quoteStringSQL(buff, commentText);
         }
         return buff.toString();
     }

h2/src/main/org/h2/engine/FunctionAlias.java

@@ -223,7 +223,8 @@ public class FunctionAlias extends SchemaObjectBase {
             buff.append(" NOBUFFER");
         }
         if (source != null) {
-            buff.append(" AS ").append(StringUtils.quoteStringSQL(source));
+            buff.append(" AS ");
+            StringUtils.quoteStringSQL(buff, source);
         } else {
             buff.append(" FOR ").append(Parser.quoteIdentifier(
                     className + "." + methodName));

h2/src/main/org/h2/engine/User.java

@@ -159,7 +159,8 @@ public class User extends RightOwner {
         StringBuilder buff = new StringBuilder("CREATE USER IF NOT EXISTS ");
         buff.append(getSQL());
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff, comment);
         }
         if (password) {
             buff.append(" SALT '").

h2/src/main/org/h2/index/BaseIndex.java

@@ -410,7 +410,8 @@ public abstract class BaseIndex extends SchemaObjectBase implements Index {
         buff.append(quotedName);
         buff.append(" ON ").append(targetTable.getSQL());
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff, comment);
         }
         buff.append('(').append(getColumnListSQL()).append(')');
         return buff.toString();

h2/src/main/org/h2/schema/TriggerObject.java

@@ -347,7 +347,8 @@ public class TriggerObject extends SchemaObjectBase {
         if (triggerClassName != null) {
             buff.append(" CALL ").append(Parser.quoteIdentifier(triggerClassName));
         } else {
-            buff.append(" AS ").append(StringUtils.quoteStringSQL(triggerSource));
+            buff.append(" AS ");
+            StringUtils.quoteStringSQL(buff, triggerSource);
         }
         return buff.toString();
     }

h2/src/main/org/h2/table/Column.java

@@ -573,7 +573,8 @@ public class Column {
             buff.append(" SELECTIVITY ").append(selectivity);
         }
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff, comment);
         }
         if (checkConstraint != null) {
             buff.append(" CHECK ").append(checkConstraintSQL);

h2/src/main/org/h2/table/LinkSchema.java

@@ -71,19 +71,13 @@ public class LinkSchema {
                     append(StringUtils.quoteIdentifier(targetSchema)).
                     append('.').
                     append(StringUtils.quoteIdentifier(table)).
-                    append('(').
-                    append(StringUtils.quoteStringSQL(driver)).
-                    append(", ").
-                    append(StringUtils.quoteStringSQL(url)).
-                    append(", ").
-                    append(StringUtils.quoteStringSQL(user)).
-                    append(", ").
-                    append(StringUtils.quoteStringSQL(password)).
-                    append(", ").
-                    append(StringUtils.quoteStringSQL(sourceSchema)).
-                    append(", ").
-                    append(StringUtils.quoteStringSQL(table)).
-                    append(')');
+                    append('(');
+                StringUtils.quoteStringSQL(buff, driver).append(", ");
+                StringUtils.quoteStringSQL(buff, url).append(", ");
+                StringUtils.quoteStringSQL(buff, user).append(", ");
+                StringUtils.quoteStringSQL(buff, password).append(", ");
+                StringUtils.quoteStringSQL(buff, sourceSchema).append(", ");
+                StringUtils.quoteStringSQL(buff, table).append(')');
                 stat.execute(buff.toString());
                 result.addRow(table);
             }

h2/src/main/org/h2/table/TableBase.java

@@ -108,7 +108,8 @@ public abstract class TableBase extends Table {
         }
         buff.append(getSQL());
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff.builder(), comment);
         }
         buff.append("(\n    ");
         for (Column column : columns) {

h2/src/main/org/h2/table/TableLink.java

@@ -372,19 +372,15 @@ public class TableLink extends Table {
         }
         buff.append("LINKED TABLE ").append(getSQL());
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
-        }
-        buff.append('(').
-            append(StringUtils.quoteStringSQL(driver)).
-            append(", ").
-            append(StringUtils.quoteStringSQL(url)).
-            append(", ").
-            append(StringUtils.quoteStringSQL(user)).
-            append(", ").
-            append(StringUtils.quoteStringSQL(password)).
-            append(", ").
-            append(StringUtils.quoteStringSQL(originalTable)).
-            append(')');
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff, comment);
+        }
+        buff.append('(');
+        StringUtils.quoteStringSQL(buff, driver).append(", ");
+        StringUtils.quoteStringSQL(buff, url).append(", ");
+        StringUtils.quoteStringSQL(buff, user).append(", ");
+        StringUtils.quoteStringSQL(buff, password).append(", ");
+        StringUtils.quoteStringSQL(buff, originalTable).append(')');
         if (emitUpdates) {
             buff.append(" EMIT UPDATES");
         }

h2/src/main/org/h2/table/TableView.java

@@ -348,7 +348,8 @@ public class TableView extends Table {
         }
         buff.append(quotedName);
         if (comment != null) {
-            buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
+            buff.append(" COMMENT ");
+            StringUtils.quoteStringSQL(buff.builder(), comment);
         }
         if (columns != null && columns.length > 0) {
             buff.append('(');

h2/src/main/org/h2/util/StringUtils.java

@@ -121,22 +121,40 @@ public class StringUtils {
         if (s == null) {
             return "NULL";
         }
+        return quoteStringSQL(new StringBuilder(s.length() + 2), s).toString();
+    }
+
+    /**
+     * Convert a string to a SQL literal. Null is converted to NULL. The text is
+     * enclosed in single quotes. If there are any special characters, the
+     * method STRINGDECODE is used.
+     *
+     * @param builder
+     *            string builder to append result to
+     * @param s the text to convert.
+     * @return the specified string builder
+     */
+    public static StringBuilder quoteStringSQL(StringBuilder builder, String s) {
+        if (s == null) {
+            return builder.append("NULL");
+        }
+        int builderLength = builder.length();
         int length = s.length();
-        StringBuilder buff = new StringBuilder(length + 2);
-        buff.append('\'');
+        builder.append('\'');
         for (int i = 0; i < length; i++) {
             char c = s.charAt(i);
             if (c == '\'') {
-                buff.append(c);
+                builder.append(c);
             } else if (c < ' ' || c > 127) {
                 // need to start from the beginning because maybe there was a \
                 // that was not quoted
-                return "STRINGDECODE(" + quoteStringSQL(javaEncode(s)) + ")";
+                builder.setLength(builderLength);
+                builder.append("STRINGDECODE(");
+                return quoteStringSQL(builder, javaEncode(s)).append(')');
             }
-            buff.append(c);
+            builder.append(c);
         }
-        buff.append('\'');
-        return buff.toString();
+        return builder.append('\'');
     }
 
     /**
@@ -321,7 +339,9 @@ public class StringUtils {
         if (s == null) {
             return "null";
         }
-        return "\"" + javaEncode(s) + "\"";
+        StringBuilder builder = new StringBuilder(s.length() + 2).append('"');
+        javaEncode(s, builder);
+        return builder.append('"').toString();
     }
 
     /**

h2/src/main/org/h2/value/ValueEnumBase.java

@@ -95,7 +95,7 @@ public class ValueEnumBase extends Value {
 
     @Override
     public StringBuilder getSQL(StringBuilder builder) {
-        return builder.append(StringUtils.quoteStringSQL(label));
+        return StringUtils.quoteStringSQL(builder, label);
     }
 
     @Override

h2/src/main/org/h2/value/ValueLob.java

@@ -572,7 +572,7 @@ public class ValueLob extends Value {
     @Override
     public StringBuilder getSQL(StringBuilder builder) {
         if (valueType == Value.CLOB) {
-            builder.append(StringUtils.quoteStringSQL(getString()));
+            StringUtils.quoteStringSQL(builder, getString());
         } else {
             builder.append("X'").append(StringUtils.convertBytesToHex(getBytes())).append('\'');
         }

h2/src/main/org/h2/value/ValueLobDb.java

@@ -463,7 +463,7 @@ public class ValueLobDb extends Value {
     @Override
     public StringBuilder getSQL(StringBuilder builder) {
         if (valueType == Value.CLOB) {
-            builder.append(StringUtils.quoteStringSQL(getString()));
+            StringUtils.quoteStringSQL(builder, getString());
         } else {
             builder.append("X'").append(StringUtils.convertBytesToHex(getBytes())).append('\'');
         }

h2/src/main/org/h2/value/ValueString.java

@@ -35,7 +35,7 @@ public class ValueString extends Value {
 
     @Override
     public StringBuilder getSQL(StringBuilder builder) {
-        return builder.append(StringUtils.quoteStringSQL(value));
+        return StringUtils.quoteStringSQL(builder, value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueStringIgnoreCase.java

@@ -48,7 +48,8 @@ public class ValueStringIgnoreCase extends ValueString {
 
     @Override
     public StringBuilder getSQL(StringBuilder builder) {
-        return builder.append("CAST(").append(StringUtils.quoteStringSQL(value)).append(" AS VARCHAR_IGNORECASE)");
+        builder.append("CAST(");
+        return StringUtils.quoteStringSQL(builder, value).append(" AS VARCHAR_IGNORECASE)");
     }
 
     /**