0002315: Generated ddl should always escape ' with ''. MySQL and Post…

…gres currently do not.
JumpMind · Jul 31, 2015 · b038900 · b038900
1 parent 7afd44e
commit b038900
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 15 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java
@@ -130,6 +130,7 @@ public abstract class AbstractDdlBuilder implements IDdlBuilder {
      */
     public AbstractDdlBuilder(String databaseName) {
         this.databaseName = databaseName;
+        addEscapedCharSequence("'", "''");
     }
 
     /**

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/ase/AseDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/ase/AseDdlBuilder.java
@@ -106,7 +106,6 @@ public AseDdlBuilder() {
         databaseInfo.setAutoIncrementUpdateAllowed(false);
         databaseInfo.setRequiresAutoCommitForDdl(true);
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/db2/Db2DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/db2/Db2DdlBuilder.java
@@ -81,7 +81,6 @@ public Db2DdlBuilder() {
         databaseInfo.setBinaryQuoteStart("blob(X'");
         databaseInfo.setBinaryQuoteEnd("')");
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlBuilder.java
@@ -76,7 +76,6 @@ public DerbyDdlBuilder() {
         databaseInfo.setBlankCharColumnSpacePadded(true);
         databaseInfo.setCharColumnSpaceTrimmed(false);
         databaseInfo.setEmptyStringNulled(false);        
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlBuilder.java
@@ -91,7 +91,6 @@ public FirebirdDdlBuilder() {
 
         databaseInfo.setMinIsolationLevelToPreventPhantomReads(Connection.TRANSACTION_REPEATABLE_READ);
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/h2/H2DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/h2/H2DdlBuilder.java
@@ -84,8 +84,7 @@ public H2DdlBuilder() {
         databaseInfo.setCharColumnSpaceTrimmed(true);
         databaseInfo.setEmptyStringNulled(false);                
         databaseInfo.setNullAsDefaultValueRequired(true);
-
-        addEscapedCharSequence("'", "''");
+
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb/HsqlDbDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb/HsqlDbDdlBuilder.java
@@ -74,7 +74,6 @@ public HsqlDbDdlBuilder() {
         databaseInfo.setCharColumnSpaceTrimmed(false);
         databaseInfo.setEmptyStringNulled(false);
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb2/HsqlDb2DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb2/HsqlDb2DdlBuilder.java
@@ -78,7 +78,6 @@ public HsqlDb2DdlBuilder() {
         databaseInfo.setCharColumnSpaceTrimmed(false);
         databaseInfo.setEmptyStringNulled(false);
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlBuilder.java
@@ -95,7 +95,6 @@ public InterbaseDdlBuilder() {
         databaseInfo.setCharColumnSpaceTrimmed(false);
         databaseInfo.setEmptyStringNulled(false);
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DdlBuilder.java
@@ -135,7 +135,6 @@ protected void setup() {
         databaseInfo.setEmptyStringNulled(false);
         databaseInfo.setAutoIncrementUpdateAllowed(false);
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlBuilder.java
@@ -111,7 +111,6 @@ public MySqlDdlBuilder() {
         // already escaped sequences would be affected
         addEscapedCharSequence("\\", "\\\\");
         addEscapedCharSequence("\0", "\\0");
-        addEscapedCharSequence("'", "\\'");
         addEscapedCharSequence("\"", "\\\"");
         addEscapedCharSequence("\b", "\\b");
         addEscapedCharSequence("\n", "\\n");

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlBuilder.java
@@ -104,7 +104,6 @@ public OracleDdlBuilder() {
         databaseInfo.setCharColumnSpaceTrimmed(false);
         databaseInfo.setEmptyStringNulled(true);
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDdlBuilder.java
@@ -96,7 +96,6 @@ public PostgreSqlDdlBuilder() {
         // we need to handle the backslash first otherwise the other
         // already escaped sequences would be affected
         addEscapedCharSequence("\\", "\\\\");
-        addEscapedCharSequence("'", "\\'");
         addEscapedCharSequence("\b", "\\b");
         addEscapedCharSequence("\f", "\\f");
         addEscapedCharSequence("\n", "\\n");

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/redshift/RedshiftDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/redshift/RedshiftDdlBuilder.java
@@ -54,7 +54,6 @@ public RedshiftDdlBuilder() {
         databaseInfo.setEmptyStringNulled(false);
 
         addEscapedCharSequence("\\", "\\\\");
-        addEscapedCharSequence("'", "\\'");
         addEscapedCharSequence("\b", "\\b");
         addEscapedCharSequence("\f", "\\f");
         addEscapedCharSequence("\n", "\\n");

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlBuilder.java
@@ -99,7 +99,6 @@ public SqlAnywhereDdlBuilder() {
         databaseInfo.setRequiresAutoCommitForDdl(true);
         databaseInfo.setRequiredCharColumnEmptyStringSameAsNull(true);
 
-        addEscapedCharSequence("'", "''");
     }
 
     @Override