Merge pull request #6015 from slub/h2-upgrade

H2 upgrade
kitodo · Mar 28, 2024 · c72259c · c72259c
2 parents 3d4fd47 + 8e032c7
commit c72259c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/Kitodo-DataManagement/src/test/resources/hibernate.cfg.xml b/Kitodo-DataManagement/src/test/resources/hibernate.cfg.xml
@@ -25,9 +25,11 @@
 
         <property name="hibernate.connection.username">sa</property>
         <property name="hibernate.connection.password"/>
-        <property name="hibernate.connection.url">jdbc:h2:mem:test</property>
+        <property name="hibernate.connection.url">jdbc:h2:mem:test;MODE=MariaDB;DATABASE_TO_LOWER=TRUE;CASE_INSENSITIVE_IDENTIFIERS=TRUE;NON_KEYWORDS=USER</property>
         <property name="hibernate.connection.autoReconnect">true</property>
         <property name="hibernate.connection.autoReconnectForPools">true</property>
+        <property name="hibernate.globally_quoted_identifiers">true</property>
+        <property name="hibernate.globally_quoted_identifiers_skip_column_definitions">true</property>
 
         <!-- connection pool -->
         <property name="hibernate.c3p0.max_size">5000</property>

diff --git a/Kitodo/src/test/resources/hibernate.cfg.xml b/Kitodo/src/test/resources/hibernate.cfg.xml
@@ -25,9 +25,11 @@
 
         <property name="hibernate.connection.username">sa</property>
         <property name="hibernate.connection.password"/>
-        <property name="hibernate.connection.url">jdbc:h2:mem:test</property>
+        <property name="hibernate.connection.url">jdbc:h2:mem:test;MODE=MariaDB;DATABASE_TO_LOWER=TRUE;CASE_INSENSITIVE_IDENTIFIERS=TRUE;NON_KEYWORDS=USER</property>
         <property name="hibernate.connection.autoReconnect">true</property>
         <property name="hibernate.connection.autoReconnectForPools">true</property>
+        <property name="hibernate.globally_quoted_identifiers">true</property>
+        <property name="hibernate.globally_quoted_identifiers_skip_column_definitions">true</property>
 
         <!-- connection pool -->
         <property name="hibernate.c3p0.max_size">5000</property>

diff --git a/Kitodo/src/test/resources/selenium/resources/hibernate.cfg.xml b/Kitodo/src/test/resources/selenium/resources/hibernate.cfg.xml
@@ -22,11 +22,14 @@
         <!-- SQL - Settings -->
         <property name="dialect">org.hibernate.dialect.H2Dialect</property>
         <property name="hibernate.connection.driver_class">org.h2.Driver</property>
+
         <property name="hibernate.connection.username">sa</property>
         <property name="hibernate.connection.password"/>
-        <property name="hibernate.connection.url">
-            jdbc:h2:tcp://localhost/mem:test;DB_CLOSE_DELAY=-1
-        </property>
+        <property name="hibernate.connection.url">jdbc:h2:tcp://localhost/mem:test;DB_CLOSE_DELAY=-1;MODE=MariaDB;DATABASE_TO_LOWER=TRUE;CASE_INSENSITIVE_IDENTIFIERS=TRUE;NON_KEYWORDS=USER</property>
+        <property name="hibernate.connection.autoReconnect">true</property>
+        <property name="hibernate.connection.autoReconnectForPools">true</property>
+        <property name="hibernate.globally_quoted_identifiers">true</property>
+        <property name="hibernate.globally_quoted_identifiers_skip_column_definitions">true</property>
 
         <!-- connection pool -->
         <property name="hibernate.c3p0.max_size">5000</property>

diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,7 @@
         <tomcat.baseversion>9</tomcat.baseversion>
         <tomcat.version>9.0.65</tomcat.version>
         <awaitility.version>4.0.1</awaitility.version>
-        <com.h2database.h2.version>1.4.199</com.h2database.h2.version>
+        <com.h2database.h2.version>2.2.224</com.h2database.h2.version>
         <commons-codec.version>1.15</commons-codec.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <commons-io.version>2.11.0</commons-io.version>