From aad2e82d078848d86d496a076eb14acc10d20be7 Mon Sep 17 00:00:00 2001
From: willhr3 <48725248+willhr3@users.noreply.github.com>
Date: Tue, 10 Sep 2019 15:52:22 +0100
Subject: [PATCH] =?UTF-8?q?CORDA-3200=20Split=20migrations=20as=20per=20ht?=
 =?UTF-8?q?tps://github.com/corda/enterpris=E2=80=A6=20(#5456)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CORDA-3200 Split migrations as per https://github.com/corda/enterprise/pull/2514/files

* CORDA-3200 Additional comment to explain the ordering of migration scripts
---
 .../migration/node-core.changelog-master.xml         |  6 +++++-
 .../migration/node-core.changelog-v14-data.xml       | 12 ++++++++++++
 ...log-v14.xml => node-core.changelog-v14-table.xml} |  5 -----
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 node/src/main/resources/migration/node-core.changelog-v14-data.xml
 rename node/src/main/resources/migration/{node-core.changelog-v14.xml => node-core.changelog-v14-table.xml} (78%)

diff --git a/node/src/main/resources/migration/node-core.changelog-master.xml b/node/src/main/resources/migration/node-core.changelog-master.xml
index e43c412cf5..bf8e17fb97 100644
--- a/node/src/main/resources/migration/node-core.changelog-master.xml
+++ b/node/src/main/resources/migration/node-core.changelog-master.xml
@@ -12,6 +12,10 @@
     <include file="migration/node-core.changelog-v8.xml"/>
     <include file="migration/node-core.changelog-tx-mapping.xml"/>
     <include file="migration/node-core.changelog-v9.xml"/>
+    <!-- This migration was originally written within the same script as node-core.changelog-v14-data. However, node-core.changelog-v10
+         runs a service with mapped schema which now has the new table so the table should be created before hand. The transfer of data
+         can then happen later in node-core.changelog-v14-data. -->
+    <include file="migration/node-core.changelog-v14-table.xml"/>
     <include file="migration/node-core.changelog-v10.xml"/>
     <include file="migration/node-core.changelog-v11.xml"/>
     <include file="migration/node-core.changelog-v12.xml"/>
@@ -19,7 +23,7 @@
          vault-schema.changelog-v9.xml), as that will use the current hibernate mappings, and those require all DB columns to be
          created. -->
     <include file="migration/node-core.changelog-v13.xml"/>
+    <include file="migration/node-core.changelog-v14-data.xml"/>
     <!-- This must run after node-core.changelog-init.xml, to prevent database columns being created twice. -->
-    <include file="migration/node-core.changelog-v14.xml"/>
     <include file="migration/vault-schema.changelog-v9.xml"/>
 </databaseChangeLog>
diff --git a/node/src/main/resources/migration/node-core.changelog-v14-data.xml b/node/src/main/resources/migration/node-core.changelog-v14-data.xml
new file mode 100644
index 0000000000..a63e9dbf0c
--- /dev/null
+++ b/node/src/main/resources/migration/node-core.changelog-v14-data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"
+                   logicalFilePath="migration/node-services.changelog-init.xml">
+
+    <changeSet author="R3.Corda" id="transfer-to-new-persistence-table">
+        <customChange class="net.corda.node.migration.PersistentIdentityMigrationNewTable">
+        </customChange>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/node/src/main/resources/migration/node-core.changelog-v14.xml b/node/src/main/resources/migration/node-core.changelog-v14-table.xml
similarity index 78%
rename from node/src/main/resources/migration/node-core.changelog-v14.xml
rename to node/src/main/resources/migration/node-core.changelog-v14-table.xml
index 15c0ccd413..b510d6196f 100644
--- a/node/src/main/resources/migration/node-core.changelog-v14.xml
+++ b/node/src/main/resources/migration/node-core.changelog-v14-table.xml
@@ -15,9 +15,4 @@
         </createTable>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="transfer-to-new-persistence-table">
-        <customChange class="net.corda.node.migration.PersistentIdentityMigrationNewTable">
-        </customChange>
-    </changeSet>
-
 </databaseChangeLog>
\ No newline at end of file