TRUNK-6155: Upgrade 2.7 Platform to Liquibase 4.8.0 (#4401)

openmrs · Oct 10, 2023 · 298022c · 298022c
1 parent cd64971
commit 298022c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 48 deletions.
diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.0.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.0.x.xml
diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.1.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.1.x.xml
@@ -42,14 +42,14 @@
 	</changeSet>
 	<changeSet author="vshankar" id="201609171146-1">
 		<preConditions onFail="MARK_RAN">
-			<foreignKeyConstraintExists foreignKeyName="member_patient"/>
+			<foreignKeyConstraintExists foreignKeyTableName="cohort_member" foreignKeyName="member_patient"/>
 		</preConditions>
 		<comment>Dropping foreign key constraint member_patient</comment>
 		<dropForeignKeyConstraint constraintName="member_patient" baseTableName="cohort_member"/>
 	</changeSet>
 	<changeSet author="vshankar" id="201609171146-1.1">
 		<preConditions onFail="MARK_RAN">
-			<foreignKeyConstraintExists foreignKeyName="parent_cohort"/>
+			<foreignKeyConstraintExists foreignKeyTableName="cohort_member" foreignKeyName="parent_cohort"/>
 		</preConditions>
 		<comment>Dropping foreign key constraint parent_cohort</comment>
 		<dropForeignKeyConstraint constraintName="parent_cohort" baseTableName="cohort_member"/>

diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.4.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.4.x.xml
@@ -116,7 +116,7 @@
 
 	<changeSet id="20200622-cascade_delete_concept_comlex" author="aman" dbms="postgresql">
 		<preConditions onFail="MARK_RAN">
-    	    <foreignKeyConstraintExists foreignKeyName="concept_attributes"/>
+    	    <foreignKeyConstraintExists foreignKeyTableName="concept_complex" foreignKeyName="concept_attributes"/>
 		</preConditions>
 		<comment>Updating foreign key concept_attributes to add delete CASCADES</comment>
    		<dropForeignKeyConstraint baseTableName="concept_complex" constraintName="concept_attributes"/>
@@ -125,23 +125,23 @@
 
 	<changeSet id="20200622-cascade_delete_concept_numeric" author="aman" dbms="postgresql">
 		<preConditions onFail="MARK_RAN">
-   	    	<foreignKeyConstraintExists foreignKeyName="numeric_attributes"/>
+   	    	<foreignKeyConstraintExists foreignKeyTableName="concept_numeric" foreignKeyName="numeric_attributes"/>
 		</preConditions>
 		<comment>Updating foreign key numeric_attributes to add delete CASCADES</comment>
 		<dropForeignKeyConstraint baseTableName="concept_numeric" constraintName="numeric_attributes"/>
 		<addForeignKeyConstraint baseColumnNames="concept_id" baseTableName="concept_numeric" constraintName="numeric_attributes" deferrable="false" initiallyDeferred="false" onDelete="CASCADE" onUpdate="NO ACTION" referencedColumnNames="concept_id" referencedTableName="concept"/>   	
 	</changeSet>
 	<changeSet id="20200622-cascade_delete_patient" author="aman" dbms="postgresql">
 		<preConditions onFail="MARK_RAN">
-   		   <foreignKeyConstraintExists foreignKeyName="person_id_for_patient"/>
+   		   <foreignKeyConstraintExists foreignKeyTableName="patient" foreignKeyName="person_id_for_patient"/>
 		</preConditions>
 		<comment>Updating foreign key person_id_for_patient to add delete CASCADES</comment>
    		<dropForeignKeyConstraint baseTableName="patient" constraintName="person_id_for_patient"/>
 		<addForeignKeyConstraint baseColumnNames="patient_id" baseTableName="patient" constraintName="person_id_for_patient" deferrable="false" initiallyDeferred="false" onDelete="CASCADE" onUpdate="CASCADE" referencedColumnNames="person_id" referencedTableName="person"/>
 	</changeSet>
 	<changeSet id="20200622-cascade_delete_test_order" author="aman" dbms="postgresql">
 		<preConditions onFail="MARK_RAN">
-	        <foreignKeyConstraintExists foreignKeyName="test_order_order_id_fk"/>
+	        <foreignKeyConstraintExists foreignKeyTableName="test_order" foreignKeyName="test_order_order_id_fk"/>
 		</preConditions>
 		<comment>Updating foreign key test_order_order_id_fk to add delete CASCADES</comment>
     	<dropForeignKeyConstraint baseTableName="test_order" constraintName="test_order_order_id_fk"/>

diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.5.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.5.x.xml
@@ -366,7 +366,7 @@
 
 	<changeSet id="2020-09-16-1700-TRUNK-5736" author="miirochristopher">
 		<preConditions onFail="MARK_RAN" onFailMessage="Cannot delete or update user, foreign key constraint user_who_changed_user fails">
-			<foreignKeyConstraintExists foreignKeyName="user_who_changed_user"/>
+			<foreignKeyConstraintExists foreignKeyTableName="users" foreignKeyName="user_who_changed_user"/>
 		</preConditions>
 		<comment>Updating foreign key user_who_changed_user to add delete CASCADE</comment>
 		<dropForeignKeyConstraint baseTableName="users" constraintName="user_who_changed_user"/>

diff --git a/liquibase/pom.xml b/liquibase/pom.xml
@@ -74,7 +74,7 @@
 			<plugin>
 				<groupId>org.liquibase</groupId>
 				<artifactId>liquibase-maven-plugin</artifactId>
-				<version>3.10.3</version>
+				<version>4.8.0</version>
 				<configuration>
 					<changeLogFile>snapshots/${changelogfile}</changeLogFile>
 					<diffTypes>${diffTypes}</diffTypes>

diff --git a/pom.xml b/pom.xml
@@ -269,7 +269,7 @@
 			<dependency>
 				<groupId>org.liquibase</groupId>
 				<artifactId>liquibase-core</artifactId>
-				<version>4.4.3</version>
+				<version>4.8.0</version>
 				<exclusions>
 					<exclusion>
 						<groupId>ch.qos.logback</groupId>