[hibernate-commits] Hibernate SVN: r19442 - core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/sql/hand/custom/db2.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-05-10 05:35:18 -0400 (Mon, 10 May 2010)
New Revision: 19442

Modified:
   core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml
Log:
JBPAPP-4261 HHH-5211 no need to create a schema first when run this test org.hibernate.test.sql.hand.custom.db2.DB2CustomSQLTest

Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml	2010-05-10 09:31:20 UTC (rev 19441)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml	2010-05-10 09:35:18 UTC (rev 19442)
@@ -150,19 +150,19 @@
 	<sql-query name="simpleScalar" callable="true">
 		<return-scalar column="name" type="string"/>
 		<return-scalar column="value" type="long"/>
-		{ call HIBDB2TST.simpleScalar(:number) }
+		{ call simpleScalar(:number) }
 	</sql-query>
 
 	<sql-query name="paramhandling" callable="true">
 		<return-scalar column="value" type="long"/>
 		<return-scalar column="value2" type="long"/>
-		{ call HIBDB2TST.paramHandling(?,?) }
+		{ call paramHandling(?,?) }
 	</sql-query>
 
 	<sql-query name="paramhandling_mixed" callable="true">
 		<return-scalar column="value" type="long" />
 		<return-scalar column="value2" type="long" />
-		{ call HIBDB2TST.paramHandling(?,:second) }
+		{ call paramHandling(?,:second) }
 	</sql-query>
 	
 	<sql-query name="selectAllEmployments" callable="true">
@@ -180,18 +180,13 @@
 				<return-column name="CURRENCY"/>			
 			</return-property>
 		</return>
-		{ call HIBDB2TST.selectAllEmployments() }
+		{ call selectAllEmployments() }
 	</sql-query>
 
-	<!-- DB2 seem to *require* users to specify explicit schema/location when executing a stored procedure *stupid* -->
-	<database-object>
-	  <create>CREATE SCHEMA HIBDB2TST</create>
-	  <drop>DROP SCHEMA HIBDB2TST RESTRICT</drop>
-	</database-object>
 	
 	<database-object>
 		<create>
-		CREATE PROCEDURE HIBDB2TST.selectAllEmployments () RESULT SETS 1
+		CREATE PROCEDURE selectAllEmployments () RESULT SETS 1
         P1: BEGIN
          DECLARE C1 CURSOR WITH RETURN FOR
 			SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, 
@@ -201,14 +196,14 @@
         END P1
 		</create>
 		<drop>
-		DROP PROCEDURE HIBDB2TST.selectAllEmployments
+		DROP PROCEDURE selectAllEmployments
 		</drop>
 	</database-object>
 
 	
 	<database-object>
 		<create>
-		CREATE PROCEDURE HIBDB2TST.paramHandling (IN j SMALLINT, IN i SMALLINT) RESULT SETS 1
+		CREATE PROCEDURE paramHandling (IN j SMALLINT, IN i SMALLINT) RESULT SETS 1
         P1: BEGIN
          DECLARE C1 CURSOR WITH RETURN FOR
     		SELECT j as value, i as value2 from sysibm.sysdummy1;
@@ -216,13 +211,13 @@
         END P1
 		</create>
 		<drop>
-		DROP PROCEDURE HIBDB2TST.paramHandling
+		DROP PROCEDURE paramHandling
 		</drop>
 	</database-object>
 	
     <database-object>
 	 <create>
-		CREATE PROCEDURE HIBDB2TST.simpleScalar (IN j SMALLINT) RESULT SETS 1
+		CREATE PROCEDURE simpleScalar (IN j SMALLINT) RESULT SETS 1
         P1: BEGIN
          DECLARE C1 CURSOR WITH RETURN FOR
     		SELECT j as value, 'getAll' as name from sysibm.sysdummy1;
@@ -230,7 +225,7 @@
         END P1
 	 </create>
 	 <drop>
-		DROP PROCEDURE HIBDB2TST.simpleScalar
+		DROP PROCEDURE simpleScalar
 	 </drop>
 	</database-object>	
 </hibernate-mapping>