From 0c5ad566b6c2d368b8acf510e203d8a567e8c487 Mon Sep 17 00:00:00 2001
From: brmeyer <brmeyer@redhat.com>
Date: Mon, 29 Oct 2012 14:24:43 -0400
Subject: [PATCH] HHH-7733 NativeSQLQueriesTest failing on Postgres

---
 .../test/sql/hand/query/NativeSQLQueries.hbm.xml          | 8 ++++----
 .../test/sql/hand/query/NativeSQLQueriesTest.java         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml
index 12be3b669e..70c8608bd4 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml
@@ -53,7 +53,7 @@
 		<property name="endDate" column="ENDDATE" insert="false"/>
 		<property name="regionCode" column="REGIONCODE" update="false"/>
 	    <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType">
-			<column name="`VALUE`" sql-type="float"/>
+			<column name="AMOUNT" sql-type="float"/>
 			<column name="CURRENCY"/>			
 		</property>
 	</class>
@@ -246,7 +246,7 @@
 			<return-property name="element.regionCode" column="REGIONCODE"/>			
 			<return-property name="element.employmentId" column="EMPID"/>						
 			<return-property name="element.salary">
-                <return-column name="`VALUE`"/>
+                <return-column name="AMOUNT"/>
                 <return-column name="CURRENCY"/>
 			</return-property>
 		</return-join>
@@ -259,7 +259,7 @@
             emp.STARTDATE as xstartDate,
             emp.ENDDATE as endDate,
             emp.REGIONCODE as regionCode,
-            emp.VALUE as VALUE,
+            emp.AMOUNT as AMOUNT,
             emp.CURRENCY as CURRENCY
         FROM ORGANIZATION org
 			LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER
@@ -279,7 +279,7 @@
             emp.STARTDATE as startDate,
             emp.ENDDATE as endDate,
             emp.REGIONCODE as regionCode,
-            emp.VALUE as VALUE,
+            emp.AMOUNT as AMOUNT,
             emp.CURRENCY as CURRENCY
 		FROM ORGANIZATION org
 			LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java
index 344749567a..b7ae12442f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java
@@ -536,7 +536,7 @@ public class NativeSQLQueriesTest extends BaseCoreFunctionalTestCase {
 		assertEquals(1, list.size());
 		m = (Map) list.get(0);
 		assertTrue(m.containsKey("EMPID"));
-		assertTrue(m.containsKey("VALUE"));
+		assertTrue(m.containsKey("AMOUNT"));
 		assertTrue(m.containsKey("ENDDATE"));
 		assertEquals(8, m.size());
 
@@ -650,7 +650,7 @@ public class NativeSQLQueriesTest extends BaseCoreFunctionalTestCase {
 				"       emp.STARTDATE 	as startDate," +
 				"       emp.ENDDATE 	as endDate," +
 				"       emp.REGIONCODE 	as regionCode," +
-				"       emp.VALUE 		as VALUE," +
+				"       emp.AMOUNT 		as AMOUNT," +
 				"       emp.CURRENCY 	as CURRENCY" +
 				" FROM 	ORGANIZATION org" +
 				"    LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER";
@@ -678,7 +678,7 @@ public class NativeSQLQueriesTest extends BaseCoreFunctionalTestCase {
 				.addProperty( "element.endDate", "endDate" )
 				.addProperty( "element.regionCode", "regionCode" )
 				.addProperty( "element.employmentId", "empId" )
-				.addProperty( "element.salary" ).addColumnAlias( "VALUE" ).addColumnAlias( "CURRENCY" );
+				.addProperty( "element.salary" ).addColumnAlias( "AMOUNT" ).addColumnAlias( "CURRENCY" );
 		sqlQuery.list();
 
 		// lets try a totally different approach now and pull back scalars, first with explicit types
@@ -690,7 +690,7 @@ public class NativeSQLQueriesTest extends BaseCoreFunctionalTestCase {
 				.addScalar( "endDate", TimestampType.INSTANCE )
 				.addScalar( "regionCode", StringType.INSTANCE )
 				.addScalar( "empId", LongType.INSTANCE )
-				.addScalar( "VALUE", FloatType.INSTANCE )
+				.addScalar( "AMOUNT", FloatType.INSTANCE )
 				.addScalar( "CURRENCY", StringType.INSTANCE );