From cee975c1c15614785f3a0faac73957ee7a499587 Mon Sep 17 00:00:00 2001
From: Michal Kit <michal.kit@r3.com>
Date: Mon, 22 Jan 2018 12:11:31 +0000
Subject: [PATCH] =?UTF-8?q?Reverting=20schema=20changes=20and=20following?=
 =?UTF-8?q?=20the=20liquibase=20change=20tracking=20=E2=80=A6=20(#385)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Reverting schema changes and following the liquibase change tracking flow

* Addressing review comments

* Adding other tables cleanup

* Renaming the changeset file
---
 .../network-manager.changelog-init.xml        | 15 +++--------
 .../network-manager.changelog-master.xml      |  1 +
 ...nager.changelog-signing-network-params.xml | 27 +++++++++++++++++++
 3 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 network-management/src/main/resources/migration/network-manager.changelog-signing-network-params.xml

diff --git a/network-management/src/main/resources/migration/network-manager.changelog-init.xml b/network-management/src/main/resources/migration/network-manager.changelog-init.xml
index 0b9be92b91..59a5f4985e 100644
--- a/network-management/src/main/resources/migration/network-manager.changelog-init.xml
+++ b/network-management/src/main/resources/migration/network-manager.changelog-init.xml
@@ -93,13 +93,11 @@
     </changeSet>
     <changeSet author="R3.Corda" id="1513267683777-8">
         <createTable tableName="network_parameters">
-            <column name="hash" type="NVARCHAR(64)">
+            <column name="version" type="BIGINT">
                 <constraints nullable="false"/>
             </column>
-            <column name="certificate" type="BLOB"/>
-            <column name="created" type="TIMESTAMP"/>
-            <column name="parameters_bytes" type="BLOB"/>
-            <column name="signature" type="BLOB"/>
+            <column name="bytes" type="BLOB"/>
+            <column name="hash" type="NVARCHAR(64)"/>
         </createTable>
     </changeSet>
     <changeSet author="R3.Corda" id="1513267683777-9">
@@ -122,7 +120,7 @@
         </createTable>
     </changeSet>
     <changeSet author="R3.Corda" id="1513267683777-11">
-        <addPrimaryKey columnNames="hash" constraintName="CONSTRAINT_3" tableName="network_parameters"/>
+        <addPrimaryKey columnNames="version" constraintName="CONSTRAINT_3" tableName="network_parameters"/>
     </changeSet>
     <changeSet author="R3.Corda" id="1513267683777-12">
         <addPrimaryKey columnNames="id" constraintName="CONSTRAINT_7" tableName="certificate_data"/>
@@ -169,11 +167,6 @@
             <column name="public_key_hash"/>
         </createIndex>
     </changeSet>
-    <changeSet author="R3.Corda" id="network-parameters-idx">
-        <createIndex indexName="IDX_NET_PARAMS_HASH" tableName="network_parameters">
-            <column name="hash"/>
-        </createIndex>
-    </changeSet>
     <changeSet author="R3.Corda" id="1513267683777-24">
         <addForeignKeyConstraint baseColumnNames="rev" baseTableName="certificate_signing_request_AUD"
                                  constraintName="FK5g5cagcrx7siu8lwtavirunxd"
diff --git a/network-management/src/main/resources/migration/network-manager.changelog-master.xml b/network-management/src/main/resources/migration/network-manager.changelog-master.xml
index 48836fc4c8..c6eff52f8a 100644
--- a/network-management/src/main/resources/migration/network-manager.changelog-master.xml
+++ b/network-management/src/main/resources/migration/network-manager.changelog-master.xml
@@ -2,5 +2,6 @@
 <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" >
 
     <include file="migration/network-manager.changelog-init.xml"/>
+    <include file="migration/network-manager.changelog-signing-network-params.xml"/>
 
 </databaseChangeLog>
diff --git a/network-management/src/main/resources/migration/network-manager.changelog-signing-network-params.xml b/network-management/src/main/resources/migration/network-manager.changelog-signing-network-params.xml
new file mode 100644
index 0000000000..cdb43a5362
--- /dev/null
+++ b/network-management/src/main/resources/migration/network-manager.changelog-signing-network-params.xml
@@ -0,0 +1,27 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<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="signing_network_map_parameters">
+        <dropTable tableName="network_parameters"/>
+        <createTable tableName="network_parameters">
+            <column name="hash" type="NVARCHAR(64)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="certificate" type="BLOB"/>
+            <column name="created" type="TIMESTAMP"/>
+            <column name="parameters_bytes" type="BLOB"/>
+            <column name="signature" type="BLOB"/>
+        </createTable>
+        <addPrimaryKey columnNames="hash" constraintName="CONSTRAINT_3" tableName="network_parameters"/>
+        <createIndex indexName="IDX_NET_PARAMS_HASH" tableName="network_parameters">
+            <column name="hash"/>
+        </createIndex>
+        <delete tableName="certificate_data"/>
+        <delete tableName="CertificateSigningRequestEntity_modifiedBy"/>
+        <delete tableName="CertificateSigningRequestEntity_modifiedBy_AUD"/>
+        <delete tableName="certificate_signing_request"/>
+        <delete tableName="certificate_signing_request_AUD"/>
+        <delete tableName="network_map"/>
+        <delete tableName="node_info"/>
+        <delete tableName="REVINFO"/>
+    </changeSet>
+</databaseChangeLog>