From 99d4d92ae221bf43836d4a611bd0d3e26dfbf07a Mon Sep 17 00:00:00 2001
From: szymonsztuka <szymon.sztuka@r3.com>
Date: Tue, 29 May 2018 12:10:11 +0100
Subject: [PATCH] Added Liquibase migration schema file for DummyTestSchemaV1
 introduced by ENT-1932 to fix integration tests in database mode. (#878)

Added Liquibase migration schema file for DummyTestSchemaV1 for IntegrationTest - when running integration tests against remote database schema migration is on and needs the missing file, a table renamed to avoid clash with another one from a dummy schema.
---
 .../dummy-test-schema-v1.changelog-master.xml | 49 +++++++++++++++++++
 .../persistence/SchemaMigrationTest.kt        |  2 +-
 .../azure-sql/db-global-cleanup.sql           |  2 +
 .../database-scripts/azure-sql/db-setup.sql   |  2 +
 .../database-scripts/oracle/db-cleanup.sql    |  2 +
 .../database-scripts/oracle/db-setup.sql      |  2 +
 .../sql-server/db-global-cleanup.sql          |  2 +
 .../sql-server/db-global-setup.sql            |  5 +-
 .../database-scripts/sql-server/db-setup.sql  |  2 +
 9 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 node/src/integration-test/resources/migration/dummy-test-schema-v1.changelog-master.xml

diff --git a/node/src/integration-test/resources/migration/dummy-test-schema-v1.changelog-master.xml b/node/src/integration-test/resources/migration/dummy-test-schema-v1.changelog-master.xml
new file mode 100644
index 0000000000..52be680450
--- /dev/null
+++ b/node/src/integration-test/resources/migration/dummy-test-schema-v1.changelog-master.xml
@@ -0,0 +1,49 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ R3 Proprietary and Confidential
+  ~
+  ~ Copyright (c) 2018 R3 Limited.  All rights reserved.
+  ~
+  ~ The intellectual and technical concepts contained herein are proprietary to R3 and its suppliers and are protected by trade secret law.
+  ~
+  ~ Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited.
+  -->
+
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet author="R3.Corda" id="1512743551377-8124">
+        <createTable tableName="dummy_test_states">
+            <column name="output_index" type="INT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="transaction_id" type="NVARCHAR(64)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="external_id" type="NVARCHAR(255)"/>
+            <column name="uuid" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+
+        <addPrimaryKey columnNames="output_index, transaction_id" constraintName="PK_dummy_test_states"
+                       tableName="dummy_test_states"/>
+
+        <createTable tableName="dummy_test_states_parts">
+            <column name="output_index" type="INT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="transaction_id" type="NVARCHAR(64)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="participants" type="NVARCHAR(255)"/>
+        </createTable>
+
+        <addForeignKeyConstraint baseColumnNames="output_index,transaction_id"
+                                 baseTableName="dummy_test_states_parts"
+                                 constraintName="FKg6ab1fhx6aesnmhlo62o4dnrxt"
+                                 referencedColumnNames="output_index,transaction_id"
+                                 referencedTableName="dummy_test_states"/>
+
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/node/src/test/kotlin/net/corda/node/services/persistence/SchemaMigrationTest.kt b/node/src/test/kotlin/net/corda/node/services/persistence/SchemaMigrationTest.kt
index 68e33b39c3..413c759d06 100644
--- a/node/src/test/kotlin/net/corda/node/services/persistence/SchemaMigrationTest.kt
+++ b/node/src/test/kotlin/net/corda/node/services/persistence/SchemaMigrationTest.kt
@@ -117,7 +117,7 @@ class SchemaMigrationTest {
 
                 @ElementCollection
                 @Column(name = "participants")
-                @CollectionTable(name = "dummy_deal_states_participants", joinColumns = arrayOf(
+                @CollectionTable(name = "dummy_test_states_parts", joinColumns = arrayOf(
                         JoinColumn(name = "output_index", referencedColumnName = "output_index"),
                         JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id")))
                 override var participants: MutableSet<AbstractParty>? = null,
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 b35959e3b7..d6174089c0 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
@@ -48,6 +48,8 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states_parts;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states;
 DROP TABLE IF EXISTS ${schema}.node_mutual_exclusion;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOG;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOGLOCK;
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 d505043b5d..9604bc1854 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
@@ -48,6 +48,8 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states_parts;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states;
 DROP TABLE IF EXISTS ${schema}.node_mutual_exclusion;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOG;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOGLOCK;
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 e4e70acc79..dec3903578 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
@@ -48,6 +48,8 @@ DROP TABLE ${schema}.cp_states_v2 CASCADE CONSTRAINTS
 DROP TABLE ${schema}.dummy_deal_states CASCADE CONSTRAINTS
 DROP TABLE ${schema}.dummy_linear_states CASCADE CONSTRAINTS
 DROP TABLE ${schema}.dummy_linear_states_v2 CASCADE CONSTRAINTS
+DROP TABLE ${schema}.dummy_test_states_parts CASCADE CONSTRAINTS
+DROP TABLE ${schema}.dummy_test_states CASCADE CONSTRAINTS
 DROP TABLE ${schema}.node_mutual_exclusion CASCADE CONSTRAINTS
 DROP TABLE ${schema}.DATABASECHANGELOG CASCADE CONSTRAINTS
 DROP TABLE ${schema}.DATABASECHANGELOGLOCK 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 e4e70acc79..3ecb1c17c8 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
@@ -4,6 +4,8 @@ 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}.dummy_test_states_parts CASCADE CONSTRAINTS
+DROP TABLE ${schema}.dummy_test_states CASCADE CONSTRAINTS
 DROP TABLE ${schema}.node_attchments_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 ddd919b156..7292a1e983 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
@@ -48,6 +48,8 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states_parts;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states;
 DROP TABLE IF EXISTS ${schema}.node_mutual_exclusion;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOG;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOGLOCK;
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 4b4f9e482f..b6d26fd681 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
@@ -15,7 +15,8 @@ DROP TABLE IF EXISTS ${schema}.node_our_key_pairs;
 DROP TABLE IF EXISTS ${schema}.node_scheduled_states;
 DROP TABLE IF EXISTS ${schema}.node_network_map_nodes;
 DROP TABLE IF EXISTS ${schema}.node_network_map_subscribers;
-DROP TABLE IF EXISTS ${schema}.node_notary_commit_log;
+DROP TABLE IF EXISTS ${schema}.node_notary_committed_states;
+DROP TABLE IF EXISTS ${schema}.node_notary_request_log;
 DROP TABLE IF EXISTS ${schema}.node_transaction_mappings;
 DROP TABLE IF EXISTS ${schema}.vault_fungible_states_parts;
 DROP TABLE IF EXISTS ${schema}.vault_linear_states_parts;
@@ -47,6 +48,8 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states_parts;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states;
 DROP TABLE IF EXISTS ${schema}.node_mutual_exclusion;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOG;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOGLOCK;
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 c030a2fc00..1ae9fb5dd8 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
@@ -48,6 +48,8 @@ DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states_parts;
+DROP TABLE IF EXISTS ${schema}.dummy_test_states;
 DROP TABLE IF EXISTS ${schema}.node_mutual_exclusion;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOG;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOGLOCK;