From e35c161cb4f0d3a1f5f2b90408a65ee476de90d7 Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Tue, 17 Oct 2023 15:38:43 +0200
Subject: [PATCH 1/2] Fix liquibase type

---
 .gitignore                                                     | 3 +++
 pom.xml                                                        | 2 +-
 .../db/changelog/changesets/changelog_20230801T194601Z.xml     | 2 +-
 src/test/resources/application-default.yml                     | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41e2fabd..c2d91ac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ target/
 # IntelliJ
 /.idea
 *.iml
+
+# https://github.com/liquibase/liquibase/issues/2196
+/derby.log
diff --git a/pom.xml b/pom.xml
index 66051ebc..2f7135ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-parent-ws</artifactId>
-        <version>17</version>
+        <version>18</version>
         <relativePath/>
     </parent>
 
diff --git a/src/main/resources/db/changelog/changesets/changelog_20230801T194601Z.xml b/src/main/resources/db/changelog/changesets/changelog_20230801T194601Z.xml
index ca6218f7..3447dc8a 100644
--- a/src/main/resources/db/changelog/changesets/changelog_20230801T194601Z.xml
+++ b/src/main/resources/db/changelog/changesets/changelog_20230801T194601Z.xml
@@ -3,7 +3,7 @@
     <changeSet author="hedhiliabd" id="1689623201842-1">
         <validCheckSum>8:e772a722c088f772d9dcc4be222f083b</validCheckSum>
         <modifyDataType columnName="element_type"
-                        newDataType="tinyint"
+                        newDataType="smallint"
                         tableName="contingency_entity_contingency_elements"/>
     </changeSet>
 </databaseChangeLog>
diff --git a/src/test/resources/application-default.yml b/src/test/resources/application-default.yml
index e5547bf7..828fb3dd 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -16,7 +16,7 @@ logging:
 powsybl-ws:
   database:
     vendor: h2:mem
-    query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+    query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL;DEFAULT_NULL_ORDERING=HIGH
     hostPort: ":"
 
 

From 7dca85cb181ab1d8502741c94b0816f43efdd4de Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Tue, 17 Oct 2023 16:25:57 +0200
Subject: [PATCH 2/2] Fix diff on constraints

---
 .../changesets/changelog_20231017T131658Z.xml | 27 +++++++++++++++++++
 .../db/changelog/db.changelog-master.yaml     |  4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/db/changelog/changesets/changelog_20231017T131658Z.xml

diff --git a/src/main/resources/db/changelog/changesets/changelog_20231017T131658Z.xml b/src/main/resources/db/changelog/changesets/changelog_20231017T131658Z.xml
new file mode 100644
index 00000000..8cc15eb1
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20231017T131658Z.xml
@@ -0,0 +1,27 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="chuinetri (generated)" id="1697548639163-1">
+        <comment>Missing update from #61</comment>
+        <modifyDataType columnName="status" newDataType="varchar(255)" tableName="computation_status"/>
+        <dropColumn columnName="ok" tableName="computation_status"/>
+    </changeSet>
+
+    <changeSet author="chuinetri (base generated)" id="1697548639163-2">
+        <comment>We reconstruct primary/foreign keys constraints</comment>
+        <dropForeignKeyConstraint baseTableName="contingency_entity_contingency_elements" constraintName="FKPNMUIJ3QKI9U4KF7OMME39UGN"/>
+        <dropPrimaryKey tableName="contingency"/>
+    </changeSet>
+    <changeSet author="chuinetri (base generated)" id="1697548639163-3">
+        <comment>Next part of 1697548639163-2</comment>
+        <addPrimaryKey columnNames="contingency_id, result_uuid" constraintName="contingencyPK" tableName="contingency"/>
+        <createIndex indexName="IX_contingencyPK" tableName="contingency" unique="true">
+            <column name="contingency_id"/>
+            <column name="result_uuid"/>
+        </createIndex>
+        <addForeignKeyConstraint baseColumnNames="contingency_entity_contingency_id,contingency_entity_result_uuid" baseTableName="contingency_entity_contingency_elements" constraintName="FKpnmuij3qki9u4kf7omme39ugn" deferrable="false" initiallyDeferred="false" referencedColumnNames="contingency_id,result_uuid" referencedTableName="contingency" validate="true"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index 9b48a699..35965f07 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -1,5 +1,4 @@
 databaseChangeLog:
-
   - include:
       file: changesets/changelog_20220204T114931Z.xml
       relativeToChangelogFile: true
@@ -12,3 +11,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20230801T194601Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20231017T131658Z.xml
+      relativeToChangelogFile: true