[Hibernate-commits] Hibernate3/test/org/hibernate/test/sql GeneralTest.java,1.2,1.3 General.hbm.xml,1.2,1.3

[<max...@us...>]

Update of /cvsroot/hibernate/Hibernate3/test/org/hibernate/test/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12606/test/org/hibernate/test/sql

Modified Files:
	GeneralTest.java General.hbm.xml 
Log Message:
cleaned up hand sql tests so the general and portable code is run on all databases and only the truly db specific test cases are limited to specific dbs (such as stored procedures and custom sql)

Index: GeneralTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GeneralTest.java	9 Feb 2006 17:26:48 -0000	1.2
+++ GeneralTest.java	9 Feb 2006 18:32:39 -0000	1.3
@@ -23,18 +23,18 @@
 	}
 
 	protected String getOrganizationFetchJoinEmploymentSQL() {
-		return "SELECT org.orgid as {org.id}, " +
-		       "        org.name as {org.name}, " +
-		       "        emp.employer as {emp.key}, " +
-		       "        emp.empid as {emp.element}, " +
+		return "SELECT org.ORGID as {org.id}, " +
+		       "        org.NAME as {org.name}, " +
+		       "        emp.EMPLOYER as {emp.key}, " +
+		       "        emp.EMPID as {emp.element}, " +
 		       "        {emp.element.*}  " +
 		       "FROM ORGANIZATION org " +
 		       "    LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER";
 	}
 
 	protected String getOrganizationJoinEmploymentSQL() {
-		return "SELECT org.orgid as {org.id}, " +
-		       "        org.name as {org.name}, " +
+		return "SELECT org.ORGID as {org.id}, " +
+		       "        org.NAME as {org.name}, " +
 		       "        {emp.*}  " +
 		       "FROM ORGANIZATION org " +
 		       "    LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER";

Index: General.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- General.hbm.xml	9 Feb 2006 17:26:49 -0000	1.2
+++ General.hbm.xml	9 Feb 2006 18:32:39 -0000	1.3
@@ -13,34 +13,34 @@
 
 <hibernate-mapping package="org.hibernate.test.sql" default-access="field">
 	   
-	<class name="Organization">
-		<id name="id" unsaved-value="0" column="orgid">
+	<class name="Organization" table="ORGANIZATION">
+		<id name="id" unsaved-value="0" column="ORGID">
 			<generator class="increment"/>
 		</id>
-		<property name="name" not-null="true"/>
+		<property name="name" column="NAME" not-null="true"/>
 		<set lazy="true" name="employments" 
 			inverse="true">
-			<key column="employer"/> <!-- only needed for DDL generation -->
+			<key column="EMPLOYER"/> <!-- only needed for DDL generation -->
 			<one-to-many class="Employment"/>
 		</set>
 	</class>
 	
-	<class name="Person">
-		<id name="id" unsaved-value="0" column="perid">
+	<class name="Person" table="PERSON">
+		<id name="id" unsaved-value="0" column="PERID">
 			<generator class="increment"/>
 		</id>
-		<property name="name" not-null="true"/>
+		<property name="name" column="NAME" not-null="true"/>
 	</class>
 	
-	<class name="Employment">
-		<id name="employmentId" unsaved-value="0" column="empid">
+	<class name="Employment" table="EMPLOYMENT">
+		<id name="employmentId" unsaved-value="0" column="EMPID">
 			<generator class="increment"/>
 		</id>
-		<many-to-one name="employee" not-null="true" update="false"/>
-		<many-to-one name="employer" not-null="true" update="false"/>
-		<property name="startDate" not-null="false"/>
-		<property name="endDate" insert="false"/>
-		<property name="regionCode" update="false"/>
+		<many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/>
+		<many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/>
+		<property name="startDate" column="STARTDATE" not-null="false"/>
+		<property name="endDate" column="ENDDATE" insert="false"/>
+		<property name="regionCode" column="REGIONCODE" update="false"/>
 	    <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> 
 			<column name="VALUE" sql-type="float"/>
 			<column name="CURRENCY"/>			
@@ -102,12 +102,12 @@
 	<sql-query name="EmploymentAndPerson">
 		<return class="Employment"/>
 		<return class="Person"/>
-		SELECT * FROM Employment, Person
+		SELECT * FROM EMPLOYMENT, PERSON
 	</sql-query>
 
 	<sql-query name="organizationEmploymentsExplicitAliases">
 		<load-collection alias="empcol" role="Organization.employments"/>
-		SELECT empcol.employer as {empcol.key}, empcol.empid as {empcol.element}, {empcol.element.*} 
+		SELECT empcol.EMPLOYER as {empcol.key}, empcol.EMPID as {empcol.element}, {empcol.element.*} 
 		FROM EMPLOYMENT empcol
 		WHERE EMPLOYER = :id
 		ORDER BY STARTDATE ASC, EMPLOYEE ASC
@@ -115,12 +115,12 @@
 
 	<sql-query name="organizationreturnproperty">
 		<return alias="org" class="Organization">
- 		 <return-property name="id" column="orgid"/>
-  		 <return-property name="name" column="name"/>
+ 		 <return-property name="id" column="ORGID"/>
+  		 <return-property name="name" column="NAME"/>
 		</return>
 		<return-join alias="emp" property="org.employments">
-			<return-property name="key" column="employer"/>
-			<return-property name="element" column="empid"/>			
+			<return-property name="key" column="EMPLOYER"/>
+			<return-property name="element" column="EMPID"/>			
 			<return-property name="element.employee" column="EMPLOYEE"/>
 			<return-property name="element.employer" column="EMPLOYER"/>			
 			<return-property name="element.startDate" column="XSTARTDATE"/>
@@ -132,8 +132,7 @@
 			  <return-column name="CURRENCY"/>			
 			</return-property>
 		</return-join>
-		SELECT org.orgid as orgid, org.name as name, emp.employer as employer, emp.empid as empid, emp.employee as employee, emp.employer as employer, emp.startDate as xstartDate, emp.endDate as endDate, emp.regionCode as regionCode, emp.VALUE as VALUE, emp.CURRENCY as CURRENCY
-		FROM ORGANIZATION org
+		SELECT org.ORGID as orgid, org.NAME as name, emp.EMPLOYER as employer, emp.EMPID as empid, emp.EMPLOYEE as employee, emp.EMPLOYER as employer, emp.STARTDATE as xstartDate, emp.ENDDATE as endDate, emp.REGIONCODE as regionCode, emp.VALUE as VALUE, emp.CURRENCY as CURRENCY		FROM ORGANIZATION org
 			LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER
 	</sql-query>
 
@@ -142,7 +141,7 @@
 	<!--  equal to "organizationpropertyreturn" but since no {} nor return-property are used hibernate will fallback to use the columns directly from the mapping -->
 		<return alias="org" class="Organization"/>
 		<return-join alias="emp" property="org.employments"/>
-		SELECT org.orgid as orgid, org.name as name, emp.employer as employer, emp.empid as empid, emp.employee as employee, emp.employer as employer, emp.startDate as startDate, emp.endDate as endDate, emp.regionCode as regionCode, emp.VALUE as VALUE, emp.CURRENCY as CURRENCY
+		SELECT org.ORGID as orgid, org.NAME as name, emp.EMPLOYER as employer, emp.EMPID as empid, emp.EMPLOYEE as employee, emp.EMPLOYER as employer, emp.STARTDATE as startDate, emp.ENDDATE as endDate, emp.REGIONCODE as regionCode, emp.VALUE as VALUE, emp.CURRENCY as CURRENCY
 		FROM ORGANIZATION org
 			LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER
 	</sql-query>