since dropping stuff is the way, we must also drop sequence objects

JumpMind · Nov 24, 2007 · 415820c · 415820c
1 parent cf71727
commit 415820c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/SymmetricEngineTestFactory.java b/symmetric/src/test/java/org/jumpmind/symmetric/SymmetricEngineTestFactory.java
@@ -146,6 +146,9 @@ private static void resetSchemaForEngine(SymmetricEngine engine,
             platform.createTables(testDb, false, true);
             new SqlScript(getResource(TestConstants.TEST_DROP_ALL_SCRIPT), ds,
                     false).execute();
+            new SqlScript(getResource(TestConstants.TEST_DROP_SEQ_SCRIPT), ds,
+                    false).execute();
+
             // Need to init the table before running insert statements
             ((IBootstrapService) engine.getApplicationContext().getBean(
                     Constants.BOOTSTRAP_SERVICE)).init();

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/common/TestConstants.java b/symmetric/src/test/java/org/jumpmind/symmetric/common/TestConstants.java
@@ -27,10 +27,10 @@ public class TestConstants {
     public static final String TEST_ROOT_NODE_GROUP = "test-root-group";
     public static final String TEST_CLIENT_NODE_GROUP = "test-node-group";
     public static final String TEST_DROP_ALL_SCRIPT = "/test-data-drop-all.sql";
+    public static final String TEST_DROP_SEQ_SCRIPT = "/test-data-drop-seq.sql";
     public static final String TEST_ROOT_DOMAIN_SETUP_SCRIPT = "/test-integration-root-setup.sql";
     public static final String TEST_CONTINUOUS_SETUP_SCRIPT = "/test-continuous-setup.sql";
     public static final String TEST_CONTINUOUS_NODE_GROUP = "STORE";
-    public static final String TEST_DROP_SEQ_SCRIPT = "/test-oracle-seq-drop.sql";
     public static final String TEST_CHANNEL_ID = "testchannel";
     public static final int TEST_AUDIT_ID = 1;
 }
diff --git a/symmetric/src/test/resources/test-data-drop-seq.sql b/symmetric/src/test/resources/test-data-drop-seq.sql
@@ -0,0 +1,7 @@
+drop sequence sym_data_data_id_seq;
+drop sequence sym_outgoing_ba_history_id_seq;
+drop sequence sym_outgoing_batch_batch_id_seq;
+drop sequence sym_trigger_his_ger_hist_id_seq;
+drop sequence sym_trigger_trigger_id_seq;
+drop sequence test_dataloader_table_id_seq;
+drop sequence test_triggers_table_id_seq;
diff --git a/symmetric/src/test/resources/test-oracle-seq-drop.sql b/symmetric/src/test/resources/test-oracle-seq-drop.sql