diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDmlStatement.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDmlStatement.java index eb4abb60c2..ea4b4a539b 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDmlStatement.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDmlStatement.java @@ -44,12 +44,12 @@ protected void appendColumnQuestion(StringBuilder sql, Column column) { } @Override - protected void appendColumnEquals(StringBuilder sql, Column column, String separator) { + protected void appendColumnEquals(StringBuilder sql, Column column) { if (column.getJdbcTypeName().toUpperCase().contains(TypeMap.GEOMETRY)) { sql.append(quote).append(column.getName()).append(quote).append(" = ") - .append("geomfromtext(?)").append(separator); + .append("geomfromtext(?)"); } else { - super.appendColumnEquals(sql, column, separator); + super.appendColumnEquals(sql, column); } } diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDmlStatement.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDmlStatement.java index b30d4acaa3..9e5b6f657f 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDmlStatement.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDmlStatement.java @@ -50,16 +50,15 @@ protected void appendColumnQuestion(StringBuilder sql, Column column) { } @Override - protected void appendColumnEquals(StringBuilder sql, Column column, String separator) { + protected void appendColumnEquals(StringBuilder sql, Column column) { if (column.isTimestampWithTimezone()) { sql.append(quote).append(column.getName()).append(quote) - .append(" = TO_TIMESTAMP_TZ(?, 'YYYY-MM-DD HH24:MI:SS.FF TZH:TZM')") - .append(separator); + .append(" = TO_TIMESTAMP_TZ(?, 'YYYY-MM-DD HH24:MI:SS.FF TZH:TZM')"); } else if (column.getJdbcTypeName().toUpperCase().contains(TypeMap.GEOMETRY)) { sql.append(quote).append(column.getName()).append(quote).append(" = ") - .append("SYM_WKT2GEOM(?)").append(separator); + .append("SYM_WKT2GEOM(?)"); } else { - super.appendColumnEquals(sql, column, separator); + super.appendColumnEquals(sql, column); } } diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDmlStatement.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDmlStatement.java index 92460627a8..6f681d79dd 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDmlStatement.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDmlStatement.java @@ -129,24 +129,24 @@ protected void appendColumnQuestion(StringBuilder sql, Column column) { } @Override - protected void appendColumnEquals(StringBuilder sql, Column column, String separator) { + protected void appendColumnEquals(StringBuilder sql, Column column) { if (column.isTimestampWithTimezone()) { sql.append(quote).append(column.getName()).append(quote) - .append(" = cast(? as timestamp with time zone)").append(separator); + .append(" = cast(? as timestamp with time zone)"); } else if (column.getJdbcTypeName().toUpperCase().contains(TypeMap.UUID)) { sql.append(quote).append(column.getName()).append(quote) - .append(" = cast(? as uuid)").append(separator); + .append(" = cast(? as uuid)"); } else if (column.getJdbcTypeName().toUpperCase().contains(TypeMap.VARBIT)) { sql.append(quote).append(column.getName()).append(quote) - .append(" = cast(? as bit varying)").append(separator); + .append(" = cast(? as bit varying)"); } else if (column.getJdbcTypeName().toUpperCase().contains(TypeMap.INTERVAL)) { sql.append(quote).append(column.getName()).append(quote) - .append(" = cast(? as interval)").append(separator); + .append(" = cast(? as interval)"); } else if (column.getJdbcTypeName().toUpperCase().contains(TypeMap.GEOMETRY)) { sql.append(quote).append(column.getName()).append(quote) - .append(" = ST_GEOMFROMTEXT(?)").append(separator); + .append(" = ST_GEOMFROMTEXT(?)"); } else { - super.appendColumnEquals(sql, column, separator); + super.appendColumnEquals(sql, column); } } diff --git a/symmetric-db/src/main/java/org/jumpmind/db/sql/DmlStatement.java b/symmetric-db/src/main/java/org/jumpmind/db/sql/DmlStatement.java index 98b2a2958b..93dc9edebe 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/sql/DmlStatement.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/sql/DmlStatement.java @@ -251,7 +251,7 @@ protected void appendColumnsEquals(StringBuilder sql, Column[] columns, boolean[ sql.append(separator); } if (!nullColumns[i]) { - appendColumnEquals(sql, columns[i], separator); + appendColumnEquals(sql, columns[i]); } else { sql.append(quote).append(columns[i].getName()).append(quote) .append(" is NULL"); @@ -261,8 +261,7 @@ protected void appendColumnsEquals(StringBuilder sql, Column[] columns, boolean[ } } - protected void appendColumnEquals(StringBuilder sql, Column column, - String separator) { + protected void appendColumnEquals(StringBuilder sql, Column column) { boolean textType = TypeMap.isTextType(column.getMappedTypeCode()); if (textType && isNotBlank(textColumnExpression)) { sql.append(quote).append(column.getName()).append(quote).append(" = ").append(textColumnExpression.replace("$(columnName)", "?"));