From 415820c982f88a9d9bf2ddbf46f59e254a1684f6 Mon Sep 17 00:00:00 2001 From: erilong Date: Sat, 24 Nov 2007 04:34:17 +0000 Subject: [PATCH] since dropping stuff is the way, we must also drop sequence objects --- .../org/jumpmind/symmetric/SymmetricEngineTestFactory.java | 3 +++ .../java/org/jumpmind/symmetric/common/TestConstants.java | 2 +- symmetric/src/test/resources/test-data-drop-seq.sql | 7 +++++++ symmetric/src/test/resources/test-oracle-seq-drop.sql | 5 ----- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 symmetric/src/test/resources/test-data-drop-seq.sql delete mode 100644 symmetric/src/test/resources/test-oracle-seq-drop.sql diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/SymmetricEngineTestFactory.java b/symmetric/src/test/java/org/jumpmind/symmetric/SymmetricEngineTestFactory.java index 5fc51122aa..924a8c0afa 100644 --- 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 index cb920fc358..f0ed6c335e 100644 --- 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 new file mode 100644 index 0000000000..01e099f23a --- /dev/null +++ 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 deleted file mode 100644 index 1650030ffa..0000000000 --- a/symmetric/src/test/resources/test-oracle-seq-drop.sql +++ /dev/null @@ -1,5 +0,0 @@ -drop SEQUENCE SEQ_SYM_DATA_DATA_ID; -drop SEQUENCE SEQ_SYM_OUTGOIN_BATCH_BATCH_ID; -drop SEQUENCE SEQ_SYM_OUTGOIN_IST_HISTORY_ID; -drop SEQUENCE SEQ_SYM_TRIGGER_RIGGER_HIST_ID; -#drop SEQUENCE SEQ_TEST_TRIGGERS_TABLE_ID;