Skip to content

Commit

Permalink
minor sqlite fix and unit test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenson42
chenson42 committed Jun 7, 2013
1 parent e4bddf5 commit 27826e0
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 38 deletions.
91 changes: 55 additions & 36 deletions symmetric-client/src/test/java/org/jumpmind/symmetric/DbExportImportTest.java
View file
Expand Up @@ -47,6 +47,7 @@
import org.jumpmind.symmetric.io.data.DbImport;
import org.jumpmind.symmetric.io.data.writer.ConflictException;
import org.jumpmind.symmetric.service.impl.AbstractServiceTest;
import org.jumpmind.util.FormatUtils;
import org.junit.BeforeClass;
import org.junit.Test;

Expand All @@ -55,60 +56,61 @@ public class DbExportImportTest extends AbstractServiceTest {
private static final String SELECT_FROM_TEST_DB_IMPORT_1_ORDER_BY_ID = "select * from test_db_import_1 order by id";

private static final String TEST_TS_W_TZ = "test_ts_w_tz";

protected static IDatabasePlatform platform;

@BeforeClass
public static void setup() throws Exception {
public static void setup() throws Exception {
File f = new File("target/rootdbs");
FileUtils.deleteDirectory(f);
f.mkdir();
AbstractServiceTest.setup();

}

@Test
public void testInsertBigIntIntoOracleIntField() {
if (getPlatform().getName().equals(DatabaseNamesConstants.ORACLE)) {
ISymmetricEngine engine = getSymmetricEngine();
IDatabasePlatform platform = engine.getDatabasePlatform();

Table table = new Table("TEST_ORACLE_INTEGER");
table.addColumn(new Column("A", false, Types.INTEGER, -1, -1));
platform.alterCaseToMatchDatabaseDefaultCase(table);
platform.createTables(true, false, table);

DbImport importer = new DbImport(platform);
importer.setFormat(DbImport.Format.CSV);
importer.importTables("\"A\"\n1149140000100490", table.getName());

Assert.assertEquals(1149140000100490l,platform.getSqlTemplate().queryForLong("select A from TEST_ORACLE_INTEGER"));

Assert.assertEquals(1149140000100490l,
platform.getSqlTemplate().queryForLong("select A from TEST_ORACLE_INTEGER"));
}
}

@Test
public void exportNullTimestampToCsv() throws Exception {
@Test
public void exportNullTimestampToCsv() throws Exception {
ISymmetricEngine engine = getSymmetricEngine();
IDatabasePlatform platform = engine.getDatabasePlatform();

Table table = new Table("test_null_timestamp");
table.addColumn(new Column("a", false, Types.TIMESTAMP, -1, -1));
table.addColumn(new Column("b", false, Types.TIMESTAMP, -1, -1));
platform.alterCaseToMatchDatabaseDefaultCase(table);
platform.createTables(true, false, table);

platform.getSqlTemplate().update("insert into test_null_timestamp values(null, null)");

DbExport export = new DbExport(platform);
export.setNoCreateInfo(true);
export.setFormat(Format.CSV);
String csv = export.exportTables(new Table[] {table});

String csv = export.exportTables(new Table[] { table });

Assert.assertEquals("\"A\",\"B\"\n,", csv.trim().toUpperCase());

}

@Test
public void exportTableInAnotherSchemaOnH2() throws Exception {
if (getPlatform().getName().equals(DatabaseNamesConstants.H2)) {
Expand All @@ -128,7 +130,7 @@ public void exportTableInAnotherSchemaOnH2() throws Exception {
export.exportTables(new String[] { "TEST" }).toLowerCase();
// TODO validate
}
}
}

@Test
public void exportTestDatabaseSQL() throws Exception {
Expand All @@ -147,8 +149,11 @@ public void exportTestDatabaseSQL() throws Exception {
String output = export.exportTables(tables).toLowerCase();

Assert.assertEquals(output, 40, StringUtils.countMatches(output, "create table \"sym_"));
Assert.assertEquals(38,
StringUtils.countMatches(output, "varchar(" + Integer.MAX_VALUE + ")"));
final int EXPECTED_VARCHAR_MAX = engine.getDatabasePlatform().getName().equals(DatabaseNamesConstants.SQLITE) ? 243 : 38;
final String EXPECTED_STRING = "varchar(" + Integer.MAX_VALUE + ")";
Assert.assertEquals("Expected " + EXPECTED_VARCHAR_MAX + " " + EXPECTED_STRING
+ " in the following output: " + output, EXPECTED_VARCHAR_MAX,
StringUtils.countMatches(output, EXPECTED_STRING));
}

@Test
Expand Down Expand Up @@ -191,12 +196,14 @@ public void testExportTimestampWithTimeZone() throws Exception {
export.setFormat(Format.SQL);
String sql = export.exportTables(new String[] { TEST_TS_W_TZ });
final String EXPECTED_POSTGRES = "insert into \"test_ts_w_tz\"(\"id\", \"tz\") (select 1,cast('1973-06-08 07:00:00.000000 -04:00' as timestamp with time zone) where (select distinct 1 from \"test_ts_w_tz\" where \"id\" = 1) is null);";
Assert.assertTrue("Expected the following sql:\n" +sql + "\n\n to contain:\n" +EXPECTED_POSTGRES, sql.contains(EXPECTED_POSTGRES));

Assert.assertTrue("Expected the following sql:\n" + sql + "\n\n to contain:\n"
+ EXPECTED_POSTGRES, sql.contains(EXPECTED_POSTGRES));

export.setCompatible(Compatible.ORACLE);
sql = export.exportTables(new String[] { TEST_TS_W_TZ });
final String EXPECTED_ORACLE = "insert into \"test_ts_w_tz\" (\"id\", \"tz\") values (1,TO_TIMESTAMP_TZ('1973-06-08 07:00:00.000000 -04:00', 'YYYY-MM-DD HH24:MI:SS.FF TZH:TZM'));";
Assert.assertTrue("Expected the following sql:\n" +sql + "\n\n to contain:\n" +EXPECTED_ORACLE, sql.contains(EXPECTED_ORACLE));
Assert.assertTrue("Expected the following sql:\n" + sql + "\n\n to contain:\n"
+ EXPECTED_ORACLE, sql.contains(EXPECTED_ORACLE));

}
}
Expand All @@ -212,12 +219,14 @@ protected boolean createAndFillTimestampWithTimeZoneTable() {
template.update(String.format("drop table \"%s\"", TEST_TS_W_TZ));
} catch (Exception ex) {
}
String createSql = String.format(
"create table \"%s\" (\"id\" integer, \"tz\" timestamp with time zone, primary key (\"id\"))",
TEST_TS_W_TZ);
template.update(createSql);
DmlStatement statement = platform.createDmlStatement(DmlType.INSERT, platform.getTableFromCache(TEST_TS_W_TZ, true));
template.update(statement.getSql(), statement.getValueArray(new Object[] {1, "1973-06-08 07:00:00.000 -04:00"}, new Object[] {1}));
String createSql = String
.format("create table \"%s\" (\"id\" integer, \"tz\" timestamp with time zone, primary key (\"id\"))",
TEST_TS_W_TZ);
template.update(createSql);
DmlStatement statement = platform.createDmlStatement(DmlType.INSERT,
platform.getTableFromCache(TEST_TS_W_TZ, true));
template.update(statement.getSql(), statement.getValueArray(new Object[] { 1,
"1973-06-08 07:00:00.000 -04:00" }, new Object[] { 1 }));
return true;
} else {
return false;
Expand Down Expand Up @@ -365,7 +374,7 @@ public void exportThenImportCsv() throws Exception {
table.getName(), null, table.getColumns(), false, null, null);
Assert.assertEquals(RECORD_COUNT, sqlTemplate.queryForInt(dml.getSql()));

compareRows(rowsBeforeImport, sqlTemplate.query(SELECT_FROM_TEST_DB_IMPORT_1_ORDER_BY_ID));
compareRows(table, rowsBeforeImport, sqlTemplate.query(SELECT_FROM_TEST_DB_IMPORT_1_ORDER_BY_ID));

// TODO test error

Expand All @@ -375,7 +384,7 @@ public void exportThenImportCsv() throws Exception {

// TODO test force
}

@Test
public void exportThenImportCsvWithBackslashes() throws Exception {
ISymmetricEngine engine = getSymmetricEngine();
Expand All @@ -384,7 +393,7 @@ public void exportThenImportCsvWithBackslashes() throws Exception {
Table table = testTables.findTable("test_db_import_1", false);

recreateImportTable();

DbImport importCsv = new DbImport(platform);
importCsv.setFormat(DbImport.Format.SQL);
importCsv.importTables(getClass().getResourceAsStream("/test-dbimport-1-backslashes.sql"));
Expand All @@ -406,9 +415,9 @@ public void exportThenImportCsvWithBackslashes() throws Exception {
importCsv.setFormat(DbImport.Format.CSV);
importCsv.importTables(csvOutput, table.getName());

compareRows(rowsBeforeImport, sqlTemplate.query(SELECT_FROM_TEST_DB_IMPORT_1_ORDER_BY_ID));
compareRows(table, rowsBeforeImport, sqlTemplate.query(SELECT_FROM_TEST_DB_IMPORT_1_ORDER_BY_ID));

}
}

@Test
public void testExportCsvToDirectory() throws Exception {
Expand Down Expand Up @@ -462,7 +471,7 @@ public void testExportCsvToDirectory() throws Exception {

}

protected void compareRows(List<Row> one, List<Row> two) {
protected void compareRows(Table table, List<Row> one, List<Row> two) {
if (one.size() != two.size()) {
Assert.fail("First list had " + one.size() + " and second list had " + two.size());
}
Expand All @@ -471,7 +480,17 @@ protected void compareRows(List<Row> one, List<Row> two) {
Row rTwo = two.get(i);
Set<String> keys = rOne.keySet();
for (String key : keys) {
if (!ObjectUtils.equals(rOne.get(key), rTwo.get(key))) {
Object oOne = rOne.get(key);
Object oTwo = rTwo.get(key);
Column column = table.getColumnWithName(key);
// special comparison for sqlite. the result reports all types as text
// even though the jdbc table metadata reports the types as dates
if (column != null && (column.getMappedType().equals("DATE") || column.getMappedType().equals("TIME") || column.getMappedType().equals("TIMESTAMP"))
&& oOne instanceof String && oTwo instanceof String) {
oOne = FormatUtils.parseDate(oOne.toString(), FormatUtils.TIMESTAMP_PATTERNS);
oTwo = FormatUtils.parseDate(oTwo.toString(), FormatUtils.TIMESTAMP_PATTERNS);
}
if (!ObjectUtils.equals(oOne, oTwo)) {
Assert.fail("The " + i + " element was not the same. The column " + key
+ " had a value of " + rOne.get(key) + " for one row and "
+ rTwo.get(key) + " for the other");
Expand Down
33 changes: 33 additions & 0 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteSymmetricDialect.java
View file
Expand Up @@ -20,11 +20,14 @@
*/
package org.jumpmind.symmetric.db.sqlite;

import org.jumpmind.db.model.Table;
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.sql.SqlException;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.service.IParameterService;
import org.jumpmind.util.AppUtils;

public class SqliteSymmetricDialect extends AbstractSymmetricDialect {

Expand Down Expand Up @@ -110,4 +113,34 @@ public boolean isTransactionIdOverrideSupported() {
return false;
}

@Override
public void truncateTable(String tableName) {
String quote = platform.getDdlBuilder().isDelimitedIdentifierModeOn() ? platform
.getDatabaseInfo().getDelimiterToken() : "";
boolean success = false;
int tryCount = 5;
while (!success && tryCount > 0) {
try {
Table table = platform.getTableFromCache(tableName, false);
if (table != null) {
platform.getSqlTemplate().update(
String.format("delete from %s%s%s", quote, table.getName(), quote));
success = true;
} else {
throw new RuntimeException(String.format("Could not find %s to trunate",
tableName));
}
} catch (SqlException ex) {
log.warn(ex.getMessage(), ex);
AppUtils.sleep(5000);
tryCount--;
}
}
}

@Override
public boolean canGapsOccurInCapturedDataIds() {
return false;
}

}
2 changes: 1 addition & 1 deletion ...ric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractRouterServiceTest.java
View file
Expand Up @@ -512,7 +512,7 @@ public void testBshRoutingDeletesToNode3() {
TriggerRouter trigger1 = getTestRoutingTableTrigger(TEST_TABLE_1);
trigger1.getRouter().setRouterType("bsh");
trigger1.getRouter().setRouterExpression(
"targetNodes.add(ROUTING_VARCHAR); targetNodes.add(OLD_ROUTING_VARCHAR);");
"targetNodes.add(ROUTING_VARCHAR); if (OLD_ROUTING_VARCHAR != void) { targetNodes.add(OLD_ROUTING_VARCHAR); }");
getTriggerRouterService().saveTriggerRouter(trigger1);
getTriggerRouterService().syncTriggers();
NodeChannel testChannel = getConfigurationService().getNodeChannel(
Expand Down
11 changes: 10 additions & 1 deletion symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbFill.java
View file
Expand Up @@ -23,6 +23,7 @@
import java.math.BigDecimal;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
Expand All @@ -34,6 +35,7 @@

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.jumpmind.db.model.Column;
import org.jumpmind.db.model.Database;
import org.jumpmind.db.model.ForeignKey;
Expand Down Expand Up @@ -546,7 +548,9 @@ private Object generateRandomValueForColumn(Column column) {
objectValue = String.format("%s %s",
FormatUtils.TIMESTAMP_FORMATTER.format(randomDate()),
AppUtils.getTimezoneOffset());
} else if (type == Types.DATE || type == Types.TIMESTAMP || type == Types.TIME) {
} else if (type == Types.DATE) {
objectValue = DateUtils.truncate(randomDate(), Calendar.DATE);
} else if (type == Types.TIMESTAMP || type == Types.TIME) {
objectValue = randomDate();
} else if (type == Types.CHAR) {
objectValue = randomChar().toString();
Expand Down Expand Up @@ -633,6 +637,11 @@ private boolean randomBoolean() {
}

private BigDecimal randomBigDecimal(int size, int digits) {
if (size == 0 && digits == 0) {
// set the values to something reasonable
size = 10;
digits = 6;
}
Random rnd = getRand();
StringBuilder str = new StringBuilder();
if (size>0 && rnd.nextBoolean()) {
Expand Down
1 change: 1 addition & 0 deletions symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java
View file
Expand Up @@ -916,6 +916,7 @@ protected String preprocessSqlStatement(CsvData data) {
sql = FormatUtils.replace("tableName", quoteString(sourceTable.getName()), sql);
}

sql = platform.scrubSql(sql);
// sql = FormatUtils.replace("groupId", node.getNodeGroupId(), sql);
// sql = FormatUtils.replace("externalId", node.getExternalId(), sql);

Expand Down

0 comments on commit 27826e0

Please sign in to comment.