From dfd30ac917bfbeceed241e367fdee25a0d80718b Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Mon, 16 Oct 2023 10:20:25 +0200
Subject: [PATCH 1/3] Fix `NoSuchMethodError` on Spring/Hibernate strategy

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cef41a4..f613bd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-parent-ws</artifactId>
-        <version>15</version>
+        <version>17</version>
         <relativePath/>
     </parent>
 

From 8b8d44fdc46c8d3606c78b83d503067076ebfc71 Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Mon, 16 Oct 2023 17:58:12 +0200
Subject: [PATCH 2/3] fix changes

---
 .gitignore                                       |  3 +++
 pom.xml                                          |  2 +-
 .../changesets/changelog_20231016T075748Z.xml    | 16 ++++++++++++++++
 .../db/changelog/db.changelog-master.yaml        | 11 +++--------
 src/test/resources/application-default.yml       |  4 ++--
 5 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changesets/changelog_20231016T075748Z.xml

diff --git a/.gitignore b/.gitignore
index 41e2fab..c2d91ac 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 f613bd5..f735671 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_20231016T075748Z.xml b/src/main/resources/db/changelog/changesets/changelog_20231016T075748Z.xml
new file mode 100644
index 0000000..9d68869
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20231016T075748Z.xml
@@ -0,0 +1,16 @@
+<?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="1697443084669-2">
+        <addUniqueConstraint columnNames="numeric_filter_id_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID_ID_COL" tableName="form_contingency_list"/>
+    </changeSet>
+    <changeSet author="chuinetri (generated)" id="1697443084669-3">
+        <addUniqueConstraint columnNames="numeric_filter_id1_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID1_ID_COL" tableName="form_contingency_list"/>
+    </changeSet>
+    <changeSet author="chuinetri (generated)" id="1697443084669-4">
+        <addUniqueConstraint columnNames="numeric_filter_id2_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID2_ID_COL" tableName="form_contingency_list"/>
+    </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 103caf7..adbc71f 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -1,33 +1,28 @@
 databaseChangeLog:
-
   - include:
       file: changesets/changelog_20211019T140751Z.xml
       relativeToChangelogFile: true
-
   - include:
       file: changesets/changelog_20211028T094008Z.xml
       relativeToChangelogFile: true
-
   - include:
       file: changesets/changelog_20211123T105713Z.xml
       relativeToChangelogFile: true
-
   - include:
       file: changesets/changelog_20220706T093841Z.xml
       relativeToChangelogFile: true
-
   - include:
       file: changesets/changelog_20221013T153228Z.xml
       relativeToChangelogFile: true
-
   - include:
       file: changesets/changelog_20221123T132520Z.xml
       relativeToChangelogFile: true
-
   - include:
       file: changesets/changelog_20230313T145947Z.xml
       relativeToChangelogFile: true
-
   - include:
       file: changesets/changelog_20230706T144551Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20231016T075748Z.xml
+      relativeToChangelogFile: true
diff --git a/src/test/resources/application-default.yml b/src/test/resources/application-default.yml
index f9a553c..8de37a7 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -5,7 +5,7 @@ spring:
       dialect: org.hibernate.dialect.H2Dialect
       hibernate.format_sql: true
     hibernate:
-      #to turn off schema validation that fails (because of clob types) and blocks tests even if the the schema is compatible
+      #to turn off schema validation that fails (because of clob types) and blocks tests even if the schema is compatible
       ddl-auto: none
 
 logging:
@@ -18,5 +18,5 @@ logging:
 powsybl-ws:
   database:
     vendor: h2:mem
-    query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL
+    query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL;DEFAULT_NULL_ORDERING=HIGH
     hostPort: ":"

From b9d42b66f34bf0a5382d4970d7330c1fede8d2af Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Wed, 18 Oct 2023 09:55:00 +0200
Subject: [PATCH 3/3] Tmp LOOP DIFF CHANGELOG

Signed-off-by: Tristan Chuine <tristan.chuine_externe@rte-france.com>
---
 .../changesets/changelog_20231016T152546Z.xml     | 15 +++++++++++++++
 .../db/changelog/db.changelog-master.yaml         |  3 +++
 2 files changed, 18 insertions(+)
 create mode 100644 src/main/resources/db/changelog/changesets/changelog_20231016T152546Z.xml

diff --git a/src/main/resources/db/changelog/changesets/changelog_20231016T152546Z.xml b/src/main/resources/db/changelog/changesets/changelog_20231016T152546Z.xml
new file mode 100644
index 0000000..a3dca80
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20231016T152546Z.xml
@@ -0,0 +1,15 @@
+<?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="1697469962255-1">
+        <dropUniqueConstraint constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID1_ID_COL" tableName="form_contingency_list"/>
+    </changeSet>
+    <changeSet author="chuinetri (generated)" id="1697469962255-2">
+        <addUniqueConstraint columnNames="numeric_filter_id1_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID1_ID_COL" tableName="form_contingency_list"/>
+    </changeSet>
+    <changeSet author="chuinetri (generated)" id="1697469962255-3">
+        <dropUniqueConstraint constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID2_ID_COL" tableName="form_contingency_list"/>
+    </changeSet>
+    <changeSet author="chuinetri (generated)" id="1697469962255-4">
+        <addUniqueConstraint columnNames="numeric_filter_id2_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID2_ID_COL" tableName="form_contingency_list"/>
+    </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 adbc71f..cb716c3 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -26,3 +26,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20231016T075748Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20231016T152546Z.xml
+      relativeToChangelogFile: true