Centralize SQL String Constant Formatting

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/StringConstant.java

@@ -20,6 +20,7 @@
 
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 
 public class StringConstant implements BindableColumn<String> {
 
@@ -42,8 +43,7 @@ public Optional<String> alias() {
 
     @Override
     public FragmentAndParameters render(RenderingContext renderingContext) {
-        String escaped = value.replace("'", "''"); //$NON-NLS-1$ //$NON-NLS-2$
-        return FragmentAndParameters.fromFragment("'" + escaped + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+        return FragmentAndParameters.fromFragment(StringUtilities.formatConstantForSQL(value));
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertValuePhraseVisitor.java

@@ -25,6 +25,7 @@
 import org.mybatis.dynamic.sql.util.GeneralInsertMappingVisitor;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 import org.mybatis.dynamic.sql.util.ValueMapping;
 import org.mybatis.dynamic.sql.util.ValueOrNullMapping;
 import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;
@@ -52,7 +53,7 @@ public Optional<FieldAndValueAndParameters> visit(ConstantMapping mapping) {
     @Override
     public Optional<FieldAndValueAndParameters> visit(StringConstantMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.columnName())
-                .withValuePhrase("'" + mapping.constant() + "'") //$NON-NLS-1$ //$NON-NLS-2$
+                .withValuePhrase(StringUtilities.formatConstantForSQL(mapping.constant()))
                 .buildOptional();
     }
 

src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowValuePhraseVisitor.java

@@ -23,6 +23,7 @@
 import org.mybatis.dynamic.sql.util.PropertyMapping;
 import org.mybatis.dynamic.sql.util.RowMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 
 public class MultiRowValuePhraseVisitor extends MultiRowInsertMappingVisitor<FieldAndValueAndParameters> {
     protected final RenderingStrategy renderingStrategy;
@@ -50,7 +51,7 @@ public FieldAndValueAndParameters visit(ConstantMapping mapping) {
     @Override
     public FieldAndValueAndParameters visit(StringConstantMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.columnName())
-                .withValuePhrase("'" + mapping.constant() + "'") //$NON-NLS-1$ //$NON-NLS-2$
+                .withValuePhrase(StringUtilities.formatConstantForSQL(mapping.constant()))
                 .build();
     }
 

src/main/java/org/mybatis/dynamic/sql/insert/render/ValuePhraseVisitor.java

@@ -26,6 +26,7 @@
 import org.mybatis.dynamic.sql.util.PropertyWhenPresentMapping;
 import org.mybatis.dynamic.sql.util.RowMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 
 public class ValuePhraseVisitor extends InsertMappingVisitor<Optional<FieldAndValueAndParameters>> {
 
@@ -52,7 +53,7 @@ public Optional<FieldAndValueAndParameters> visit(ConstantMapping mapping) {
     @Override
     public Optional<FieldAndValueAndParameters> visit(StringConstantMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.columnName())
-                .withValuePhrase("'" + mapping.constant() + "'") //$NON-NLS-1$ //$NON-NLS-2$
+                .withValuePhrase(StringUtilities.formatConstantForSQL(mapping.constant()))
                 .buildOptional();
     }
 

src/main/java/org/mybatis/dynamic/sql/update/render/SetPhraseVisitor.java

@@ -29,6 +29,7 @@
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.SelectMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 import org.mybatis.dynamic.sql.util.UpdateMappingVisitor;
 import org.mybatis.dynamic.sql.util.ValueMapping;
 import org.mybatis.dynamic.sql.util.ValueOrNullMapping;
@@ -58,9 +59,8 @@ public Optional<FragmentAndParameters> visit(ConstantMapping mapping) {
     @Override
     public Optional<FragmentAndParameters> visit(StringConstantMapping mapping) {
         String fragment = mapping.mapColumn(renderingContext::aliasedColumnName)
-                + " = '" //$NON-NLS-1$
-                + mapping.constant()
-                + "'"; //$NON-NLS-1$
+                + " = " //$NON-NLS-1$
+                + StringUtilities.formatConstantForSQL(mapping.constant());
 
         return FragmentAndParameters.withFragment(fragment)
                 .buildOptional();

src/main/java/org/mybatis/dynamic/sql/util/StringUtilities.java

@@ -52,4 +52,10 @@ static String toCamelCase(String inputString) {
 
         return sb.toString();
     }
+
+    static String formatConstantForSQL(String in) {
+        String escaped = in.replace("'", "''"); //$NON-NLS-1$ //$NON-NLS-2$
+        return "'" + escaped + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+
+    }
 }