From 724d059d208dd1816225fcdf41a43c3f5d5b1f44 Mon Sep 17 00:00:00 2001
From: Jan Dusil <jan.dusil@wultra.com>
Date: Wed, 15 Nov 2023 11:20:01 +0100
Subject: [PATCH] Fix #852: Allow scoping operation to a single activation ID

---
 .../1.6.x/20231112-add-activation-id.xml      | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/docs/db/changelog/changesets/powerauth-java-server/1.6.x/20231112-add-activation-id.xml b/docs/db/changelog/changesets/powerauth-java-server/1.6.x/20231112-add-activation-id.xml
index 970134651..0853e08fb 100644
--- a/docs/db/changelog/changesets/powerauth-java-server/1.6.x/20231112-add-activation-id.xml
+++ b/docs/db/changelog/changesets/powerauth-java-server/1.6.x/20231112-add-activation-id.xml
@@ -5,33 +5,19 @@
 
     <changeSet id="1" logicalFilePath="powerauth-java-server/1.6.x/20231112-add-activation-id.xml" author="Jan Dusil">
         <preConditions onFail="MARK_RAN">
+            <tableExists tableName="pa_operation"/>
             <not>
                 <columnExists tableName="pa_operation" columnName="activation_id"/>
             </not>
-        </preConditions>
-        <comment>Add activation_id column to pa_operation</comment>
-        <addColumn tableName="pa_operation">
-            <column name="activation_id" type="varchar(37)"/>
-        </addColumn>
-    </changeSet>
-
-    <changeSet id="2" logicalFilePath="powerauth-java-server/1.6.x/20231112-add-fk-to-activation-id.xml"
-               author="Jan Dusil">
-        <preConditions onFail="MARK_RAN">
             <tableExists tableName="pa_activation"/>
-            <tableExists tableName="pa_operation"/>
             <columnExists tableName="pa_activation" columnName="activation_id"/>
-            <columnExists tableName="pa_operation" columnName="activation_id"/>
-            <not>
-                <foreignKeyConstraintExists foreignKeyTableName="pa_operation"
-                                            foreignKeyName="pa_operation_activation_id_fk"/>
-            </not>
         </preConditions>
-        <comment>Add foreign key constraint to activation_id in pa_operation</comment>
-        <addForeignKeyConstraint constraintName="pa_operation_activation_id_fk"
-                                 baseTableName="pa_operation"
-                                 baseColumnNames="activation_id"
-                                 referencedTableName="pa_activation"
-                                 referencedColumnNames="activation_id"/>
+        <comment>Add activation_id column with foreign key constraint to pa_operation</comment>
+        <addColumn tableName="pa_operation">
+            <column name="activation_id" type="varchar(37)">
+                <constraints nullable="true" foreignKeyName="pa_operation_activation_id_fk"
+                             referencedTableName="pa_activation" referencedColumnNames="activation_id"/>
+            </column>
+        </addColumn>
     </changeSet>
 </databaseChangeLog>