From ab5d1f3e76c6e27af1b0694bf656d2d8e97b9f6c Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Fri, 20 Jun 2025 12:24:39 +0300 Subject: [PATCH 01/10] TRUNK-5804:Form Domain - Switching from Hibernate Mappings to Annotations --- api/src/main/java/org/openmrs/Form.java | 36 +++++++- api/src/main/resources/hibernate.cfg.xml | 1 - .../org/openmrs/api/db/hibernate/Form.hbm.xml | 83 ------------------- .../org/openmrs/api/OrderServiceTest.java | 2 + 4 files changed, 35 insertions(+), 87 deletions(-) delete mode 100644 api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java index bc006cd9cf0f..083eaa46b938 100644 --- a/api/src/main/java/org/openmrs/Form.java +++ b/api/src/main/java/org/openmrs/Form.java @@ -9,6 +9,8 @@ */ package org.openmrs; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Parameter; import org.hibernate.envers.Audited; import java.util.ArrayList; @@ -16,28 +18,56 @@ import java.util.List; import java.util.Set; +import javax.persistence.AttributeOverride; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + /** * Form * * @version 1.0 */ @Audited +@Entity +@Table(name = "form") +@AttributeOverride(name = "retireReason", column = @Column(name = "retired_reason", length = 255)) public class Form extends BaseChangeableOpenmrsMetadata { public static final long serialVersionUID = 845634L; // Fields - + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "form_form_id_seq") + @GenericGenerator( + name = "form_form_id_seq", + strategy = "native", + parameters = @Parameter(name = "sequence", value = "form_form_id_seq")) + @Column(name = "form_id") private Integer formId; + @Column(name = "version", nullable = false, length = 50) private String version; + @Column(name = "build") private Integer build; + @Column(name = "published") private Boolean published = false; - + + @ManyToOne + @JoinColumn(name = "encounter_type") private EncounterType encounterType; - + + @OneToMany(mappedBy = "form", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) private Set formFields; // Constructors diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml index 13cccd38fdc0..112c50c7669b 100644 --- a/api/src/main/resources/hibernate.cfg.xml +++ b/api/src/main/resources/hibernate.cfg.xml @@ -42,7 +42,6 @@ - diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml deleted file mode 100644 index 1e67c45288ab..000000000000 --- a/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - form_form_id_seq - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index e9d1bd8a9693..bfb2a4a8d7b2 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -37,6 +37,7 @@ import org.openmrs.DrugIngredient; import org.openmrs.DrugOrder; import org.openmrs.Encounter; +import org.openmrs.Form; import org.openmrs.FreeTextDosingInstructions; import org.openmrs.GlobalProperty; import org.openmrs.Location; @@ -2751,6 +2752,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th .addAnnotatedClass(FormResource.class) .addAnnotatedClass(VisitType.class) .addAnnotatedClass(ProviderRole.class) + .addAnnotatedClass(Form.class) .getMetadataBuilder().build(); From ae4a21f7b75f2c9b4457670432d4dd7c2aaf68ee Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Sun, 29 Jun 2025 14:34:37 +0300 Subject: [PATCH 02/10] Add missing info on the description --- api/src/main/java/org/openmrs/Form.java | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java index 083eaa46b938..84ed2bf3627c 100644 --- a/api/src/main/java/org/openmrs/Form.java +++ b/api/src/main/java/org/openmrs/Form.java @@ -40,6 +40,7 @@ @Entity @Table(name = "form") @AttributeOverride(name = "retireReason", column = @Column(name = "retired_reason", length = 255)) +@AttributeOverride(name="description", column = @Column(name = "description", length = 1024)) public class Form extends BaseChangeableOpenmrsMetadata { public static final long serialVersionUID = 845634L; From 52af442c86a3c5aee6a63de9949de68283208c33 Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Fri, 29 Aug 2025 01:13:03 +0300 Subject: [PATCH 03/10] resolving conflicts --- api/src/main/java/org/openmrs/Form.java | 119 ++++++++++++++++-- .../org/openmrs/api/OrderServiceTest.java | 2 + 2 files changed, 109 insertions(+), 12 deletions(-) diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java index 84ed2bf3627c..eb1dcb379320 100644 --- a/api/src/main/java/org/openmrs/Form.java +++ b/api/src/main/java/org/openmrs/Form.java @@ -18,18 +18,18 @@ import java.util.List; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * Form @@ -263,3 +263,98 @@ public void setId(Integer id) { } } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index 86fc4a720465..29aea2f4ba85 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -43,6 +43,7 @@ import org.openmrs.DrugOrder; import org.openmrs.Encounter; import org.openmrs.EncounterRole; +import org.openmrs.Form; import org.openmrs.FreeTextDosingInstructions; import org.openmrs.GlobalProperty; import org.openmrs.Location; @@ -2779,6 +2780,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th .addAnnotatedClass(Template.class) .addAnnotatedClass(AllergyReaction.class) .addAnnotatedClass(ConceptAttributeType.class) + .addAnnotatedClass(Form.class) .getMetadataBuilder().build(); From c76892ebf4ff9ae239792f425edf31bd45066404 Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Sun, 31 Aug 2025 17:12:59 +0300 Subject: [PATCH 04/10] resolving conflicts and added the some updates --- api/src/main/java/org/openmrs/Form.java | 14 ++++++-------- .../java/org/openmrs/api/OrderServiceTest.java | 2 ++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java index eb1dcb379320..74c0ed117b9a 100644 --- a/api/src/main/java/org/openmrs/Form.java +++ b/api/src/main/java/org/openmrs/Form.java @@ -29,6 +29,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; /** @@ -47,21 +48,18 @@ public class Form extends BaseChangeableOpenmrsMetadata { // Fields @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "form_form_id_seq") - @GenericGenerator( - name = "form_form_id_seq", - strategy = "native", - parameters = @Parameter(name = "sequence", value = "form_form_id_seq")) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "form_seq") + @SequenceGenerator(name = "form_seq", sequenceName = "form_form_id_seq", allocationSize = 1) @Column(name = "form_id") private Integer formId; - + @Column(name = "version", nullable = false, length = 50) private String version; - @Column(name = "build") + @Column(name = "build", nullable = true) private Integer build; - @Column(name = "published") + @Column(name = "published", length = 1) private Boolean published = false; @ManyToOne diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index 1e1fe9d7584a..4e984a9bea5b 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -43,6 +43,7 @@ import org.openmrs.DrugOrder; import org.openmrs.Encounter; import org.openmrs.EncounterRole; +import org.openmrs.Form; import org.openmrs.FreeTextDosingInstructions; import org.openmrs.GlobalProperty; import org.openmrs.Location; @@ -2782,6 +2783,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th .addAnnotatedClass(AllergyReaction.class) .addAnnotatedClass(ConceptAttributeType.class) .addAnnotatedClass(Program.class) + .addAnnotatedClass(Form.class) .getMetadataBuilder().build(); From 6d807ca70d7982c2f865472202c8730670377e7e Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Tue, 9 Sep 2025 09:49:22 +0300 Subject: [PATCH 05/10] Removed the GeneratorType.Sequence --- api/src/main/java/org/openmrs/Form.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java index 74c0ed117b9a..ad79c5beb976 100644 --- a/api/src/main/java/org/openmrs/Form.java +++ b/api/src/main/java/org/openmrs/Form.java @@ -9,8 +9,6 @@ */ package org.openmrs; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Parameter; import org.hibernate.envers.Audited; import java.util.ArrayList; @@ -29,7 +27,6 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; /** @@ -48,8 +45,7 @@ public class Form extends BaseChangeableOpenmrsMetadata { // Fields @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "form_seq") - @SequenceGenerator(name = "form_seq", sequenceName = "form_form_id_seq", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "form_id") private Integer formId; From e1ca5d404942db3af76765e988146bb4091e3690 Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Tue, 9 Sep 2025 10:19:20 +0300 Subject: [PATCH 06/10] Removing unncecesary changes --- api/src/main/java/org/openmrs/Form.java | 97 +------------------ .../org/openmrs/api/OrderServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 97 deletions(-) diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java index ad79c5beb976..29bacd84e2fe 100644 --- a/api/src/main/java/org/openmrs/Form.java +++ b/api/src/main/java/org/openmrs/Form.java @@ -256,99 +256,4 @@ public void setId(Integer id) { setFormId(id); } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +} \ No newline at end of file diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index 4e984a9bea5b..6e5974797318 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -4308,4 +4308,4 @@ public void getOrderAttributeTypeByName_shouldReturnCorrectOrderAttributeType() public void getOrderAttributeTypeByName_shouldReturnNullForMismatchedName() { assertNull(orderService.getOrderAttributeTypeByName("InvalidName")); } -} \ No newline at end of file + } \ No newline at end of file From f976ef4cf159c767e1f3d270ad1ce50a110c91ec Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Wed, 10 Sep 2025 17:01:10 +0300 Subject: [PATCH 07/10] Resolve conflicts --- api/src/test/java/org/openmrs/api/OrderServiceTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index da44bdd89565..91890a1204aa 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -44,6 +44,7 @@ import org.openmrs.DrugOrder; import org.openmrs.Encounter; import org.openmrs.EncounterRole; +import org.openmrs.Form; import org.openmrs.FreeTextDosingInstructions; import org.openmrs.GlobalProperty; import org.openmrs.Location; @@ -2787,6 +2788,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th .addAnnotatedClass(ConceptNameTag.class) .addAnnotatedClass(CareSetting.class) .addAnnotatedClass(LocationTag.class) + .addAnnotatedClass(Form.class) .getMetadataBuilder().build(); From 1cd7f967ffa9945b6eec3ae728c3a5f5b44fc0cf Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Fri, 12 Sep 2025 11:21:27 +0300 Subject: [PATCH 08/10] Cleaning up retired_reason from form --- api/src/main/java/org/openmrs/Form.java | 1 - .../schema-only/liquibase-schema-only-1.9.x.xml | 2 +- .../schema-only/liquibase-schema-only-2.1.x.xml | 2 +- .../schema-only/liquibase-schema-only-2.2.x.xml | 2 +- .../schema-only/liquibase-schema-only-2.3.x.xml | 2 +- .../schema-only/liquibase-schema-only-2.4.x.xml | 2 +- .../schema-only/liquibase-schema-only-2.5.x.xml | 2 +- .../schema-only/liquibase-schema-only-2.6.x.xml | 2 +- .../schema-only/liquibase-schema-only-2.7.x.xml | 2 +- .../schema-only/liquibase-schema-only-2.8.x.xml | 2 +- .../updates/liquibase-update-to-latest-2.0.x.xml | 2 +- .../updates/liquibase-update-to-latest-3.0.x.xml | 12 ++++++++++++ .../include/HibernateFormDAOTestDataSet.xml | 10 +++++----- .../api/include/FormServiceTest-formFields.xml | 2 +- .../FormServiceTest-multipleForms-formFields.xml | 8 ++++---- .../org/openmrs/hl7/include/ORUTest-initialData.xml | 12 ++++++------ .../org/openmrs/include/standardTestDataset.xml | 2 +- .../databasechange/standardTest-1.9.7-dataSet.xml | 2 +- initial_test_db.sql | 2 +- .../schema-only/liquibase-schema-only-SNAPSHOT.xml | 2 +- .../liquibase-schema-only-UPDATED-SNAPSHOT.xml | 2 +- 21 files changed, 43 insertions(+), 32 deletions(-) diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java index 29bacd84e2fe..a73cf28e8e0d 100644 --- a/api/src/main/java/org/openmrs/Form.java +++ b/api/src/main/java/org/openmrs/Form.java @@ -37,7 +37,6 @@ @Audited @Entity @Table(name = "form") -@AttributeOverride(name = "retireReason", column = @Column(name = "retired_reason", length = 255)) @AttributeOverride(name="description", column = @Column(name = "description", length = 1024)) public class Form extends BaseChangeableOpenmrsMetadata { diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-1.9.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-1.9.x.xml index 92311c463dbf..b4a5e90f5927 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-1.9.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-1.9.x.xml @@ -721,7 +721,7 @@ - + diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.1.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.1.x.xml index da4732ed7efc..290ab20b0bac 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.1.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.1.x.xml @@ -1072,7 +1072,7 @@ - + diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.2.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.2.x.xml index 10457f77ff26..45b8a9c8abab 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.2.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.2.x.xml @@ -1147,7 +1147,7 @@ - + diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.3.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.3.x.xml index e4db8a95edd7..bda612f99bf1 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.3.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.3.x.xml @@ -1149,7 +1149,7 @@ - + diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.4.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.4.x.xml index acd8077823c1..2951382f8fa3 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.4.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.4.x.xml @@ -1145,7 +1145,7 @@ - + diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.5.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.5.x.xml index bdc637bfec25..e8dfa22a58a9 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.5.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.5.x.xml @@ -1205,7 +1205,7 @@ - + diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.6.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.6.x.xml index 9370739daac7..7397ddafc5d8 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.6.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.6.x.xml @@ -1213,7 +1213,7 @@ - + diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml index 61692a8709b8..1264b3e35d49 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml @@ -1235,7 +1235,7 @@ - + diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.8.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.8.x.xml index f1f80fc13072..39ef44d57544 100644 --- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.8.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.8.x.xml @@ -1235,7 +1235,7 @@ - + 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 index c666a2095dc1..945f8b0939d6 100644 --- 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 @@ -305,7 +305,7 @@ - + + + + + + Rename retired_reason to retire_reason for consistency + + + diff --git a/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateFormDAOTestDataSet.xml b/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateFormDAOTestDataSet.xml index 7e662eec791a..a9b62cd9cdac 100644 --- a/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateFormDAOTestDataSet.xml +++ b/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateFormDAOTestDataSet.xml @@ -15,11 +15,11 @@ -
- - - - + + + + + diff --git a/api/src/test/resources/org/openmrs/api/include/FormServiceTest-formFields.xml b/api/src/test/resources/org/openmrs/api/include/FormServiceTest-formFields.xml index 442471e81e3d..3ef93187406e 100644 --- a/api/src/test/resources/org/openmrs/api/include/FormServiceTest-formFields.xml +++ b/api/src/test/resources/org/openmrs/api/include/FormServiceTest-formFields.xml @@ -14,7 +14,7 @@ - + diff --git a/api/src/test/resources/org/openmrs/api/include/FormServiceTest-multipleForms-formFields.xml b/api/src/test/resources/org/openmrs/api/include/FormServiceTest-multipleForms-formFields.xml index 2b551b1c90cf..6d489587e3c0 100644 --- a/api/src/test/resources/org/openmrs/api/include/FormServiceTest-multipleForms-formFields.xml +++ b/api/src/test/resources/org/openmrs/api/include/FormServiceTest-multipleForms-formFields.xml @@ -14,17 +14,17 @@ - + - + - - + + diff --git a/api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml b/api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml index 9bd4767e1d69..3b35e8de369d 100644 --- a/api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml +++ b/api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml @@ -84,11 +84,11 @@ - - - - - - + + + + + + diff --git a/api/src/test/resources/org/openmrs/include/standardTestDataset.xml b/api/src/test/resources/org/openmrs/include/standardTestDataset.xml index 77b0acf426a8..a485d30a5964 100644 --- a/api/src/test/resources/org/openmrs/include/standardTestDataset.xml +++ b/api/src/test/resources/org/openmrs/include/standardTestDataset.xml @@ -313,7 +313,7 @@ - + diff --git a/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml b/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml index 4b5dd88a5dd4..125ea90184ed 100644 --- a/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml +++ b/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml @@ -254,7 +254,7 @@ - + diff --git a/initial_test_db.sql b/initial_test_db.sql index 8bc50aa8ee7a..b89d9eab89d6 100644 --- a/initial_test_db.sql +++ b/initial_test_db.sql @@ -1823,7 +1823,7 @@ CREATE TABLE `form` ( `retired` tinyint(1) NOT NULL DEFAULT 0, `retired_by` int(11) DEFAULT NULL, `date_retired` datetime DEFAULT NULL, - `retired_reason` varchar(255) DEFAULT NULL, + `retire_reason` varchar(255) DEFAULT NULL, `uuid` char(38) NOT NULL, PRIMARY KEY (`form_id`), UNIQUE KEY `uuid_form` (`uuid`), diff --git a/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml b/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml index 11e5bee4c06b..db6d8f600ecf 100644 --- a/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml +++ b/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml @@ -1235,7 +1235,7 @@ - + diff --git a/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml b/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml index 96a6e56e8c9a..b02382fba21e 100644 --- a/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml +++ b/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml @@ -1235,7 +1235,7 @@ - + From b4a540c0762012746d3f785ffc17c3afedc9ee1b Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Fri, 12 Sep 2025 15:18:55 +0300 Subject: [PATCH 09/10] Resolving ci failures --- .../liquibase/updates/liquibase-update-to-latest-3.0.x.xml | 2 +- .../openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml index 5a023f50362e..3d09356fb4a7 100644 --- a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml +++ b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml @@ -53,7 +53,7 @@ - + diff --git a/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml b/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml index 125ea90184ed..515698e872ee 100644 --- a/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml +++ b/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml @@ -254,7 +254,7 @@ - + From 021eb7fc2cc975009e8e42a0bd9eee1faf249f4d Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Fri, 12 Sep 2025 15:36:12 +0300 Subject: [PATCH 10/10] Updatied changeset count --- .../test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java b/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java index 092b59c49b5e..2a2aadbba3ad 100644 --- a/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java +++ b/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java @@ -32,7 +32,7 @@ public class DatabaseUpdaterDatabaseIT extends DatabaseIT { * This constant needs to be updated when adding new Liquibase update files to openmrs-core. */ - private static final int CHANGE_SET_COUNT_FOR_GREATER_THAN_2_1_X = 905; + private static final int CHANGE_SET_COUNT_FOR_GREATER_THAN_2_1_X = 906; private static final int CHANGE_SET_COUNT_FOR_2_1_X = 870;