From 3cc73dc0f458283cf94be65167415e8118e34ea0 Mon Sep 17 00:00:00 2001
From: Jan Dusil <jan.dusil@wultra.com>
Date: Mon, 4 Sep 2023 13:53:00 +0200
Subject: [PATCH] Revert "Fix #992: Review liquibase scripts"

This reverts commit 224d1783075db2ce7d3a81a94ce326c99806977e.
---
 .../1.4.x/20230322-init-db.xml                | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/db/changelog/changesets/powerauth-java-server/1.4.x/20230322-init-db.xml b/docs/db/changelog/changesets/powerauth-java-server/1.4.x/20230322-init-db.xml
index 02ec48675..fc5cace03 100644
--- a/docs/db/changelog/changesets/powerauth-java-server/1.4.x/20230322-init-db.xml
+++ b/docs/db/changelog/changesets/powerauth-java-server/1.4.x/20230322-init-db.xml
@@ -130,7 +130,7 @@
                 <constraints primaryKey="true" />
             </column>
             <column name="application_id" type="integer">
-                <constraints nullable="false" foreignKeyName="pa_master_keypair_application_id_fk" referencedTableName="pa_application" referencedColumnNames="id" />
+                <constraints nullable="false" foreignKeyName="keypair_application_fk" referencedTableName="pa_application" referencedColumnNames="id" />
             </column>
             <column name="master_key_private_base64" type="varchar(255)">
                 <constraints nullable="false" />
@@ -157,7 +157,7 @@
                 <constraints primaryKey="true" />
             </column>
             <column name="application_id" type="integer">
-                <constraints nullable="false" foreignKeyName="pa_activation_application_id_fk" referencedTableName="pa_application" referencedColumnNames="id" />
+                <constraints nullable="false" foreignKeyName="activation_application_fk" referencedTableName="pa_application" referencedColumnNames="id" />
             </column>
             <column name="user_id" type="varchar(255)">
                 <constraints nullable="false" />
@@ -207,7 +207,7 @@
             </column>
             <column name="timestamp_last_change" type="timestamp(6)" />
             <column name="master_keypair_id" type="integer">
-                <constraints foreignKeyName="pa_activation_master_keypair_id_fk" referencedTableName="pa_master_keypair" referencedColumnNames="id" />
+                <constraints foreignKeyName="activation_keypair_fk" referencedTableName="pa_master_keypair" referencedColumnNames="id" />
             </column>
             <column name="version" type="integer" defaultValue="2" />
         </createTable>
@@ -225,7 +225,7 @@
                 <constraints primaryKey="true" />
             </column>
             <column name="application_id" type="integer">
-                <constraints nullable="false" foreignKeyName="pa_application_version_application_id_fk" referencedTableName="pa_application" referencedColumnNames="id" />
+                <constraints nullable="false" foreignKeyName="version_application_fk" referencedTableName="pa_application" referencedColumnNames="id" />
             </column>
             <column name="application_key" type="varchar(255)" />
             <column name="application_secret" type="varchar(255)" />
@@ -246,7 +246,7 @@
                 <constraints primaryKey="true" />
             </column>
             <column name="activation_id" type="varchar(37)">
-                <constraints nullable="false" foreignKeyName="pa_signature_audit_activation_id_fk" referencedTableName="pa_activation" referencedColumnNames="activation_id"/>
+                <constraints nullable="false" foreignKeyName="audit_activation_fk" referencedTableName="pa_activation" referencedColumnNames="activation_id"/>
             </column>
             <column name="activation_counter" type="integer">
                 <constraints nullable="false" />
@@ -304,7 +304,7 @@
                 <constraints primaryKey="true" />
             </column>
             <column name="application_id" type="integer">
-                <constraints nullable="false" foreignKeyName="pa_application_callback_application_id_fk" referencedTableName="pa_application" referencedColumnNames="id" />
+                <constraints nullable="false" foreignKeyName="callback_application_fk" referencedTableName="pa_application" referencedColumnNames="id" />
             </column>
             <column name="name" type="varchar(255)" />
             <column name="callback_url" type="varchar(1024)" />
@@ -331,7 +331,7 @@
                 <constraints nullable="false" />
             </column>
             <column name="activation_id" type="varchar(37)">
-                <constraints nullable="false" foreignKeyName="pa_token_activation_id_fk" referencedTableName="pa_activation" referencedColumnNames="activation_id" />
+                <constraints nullable="false" foreignKeyName="activation_token_fk" referencedTableName="pa_activation" referencedColumnNames="activation_id" />
             </column>
             <column name="signature_type" type="varchar(255)">
                 <constraints nullable="false" />
@@ -354,7 +354,7 @@
                 <constraints primaryKey="true" />
             </column>
             <column name="activation_id" type="varchar(37)">
-                <constraints nullable="false" foreignKeyName="pa_activation_history_activation_id_fk" referencedTableName="pa_activation" referencedColumnNames="activation_id" />
+                <constraints nullable="false" foreignKeyName="history_activation_fk" referencedTableName="pa_activation" referencedColumnNames="activation_id" />
             </column>
             <column name="activation_status" type="integer" />
             <column name="event_reason" type="varchar(255)" />
@@ -381,13 +381,13 @@
                 <constraints nullable="false" />
             </column>
             <column name="application_id" type="integer">
-                <constraints nullable="false" foreignKeyName="pa_recovery_code_application_id_fk" referencedTableName="pa_application" referencedColumnNames="id" />
+                <constraints nullable="false" foreignKeyName="recovery_code_application_fk" referencedTableName="pa_application" referencedColumnNames="id" />
             </column>
             <column name="user_id" type="varchar(255)">
                 <constraints nullable="false" />
             </column>
             <column name="activation_id" type="varchar(37)">
-                <constraints nullable="false" foreignKeyName="pa_recovery_code_activation_id_fk" referencedTableName="pa_activation" referencedColumnNames="activation_id" />
+                <constraints nullable="false" foreignKeyName="recovery_code_activation_fk" referencedTableName="pa_activation" referencedColumnNames="activation_id" />
             </column>
             <column name="status" type="integer">
                 <constraints nullable="false" />
@@ -418,7 +418,7 @@
                 <constraints primaryKey="true" />
             </column>
             <column name="recovery_code_id" type="bigint">
-                <constraints nullable="false" foreignKeyName="pa_recovery_puk_recovery_code_id_fk" referencedTableName="pa_recovery_code" referencedColumnNames="id" />
+                <constraints nullable="false" foreignKeyName="recovery_puk_code_fk" referencedTableName="pa_recovery_code" referencedColumnNames="id" />
             </column>
             <column name="puk" type="varchar(255)" />
             <column name="puk_encryption" type="integer" defaultValue="0">
@@ -446,7 +446,7 @@
                 <constraints primaryKey="true" />
             </column>
             <column name="application_id" type="integer">
-                <constraints nullable="false" foreignKeyName="pa_recovery_config_application_id_fk" referencedTableName="pa_application" referencedColumnNames="id" />
+                <constraints nullable="false" foreignKeyName="recovery_config_app_fk" referencedTableName="pa_application" referencedColumnNames="id" />
             </column>
             <column name="activation_recovery_enabled" type="boolean" defaultValueBoolean="false">
                 <constraints nullable="false" />