From 98c17611cd21794a54f5c89ebd5333635697c5cd Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Tue, 17 Oct 2023 21:19:33 +0200
Subject: [PATCH] Fix liquibase diff

---
 .gitignore                                            |  3 +++
 pom.xml                                               |  2 +-
 .../changesets/changelog_20221206T145803Z.xml         | 11 ++++++++++-
 src/test/resources/application-default.yml            |  2 +-
 4 files changed, 15 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 ea4ff29a..f77122f9 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_20221206T145803Z.xml b/src/main/resources/db/changelog/changesets/changelog_20221206T145803Z.xml
index e561e142..69fafacd 100644
--- a/src/main/resources/db/changelog/changesets/changelog_20221206T145803Z.xml
+++ b/src/main/resources/db/changelog/changesets/changelog_20221206T145803Z.xml
@@ -1,5 +1,9 @@
 <?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-4.1.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd" logicalFilePath="db/changelog/changesets/changelog_2022-12-06T14:58:03Z.xml">
+<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-4.1.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd" logicalFilePath="db/changelog/changesets/changelog_2022-12-06T14:58:03Z.xml">
     <changeSet author="phamquy (generated)" id="1670338689731-1">
         <addColumn tableName="result">
             <column name="time_line_uuid" type="uuid"/>
@@ -16,4 +20,9 @@
             <column name="result" type="UUID"/>
         </addColumn>
     </changeSet>
+
+    <changeSet author="chuinetri (generated)" id="1697569949532-1">
+        <comment>Missing update from #37</comment>
+        <dropColumn columnName="result" tableName="result"/>
+    </changeSet>
 </databaseChangeLog>
diff --git a/src/test/resources/application-default.yml b/src/test/resources/application-default.yml
index d9bc944b..b8cd77aa 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -15,5 +15,5 @@ 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: ":"