From b1a787e6492215f46d37397be5bc3f6a89fee9f0 Mon Sep 17 00:00:00 2001 From: szymonsztuka Date: Thu, 25 Oct 2018 17:12:25 +0100 Subject: [PATCH] Unnecessary Liquibase script for issuer_ref column, fix integration tests in database mode (#1506) Column vault_fungible_states.issuer_ref were never set to non-nullable so no need to drop this constraint - this will be also removed from OS as separated PR. The issue detected against Oracle db which doesn't allow set column constraint to NULLABLE if it's already NULLABLE. Added new table to test setup/cleanup. --- .../resources/migration/vault-schema.changelog-master.xml | 1 - .../resources/migration/vault-schema.changelog-v7.xml | 8 -------- .../database-scripts/azure-sql/db-global-cleanup.sql | 1 + .../resources/database-scripts/azure-sql/db-setup.sql | 1 + .../main/resources/database-scripts/oracle/db-cleanup.sql | 1 + .../main/resources/database-scripts/oracle/db-setup.sql | 1 + .../database-scripts/sql-server/db-global-cleanup.sql | 1 + .../database-scripts/sql-server/db-global-setup.sql | 1 + .../resources/database-scripts/sql-server/db-setup.sql | 1 + 9 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 node/src/main/resources/migration/vault-schema.changelog-v7.xml diff --git a/node/src/main/resources/migration/vault-schema.changelog-master.xml b/node/src/main/resources/migration/vault-schema.changelog-master.xml index d1b1cd6f3d..a993718e77 100644 --- a/node/src/main/resources/migration/vault-schema.changelog-master.xml +++ b/node/src/main/resources/migration/vault-schema.changelog-master.xml @@ -10,6 +10,5 @@ - diff --git a/node/src/main/resources/migration/vault-schema.changelog-v7.xml b/node/src/main/resources/migration/vault-schema.changelog-v7.xml deleted file mode 100644 index 5b85396391..0000000000 --- a/node/src/main/resources/migration/vault-schema.changelog-v7.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-global-cleanup.sql b/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-global-cleanup.sql index 7d770f34de..4876136006 100644 --- a/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-global-cleanup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-global-cleanup.sql @@ -4,6 +4,7 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2_participants; DROP TABLE IF EXISTS ${schema}.dummy_linear_state_parts; DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2_parts; DROP TABLE IF EXISTS ${schema}.dummy_deal_states_parts; +DROP TABLE IF EXISTS ${schema}.node_attachments_signers; DROP TABLE IF EXISTS ${schema}.node_attachments_contracts; DROP TABLE IF EXISTS ${schema}.node_attachments; DROP TABLE IF EXISTS ${schema}.node_checkpoints; diff --git a/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-setup.sql b/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-setup.sql index dbbb9527ef..fc58d19b9e 100644 --- a/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-setup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-setup.sql @@ -4,6 +4,7 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2_participants; DROP TABLE IF EXISTS ${schema}.dummy_linear_state_parts; DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2_parts; DROP TABLE IF EXISTS ${schema}.dummy_deal_states_parts; +DROP TABLE IF EXISTS ${schema}.node_attachments_signers; DROP TABLE IF EXISTS ${schema}.node_attachments_contracts; DROP TABLE IF EXISTS ${schema}.node_attachments; DROP TABLE IF EXISTS ${schema}.node_checkpoints; diff --git a/testing/test-utils/src/main/resources/database-scripts/oracle/db-cleanup.sql b/testing/test-utils/src/main/resources/database-scripts/oracle/db-cleanup.sql index 97d27f2336..77d9286487 100644 --- a/testing/test-utils/src/main/resources/database-scripts/oracle/db-cleanup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/oracle/db-cleanup.sql @@ -4,6 +4,7 @@ DROP TABLE ${schema}.cp_states_v2_participants CASCADE CONSTRAINTS DROP TABLE ${schema}.dummy_linear_state_parts CASCADE CONSTRAINTS DROP TABLE ${schema}.dummy_linear_states_v2_parts CASCADE CONSTRAINTS DROP TABLE ${schema}.dummy_deal_states_parts CASCADE CONSTRAINTS +DROP TABLE ${schema}.node_attachments_signers CASCADE CONSTRAINTS DROP TABLE ${schema}.node_attachments_contracts CASCADE CONSTRAINTS DROP TABLE ${schema}.node_attachments CASCADE CONSTRAINTS DROP TABLE ${schema}.node_checkpoints CASCADE CONSTRAINTS diff --git a/testing/test-utils/src/main/resources/database-scripts/oracle/db-setup.sql b/testing/test-utils/src/main/resources/database-scripts/oracle/db-setup.sql index ccece802e2..4f25148ff1 100644 --- a/testing/test-utils/src/main/resources/database-scripts/oracle/db-setup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/oracle/db-setup.sql @@ -6,6 +6,7 @@ DROP TABLE ${schema}.dummy_linear_states_v2_parts CASCADE CONSTRAINTS DROP TABLE ${schema}.dummy_deal_states_parts CASCADE CONSTRAINTS DROP TABLE ${schema}.dummy_test_states_parts CASCADE CONSTRAINTS DROP TABLE ${schema}.dummy_test_states CASCADE CONSTRAINTS +DROP TABLE ${schema}.node_attachments_signers CASCADE CONSTRAINTS DROP TABLE ${schema}.node_attachments_contracts CASCADE CONSTRAINTS DROP TABLE ${schema}.node_attachments CASCADE CONSTRAINTS DROP TABLE ${schema}.node_checkpoints CASCADE CONSTRAINTS diff --git a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-cleanup.sql b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-cleanup.sql index 6dd0ef1510..fc46a9de15 100644 --- a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-cleanup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-cleanup.sql @@ -4,6 +4,7 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2_participants; DROP TABLE IF EXISTS ${schema}.dummy_linear_state_parts; DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2_parts; DROP TABLE IF EXISTS ${schema}.dummy_deal_states_parts; +DROP TABLE IF EXISTS ${schema}.node_attachments_signers; DROP TABLE IF EXISTS ${schema}.node_attachments_contracts; DROP TABLE IF EXISTS ${schema}.node_attachments; DROP TABLE IF EXISTS ${schema}.node_checkpoints; diff --git a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-setup.sql b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-setup.sql index 3ae1b58e7e..19e1217977 100644 --- a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-setup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-setup.sql @@ -4,6 +4,7 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2_participants; DROP TABLE IF EXISTS ${schema}.dummy_linear_state_parts; DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2_parts; DROP TABLE IF EXISTS ${schema}.dummy_deal_states_parts; +DROP TABLE IF EXISTS ${schema}.node_attachments_signers; DROP TABLE IF EXISTS ${schema}.node_attachments_contracts; DROP TABLE IF EXISTS ${schema}.node_attachments; DROP TABLE IF EXISTS ${schema}.node_checkpoints; diff --git a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-setup.sql b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-setup.sql index 82498276cb..fa4aa4ab95 100644 --- a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-setup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-setup.sql @@ -4,6 +4,7 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2_participants; DROP TABLE IF EXISTS ${schema}.dummy_linear_state_parts; DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2_parts; DROP TABLE IF EXISTS ${schema}.dummy_deal_states_parts; +DROP TABLE IF EXISTS ${schema}.node_attachments_signers; DROP TABLE IF EXISTS ${schema}.node_attachments_contracts; DROP TABLE IF EXISTS ${schema}.node_attachments; DROP TABLE IF EXISTS ${schema}.node_checkpoints;