From 09d21d88a4a11ae71600659c428811d279f05711 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 29 May 2023 08:31:47 +0200
Subject: [PATCH] remove usage of deprecated id generator that blocks migration
 to hibernate 6

---
 .../com/commafeed/CommaFeedApplication.java   |  3 +-
 .../resources/changelogs/db.changelog-3.5.xml | 47 +++++++++++++++++++
 .../src/main/resources/migrations.xml         | 29 ++++++------
 3 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 commafeed-server/src/main/resources/changelogs/db.changelog-3.5.xml

diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
index 1b9867b8..9061c970 100644
--- a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -118,8 +118,7 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 			public DataSourceFactory getDataSourceFactory(CommaFeedConfiguration configuration) {
 				DataSourceFactory factory = configuration.getDataSourceFactory();
 
-				// keep using old id generator for backward compatibility
-				factory.getProperties().put(AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "false");
+				factory.getProperties().put(AvailableSettings.PREFERRED_POOLED_OPTIMIZER, "pooled-lo");
 
 				factory.getProperties().put(AvailableSettings.STATEMENT_BATCH_SIZE, "50");
 				factory.getProperties().put(AvailableSettings.BATCH_VERSIONED_DATA, "true");
diff --git a/commafeed-server/src/main/resources/changelogs/db.changelog-3.5.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-3.5.xml
new file mode 100644
index 00000000..238b9b1b
--- /dev/null
+++ b/commafeed-server/src/main/resources/changelogs/db.changelog-3.5.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+				   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+
+	<changeSet id="new-hibernate-id-generator" author="athou">
+		<modifyDataType tableName="hibernate_sequences" columnName="sequence_next_hi_value" newDataType="BIGINT" />
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from FEEDCATEGORIES)
+			 where sequence_name = 'FEEDCATEGORIES'</sql>
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from FEEDENTRIES)
+			 where sequence_name = 'FEEDENTRIES'</sql>
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from FEEDENTRYCONTENTS)
+			 where sequence_name = 'FEEDENTRYCONTENTS'</sql>
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from FEEDENTRYSTATUSES)
+			 where sequence_name = 'FEEDENTRYSTATUSES'</sql>
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from FEEDS)
+			 where sequence_name = 'FEEDS'</sql>
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from FEEDSUBSCRIPTIONS)
+			 where sequence_name = 'FEEDSUBSCRIPTIONS'</sql>
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from USERROLES)
+			 where sequence_name = 'USERROLES'</sql>
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from USERS)
+			 where sequence_name = 'USERS'</sql>
+		<sql>update hibernate_sequences
+			 set sequence_next_hi_value=
+						 (select coalesce(max(id), 0) + 1 from USERSETTINGS)
+			 where sequence_name = 'USERSETTINGS'</sql>
+	</changeSet>
+
+</databaseChangeLog>
diff --git a/commafeed-server/src/main/resources/migrations.xml b/commafeed-server/src/main/resources/migrations.xml
index 166cda0a..4bd549b6 100644
--- a/commafeed-server/src/main/resources/migrations.xml
+++ b/commafeed-server/src/main/resources/migrations.xml
@@ -3,20 +3,21 @@
 				   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
 
-	<property name="blob_type" value="bytea" dbms="postgresql"/>
-	<property name="blob_type" value="blob" dbms="h2"/>
-	<property name="blob_type" value="blob" dbms="mysql,mariadb"/>
-	<property name="blob_type" value="blob" dbms="mssql"/>
+	<property name="blob_type" value="bytea" dbms="postgresql" />
+	<property name="blob_type" value="blob" dbms="h2" />
+	<property name="blob_type" value="blob" dbms="mysql,mariadb" />
+	<property name="blob_type" value="blob" dbms="mssql" />
 
-	<include file="changelogs/db.changelog-1.0.xml"/>
-	<include file="changelogs/db.changelog-1.1.xml"/>
-	<include file="changelogs/db.changelog-1.2.xml"/>
-	<include file="changelogs/db.changelog-1.3.xml"/>
-	<include file="changelogs/db.changelog-1.4.xml"/>
-	<include file="changelogs/db.changelog-1.5.xml"/>
-	<include file="changelogs/db.changelog-2.1.xml"/>
-	<include file="changelogs/db.changelog-2.2.xml"/>
-	<include file="changelogs/db.changelog-2.6.xml"/>
-	<include file="changelogs/db.changelog-3.2.xml"/>
+	<include file="changelogs/db.changelog-1.0.xml" />
+	<include file="changelogs/db.changelog-1.1.xml" />
+	<include file="changelogs/db.changelog-1.2.xml" />
+	<include file="changelogs/db.changelog-1.3.xml" />
+	<include file="changelogs/db.changelog-1.4.xml" />
+	<include file="changelogs/db.changelog-1.5.xml" />
+	<include file="changelogs/db.changelog-2.1.xml" />
+	<include file="changelogs/db.changelog-2.2.xml" />
+	<include file="changelogs/db.changelog-2.6.xml" />
+	<include file="changelogs/db.changelog-3.2.xml" />
+	<include file="changelogs/db.changelog-3.5.xml" />
 
 </databaseChangeLog> 
\ No newline at end of file