drop any tables in the test db.

JumpMind · Apr 16, 2012 · 2334cc3 · 2334cc3
1 parent fb94a5a
commit 2334cc3
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/symmetric/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java b/symmetric/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java
@@ -58,20 +58,22 @@ protected static void dropAndCreateDatabaseTables(String databaseType, ISymmetri
         try {
             ISymmetricDialect dialect = engine.getSymmetricDialect();
             IDatabasePlatform platform = dialect.getPlatform();
-
+            IDdlBuilder builder = platform.getDdlBuilder();
+
             dialect.cleanupTriggers();
 
             String fileName = TestConstants.TEST_DROP_SEQ_SCRIPT + databaseType + "-pre.sql";
             URL url = getResource(fileName);
             if (url != null) {
                 new SqlScript(url, dialect.getPlatform().getSqlTemplate(), false).execute(true);
             }
-
-            Database testDb = getTestDatabase(dialect.getPlatform());
-            IDdlBuilder builder = platform.getDdlBuilder();
-            String sql = builder.dropTables(testDb);
+
+            Database db2drop = platform.readDatabase(platform.getDefaultCatalog(), platform.getDefaultSchema(), new String[] {"TABLE"});
+            String sql = builder.dropTables(db2drop);
             new SqlScript(sql, dialect.getPlatform().getSqlTemplate(), false).execute(true);
-
+
+            Database testDb = getTestDatabase(platform);                        
+
             new SqlScript(getResource(TestConstants.TEST_DROP_ALL_SCRIPT),
                     platform.getSqlTemplate(), false).execute(true);