Also change test databasestorage type to bytea for postgresql (#311)

wearefrank · Oct 1, 2024 · 7c46a0b · 7c46a0b
1 parent f488a85
commit 7c46a0b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/main/resources/ladybug/DatabaseChangelog.xml b/src/main/resources/ladybug/DatabaseChangelog.xml
@@ -3,11 +3,15 @@
 	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-4.26.xsd"
 	>
+	<property name="BLOB_FIELD_TYPE" value="bytea" dbms="postgresql"/>
+	<property name="BLOB_FIELD_TYPE" value="blob" dbms="!postgresql"/>
+
 	<!--
 	Separate changelog files to make it possible to only use one of them when either debug storage or test storage is
 	not configured as a database storage
 	-->
- 	<include file="ladybug/DatabaseChangelog_Debug.xml"/>
+	<include file="ladybug/DatabaseChangelog_Debug.xml"/>
 	<include file="ladybug/DatabaseChangelog_Test.xml"/>
+
 	<include file="ladybug/DatabaseChangelog_Custom.xml" errorIfMissing="false"/>
 </databaseChangeLog>
diff --git a/src/main/resources/ladybug/DatabaseChangelog_Debug.xml b/src/main/resources/ladybug/DatabaseChangelog_Debug.xml
@@ -3,8 +3,6 @@
 	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-4.26.xsd"
 	>
-	<property name="BLOB_FIELD_TYPE" value="bytea" dbms="postgresql"/>
-	<property name="BLOB_FIELD_TYPE" value="blob" dbms="!postgresql"/>
 
 	<changeSet id="Ladybug:1" author="Jaco de Groot" failOnError="false">
 		<comment>Add table LADYBUG</comment>
@@ -20,7 +18,7 @@
 			<column name="NUMBEROFCHECKPOINTS" type="INTEGER"/>
 			<column name="ESTIMATEDMEMORYUSAGE" type="BIGINT"/>
 			<column name="STORAGESIZE" type="BIGINT"/>
-			<column name="REPORT" type="BLOB"/>
+			<column name="REPORT" type="${BLOB_FIELD_TYPE}"/>
 			<column name="REPORTXML"  type="CLOB"/>
 		</createTable>
 		<createSequence sequenceName="SEQ_LADYBUG"/><!-- To auto increment STORAGEID on Oracle -->

diff --git a/src/main/resources/ladybug/DatabaseChangelog_Test.xml b/src/main/resources/ladybug/DatabaseChangelog_Test.xml
@@ -3,6 +3,7 @@
 	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-4.26.xsd"
 	>
+
 	<changeSet id="LadybugTest:1" author="Jaco de Groot">
 		<comment>Add table LADYBUGTEST</comment>
 		<createTable tableName="LADYBUGTEST">
@@ -11,7 +12,7 @@
 			</column>
 			<column name="PATH"  type="VARCHAR(4000)"/><!-- 4000 is the maximum VARCHAR length for Oracle. Linux has a maximum path of 4096 characters for most filesystems (https://unix.stackexchange.com/questions/32795/what-is-the-maximum-allowed-filename-and-folder-size-with-ecryptfs) -->
 			<column name="NAME" type="VARCHAR(256)"/>
-			<column name="REPORT" type="BLOB"/>
+			<column name="REPORT" type="${BLOB_FIELD_TYPE}"/>
 			<column name="DESCRIPTION"  type="CLOB"/>
 		</createTable>
 		<createSequence sequenceName="SEQ_LADYBUGTEST"/><!-- To auto increment STORAGEID on Oracle -->