From e65a928cc893b7d4236eb228664b518cf23027c8 Mon Sep 17 00:00:00 2001 From: chenson42 Date: Thu, 22 May 2014 17:19:30 +0000 Subject: [PATCH] added 2000, 2005 and 2008 to the list of compatible db types --- .../jumpmind/symmetric/io/data/DbExport.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbExport.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbExport.java index 9ea76bcf49..d44ca1b60f 100644 --- a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbExport.java +++ b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbExport.java @@ -64,8 +64,7 @@ public enum Format { }; public enum Compatible { - DB2, DERBY, FIREBIRD, GREENPLUM, H2, HSQLDB, HSQLDB2, INFORMIX, INTERBASE, - MSSQL, MYSQL, ORACLE, POSTGRES, SYBASE, SQLITE, MARIADB, ASE, SQLANYWHERE + DB2, DERBY, FIREBIRD, GREENPLUM, H2, HSQLDB, HSQLDB2, INFORMIX, INTERBASE, MSSQL, MSSQL2000, MSSQL2005, MSSQL2008, MYSQL, ORACLE, POSTGRES, SYBASE, SQLITE, MARIADB, ASE, SQLANYWHERE }; private Format format = Format.SQL; @@ -445,15 +444,17 @@ protected void startTable(Table table) { csvWriter.setUseTextQualifier(true); csvWriter.setForceQualifier(true); } else if (format == Format.SQL) { - if (table.getCatalog() != null && table.getCatalog().equals(platform.getDefaultCatalog())) { + if (table.getCatalog() != null + && table.getCatalog().equals(platform.getDefaultCatalog())) { table.setCatalog(null); } - if (table.getSchema() != null && table.getSchema().equals(platform.getDefaultSchema())) { - table.setSchema(null); + if (table.getSchema() != null + && table.getSchema().equals(platform.getDefaultSchema())) { + table.setSchema(null); } Table targetTable = table.copy(); - insertSql = DmlStatementFactory.createDmlStatement( - compatible.toString().toLowerCase(), DmlType.INSERT, targetTable, useQuotedIdentifiers); + insertSql = DmlStatementFactory.createDmlStatement(compatible.toString() + .toLowerCase(), DmlType.INSERT, targetTable, useQuotedIdentifiers); } if (!noCreateInfo) { @@ -466,7 +467,8 @@ protected void startTable(Table table) { } } - writeComment("DbExport: " + StringUtils.defaultString(IoVersion.getVersion().version())); + writeComment("DbExport: " + + StringUtils.defaultString(IoVersion.getVersion().version())); writeComment("Catalog: " + StringUtils.defaultString(getCatalogToUse())); writeComment("Schema: " + StringUtils.defaultString(getSchemaToUse())); writeComment("Table: " + table.getName()); @@ -510,8 +512,8 @@ protected void writeRow(Row row) { if (format == Format.CSV) { csvWriter.writeRecord(values, true); } else if (format == Format.SQL) { - write(insertSql.buildDynamicSql(BinaryEncoding.HEX, row, - useVariableDates, useJdbcTimestampFormat), "\n"); + write(insertSql.buildDynamicSql(BinaryEncoding.HEX, row, useVariableDates, + useJdbcTimestampFormat), "\n"); } else if (format == Format.XML) { write("\t\n");