From 2abfc20e8bf3ef10aa9709736fc83c07e38face8 Mon Sep 17 00:00:00 2001
From: nkovacsx <57627796+nkovacsx@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:15:09 +0100
Subject: [PATCH] CORE-17430 Modify the utxo_transaction_sources table by
 removing unused columns and renaming (#1288)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The created and is_ref_input columns are unnecessary to have in the utxo_transaction_sources table.
The created column will be the same as in utxo_transaction_component table and it’s a 1:1 mapping.
Whether a state is an input or a reference can be found out by using the groupIdx column rather than having an extra is_ref_input column.

Also rename the ref_transaction_id and ref_leaf_idx columns as those are quite confusing.
---
 .../migration/ledger-utxo-creation-v5.1.xml   | 19 ++++++++++++++++---
 gradle.properties                             |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml b/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
index 156636ce8d..912a6c9e79 100644
--- a/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
+++ b/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
@@ -113,8 +113,22 @@
         <!-- Drop the created column from the utxo_transaction_component table -->
         <dropColumn columnName="created" tableName="utxo_transaction_component"/>
 
-        <!-- Drop the utxo_transaction_sources table -->
-        <dropTable tableName="utxo_transaction_sources"/>
+        <!-- Drop the created and is_ref_input columns from the utxo_transaction_sources table -->
+        <dropColumn tableName="utxo_transaction_sources">
+            <column name="created"/>
+            <column name="is_ref_input"/>
+        </dropColumn>
+
+        <!-- Rename the columns in utxo_transaction_sources to avoid confusion -->
+        <renameColumn columnDataType="VARCHAR(160)"
+                      newColumnName="source_state_transaction_id"
+                      oldColumnName="ref_transaction_id"
+                      tableName="utxo_transaction_sources"/>
+
+        <renameColumn columnDataType="INT"
+                      newColumnName="source_state_idx"
+                      oldColumnName="ref_leaf_idx"
+                      tableName="utxo_transaction_sources"/>
 
         <!-- Drop the utxo_transaction_cpk table -->
         <dropTable tableName="utxo_transaction_cpk"/>
@@ -145,7 +159,6 @@
         </addColumn>
 
         <!-- Populate utxo_transaction_metadata. Postgresql only since, no other dbs were supported before 5.1. So only Postgres can have data which needs to be migrated. -->
-        <!-- ^^ is this correct?? -->
         <sql dbms="postgresql">
             INSERT INTO utxo_transaction_metadata
             SELECT DISTINCT
diff --git a/gradle.properties b/gradle.properties
index 37dfbd0648..31347a6a44 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ cordaProductVersion = 5.1.0
 # NOTE: update this each time this module contains a breaking change
 ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to
 ##   a per module property in which case module versions can change independently.
-cordaApiRevision = 33
+cordaApiRevision = 34
 
 # Main
 kotlinVersion = 1.8.21