TRUNK-4143 Fixing build

openmrs · Jan 15, 2014 · b130616 · b130616
1 parent 0d397f4
commit b130616
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java b/api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java
@@ -47,8 +47,8 @@ private void createDiscontinueOrders(JdbcConnection connection, List<Discontinue
 			connection.setAutoCommit(false);
 			insertStatement = connection
 			        .prepareStatement("Insert into orders(previous_order_id, concept_id, patient_id, encounter_id, "
-			                + "creator, date_created, date_stopped, discontinued_by, discontinued_reason, discontinued_reason_non_coded, " +
-                            "uuid, order_action, order_type_id, orderer, order_number) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+			                + "creator, date_created, date_stopped, discontinued_by, discontinued_reason, discontinued_reason_non_coded, "
+			                + "uuid, order_action, order_type_id, orderer, order_number) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
 			for (DiscontinuedOrder discontinuedOrder : discontinuedOrders) {
 				insertStatement.setInt(1, discontinuedOrder.previousOrderId);
 				insertStatement.setInt(2, discontinuedOrder.conceptId);
@@ -179,9 +179,9 @@ private static class DiscontinuedOrder {
 		public int orderTypeId;
 
 		public int orderer;
-
+		
 		public String orderNumber;
-
+		
 		private DiscontinuedOrder(int orderId, int conceptId, int patientId, int encounterId, int discontinuedById,
 		    int discontinuedReasonId, String discontinuedReasonNonCoded, Date dateStopped, int orderTypeId, int orderer) {
 			this.orderId = orderId;

diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml
@@ -29,13 +29,5 @@
 		<many-to-one name="changedBy" class="User" column="changed_by"/>
 
 		<property name="dateChanged" type="java.util.Date" column="date_changed" length="19"/>
-
-		<property name="retired" type="java.lang.Boolean" column="retired" length="1" not-null="true"/>
-
-		<many-to-one name="retiredBy" class="User" column="retired_by"/>
-
-		<property name="dateRetired" type="java.util.Date" column="date_retired" length="19"/>
-
-		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255"/>
 	</class>
 </hibernate-mapping>
diff --git a/api/src/test/java/org/openmrs/DrugTest.java b/api/src/test/java/org/openmrs/DrugTest.java
@@ -15,11 +15,12 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.openmrs.test.BaseContextSensitiveTest;
 
 /**
  * Contains test methods for {@link org.openmrs.Drug}.
  */
-public class DrugTest {
+public class DrugTest extends BaseContextSensitiveTest {
 
 	private final static String UUID_1 = "333cd82c-7d3d-11e3-8633-13f177b345d8";
 
@@ -36,7 +37,7 @@ public void addDrugReferenceMap_shouldSetDrugAsTheDrugToWhichAMappingIsBeingAdde
 		Drug drug2 = new Drug();
 		drug2.setUuid(UUID_2);
 
-		DrugReferenceMap map = new DrugReferenceMap(1);
+		DrugReferenceMap map = new DrugReferenceMap();
 		map.setDrug(drug2);
 		drug1.addDrugReferenceMap(map);
 		Assert.assertEquals(drug1, drug1.getDrugReferenceMaps().iterator().next().getDrug());