From e9b4895b0f2c280d829ea0bd5e79f2952c00466f Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 13 Jan 2024 17:23:16 +0100
Subject: [PATCH] move timezone logic to a reusable timestamp_type property

---
 .../resources/changelogs/db.changelog-4.2.xml | 29 ++++++++-----------
 .../src/main/resources/migrations.xml         | 10 +++++--
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/commafeed-server/src/main/resources/changelogs/db.changelog-4.2.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-4.2.xml
index ecbada46..837aa513 100644
--- a/commafeed-server/src/main/resources/changelogs/db.changelog-4.2.xml
+++ b/commafeed-server/src/main/resources/changelogs/db.changelog-4.2.xml
@@ -4,23 +4,18 @@
 				   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
 
 	<changeSet id="use-timestamps" author="athou">
-		<modifyDataType tableName="FEEDS" columnName="lastUpdated" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="FEEDS" columnName="lastPublishedDate" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="FEEDS" columnName="lastEntryDate" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="FEEDS" columnName="disabledUntil" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="FEEDENTRIES" columnName="inserted" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="FEEDENTRIES" columnName="updated" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="FEEDENTRYSTATUSES" columnName="entryInserted" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="FEEDENTRYSTATUSES" columnName="entryUpdated" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="USERS" columnName="lastLogin" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="USERS" columnName="created" newDataType="TIMESTAMP" />
-		<modifyDataType tableName="USERS" columnName="recoverPasswordTokenDate" newDataType="TIMESTAMP" />
-		<modifySql dbms="postgresql">
-			<!-- liquibase uses the 'TIMESTAMP WITHOUT TIME ZONE' type by default, which is not a UTC timestamp -->
-			<!-- postgresql UTC timestamp is actually 'TIMESTAMP WITH TIME ZONE' -->
-			<!-- see https://stackoverflow.com/a/48069726/1885506 -->
-			<replace replace="WITHOUT TIME ZONE" with="WITH TIME ZONE" />
-		</modifySql>
+		<validCheckSum>9:bf66bf7def9ec3dab1f365f7230d92cf</validCheckSum>
+		<modifyDataType tableName="FEEDS" columnName="lastUpdated" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="FEEDS" columnName="lastPublishedDate" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="FEEDS" columnName="lastEntryDate" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="FEEDS" columnName="disabledUntil" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="FEEDENTRIES" columnName="inserted" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="FEEDENTRIES" columnName="updated" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="FEEDENTRYSTATUSES" columnName="entryInserted" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="FEEDENTRYSTATUSES" columnName="entryUpdated" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="USERS" columnName="lastLogin" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="USERS" columnName="created" newDataType="${timestamp_type}" />
+		<modifyDataType tableName="USERS" columnName="recoverPasswordTokenDate" newDataType="${timestamp_type}" />
 	</changeSet>
 
 </databaseChangeLog>
diff --git a/commafeed-server/src/main/resources/migrations.xml b/commafeed-server/src/main/resources/migrations.xml
index 7c23aafa..b2516c8b 100644
--- a/commafeed-server/src/main/resources/migrations.xml
+++ b/commafeed-server/src/main/resources/migrations.xml
@@ -4,9 +4,13 @@
 				   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="blob" dbms="h2,mysql,mariadb,mssql" />
+
+	<!-- liquibase uses the 'TIMESTAMP WITHOUT TIME ZONE' type by default, which is not a UTC timestamp -->
+	<!-- postgresql UTC timestamp is actually 'TIMESTAMP WITH TIME ZONE' -->
+	<!-- see https://stackoverflow.com/a/48069726/1885506 -->
+	<property name="timestamp_type" value="timestamp with time zone" dbms="postgresql" />
+	<property name="timestamp_type" value="timestamp" dbms="h2,mysql,mariadb,mssql" />
 
 	<include file="changelogs/db.changelog-1.0.xml" />
 	<include file="changelogs/db.changelog-1.1.xml" />