Trunk-5650:Add parent order group to order group (#3068)

openmrs · Dec 19, 2019 · 230a4a5 · 230a4a5
1 parent bfbc32a
commit 230a4a5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/api/src/main/resources/liquibase-update-to-2.3.xml b/api/src/main/resources/liquibase-update-to-2.3.xml
@@ -88,21 +88,4 @@
 			<where>system_id='admin'</where>
 		</update>
 	</changeSet>
-	 <changeSet id="20190815-Trunk-5650" author="gitacliff">
-		<preConditions onFail="MARK_RAN">
-			<not>
-				<columnExists tableName="order_group" columnName="parent_order_group"/>				
-			</not>
-		</preConditions>
-		<comment>Adding "parent_order_group" column to order_group table</comment>
-        <addColumn tableName="order_group">
-            <column name="parent_order_group" type="int">
-            	<constraints nullable="true"/>
-            </column>
-        </addColumn><addForeignKeyConstraint baseTableName="order_group"
-								 baseColumnNames="parent_order_group"
-								 constraintName="order_group_parent_order_group_fk"
-								 referencedTableName="order_group"
-								 referencedColumnNames="order_group_id" />
-    </changeSet>
 </databaseChangeLog>
diff --git a/api/src/main/resources/liquibase-update-to-2.4.xml b/api/src/main/resources/liquibase-update-to-2.4.xml
@@ -42,6 +42,23 @@
 								 constraintName="order_group_order_group_reason_fk"
 								 referencedTableName="concept"
 								 referencedColumnNames="concept_id" />
+    </changeSet>
+     <changeSet id="20190815-Trunk-5650" author="gitacliff">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="order_group" columnName="parent_order_group"/>				
+			</not>
+		</preConditions>
+		<comment>Adding "parent_order_group" column to order_group table</comment>
+        <addColumn tableName="order_group">
+            <column name="parent_order_group" type="int">
+            	<constraints nullable="true"/>
+            </column>
+        </addColumn><addForeignKeyConstraint baseTableName="order_group"
+								 baseColumnNames="parent_order_group"
+								 constraintName="order_group_parent_order_group_fk"
+								 referencedTableName="order_group"
+								 referencedColumnNames="order_group_id" />
     </changeSet>
 	</databaseChangeLog>