From f7beef585aa229d7404726ff86ea484dbdf4939a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Ra=C4=8Dansk=C3=BD?= <lubos.racansky@gmail.com>
Date: Tue, 5 Mar 2024 09:49:39 +0100
Subject: [PATCH] Fix #1376: Liquibase on MSSQL throws error (#1377)

* Set onError="MARK_RAN" for pa_operation_application_application_id_fk
---
 docs/PowerAuth-Server-1.6.0.md                              | 6 ++++--
 .../1.6.x/20231106-add-foreign-keys.xml                     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/PowerAuth-Server-1.6.0.md b/docs/PowerAuth-Server-1.6.0.md
index cc40ad151..c413c2a89 100644
--- a/docs/PowerAuth-Server-1.6.0.md
+++ b/docs/PowerAuth-Server-1.6.0.md
@@ -31,8 +31,10 @@ Add foreign key constraints to relating table `pa_operation_application`.
 Applying this change may fail if there is an inconsistency between tables `pa_operation_application`
 and `pa_application` or `pa_operation`. Make sure that `pa_operation_application.application_id` contains references to
 existing `pa_application.id` and `pa_operation_application.operation_id` contains references to
-existing `pa_operation.id`. If necessary, manually remove orphaned records in `pa_operation_application`. Consider
-creating a backup before this operation.
+existing `pa_operation.id`.
+Also the column type of `pa_operation_application.application_id` must be the same as the type of `pa_operation.id`.
+If necessary, manually remove orphaned records in `pa_operation_application`.
+Consider creating a backup before this operation.
 
 ### Add activation_id Column
 
diff --git a/docs/db/changelog/changesets/powerauth-java-server/1.6.x/20231106-add-foreign-keys.xml b/docs/db/changelog/changesets/powerauth-java-server/1.6.x/20231106-add-foreign-keys.xml
index ce6a54098..acece2348 100644
--- a/docs/db/changelog/changesets/powerauth-java-server/1.6.x/20231106-add-foreign-keys.xml
+++ b/docs/db/changelog/changesets/powerauth-java-server/1.6.x/20231106-add-foreign-keys.xml
@@ -4,7 +4,7 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
 
     <changeSet id="1" logicalFilePath="powerauth-java-server/1.6.x/20231106-add-foreign-keys.xml" author="Jan Pesek">
-        <preConditions onFail="MARK_RAN">
+        <preConditions onFail="MARK_RAN" onError="MARK_RAN">
             <not>
                 <foreignKeyConstraintExists foreignKeyTableName="pa_operation_application"
                                             foreignKeyName="pa_operation_application_application_id_fk" />