Menu
▾
▴
[Hibernate-commits] Hibernate3/test/org/hibernate/test/sql OracleDriverStoredProcedures.hbm.xml,NONE,1.1.2.1 OracleDataDirectDriverStoredProcedures.hbm.xml,NONE,1.1.2.1 DataDirectOracleSQLTest.java,NONE,1.1.2.1 OracleSQLTest.java,1.9.2.1,1.9.2.2 OracleEmployment.hbm.xml,1.18.2.1,1.18.2.2
|
From: <max...@us...> - 2006-02-21 09:09:41
|
Update of /cvsroot/hibernate/Hibernate3/test/org/hibernate/test/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26144/test/org/hibernate/test/sql Modified Files: Tag: Branch_3_1 OracleSQLTest.java OracleEmployment.hbm.xml Added Files: Tag: Branch_3_1 OracleDriverStoredProcedures.hbm.xml OracleDataDirectDriverStoredProcedures.hbm.xml DataDirectOracleSQLTest.java Log Message: HHH-1516 support DataDirect standard jdbc stored procedures --- NEW FILE: OracleDriverStoredProcedures.hbm.xml --- <?xml version="1.0"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- This version is for Oracle drivers proprietary handling of stored procedures/functions. --> <hibernate-mapping package="org.hibernate.test.sql" default-access="field"> <sql-query name="simpleScalar" callable="true"> <return-scalar column="name" type="string"/> <return-scalar column="value" type="long"/> { ? = call simpleScalar(:number) } </sql-query> <sql-query name="paramhandling" callable="true"> <return-scalar column="value" type="long" /> <return-scalar column="value2" type="long" /> { ? = call testParamHandling(?,?) } </sql-query> <sql-query name="paramhandling_mixed" callable="true"> <return-scalar column="value" type="long" /> <return-scalar column="value2" type="long" /> { ? = call testParamHandling(?,:second) } </sql-query> <sql-query name="selectAllEmployments" callable="true"> <return alias="emp" class="Employment"> <return-property name="employee" column="EMPLOYEE"/> <return-property name="employer" column="EMPLOYER"/> <return-property name="startDate" column="STARTDATE"/> <return-property name="endDate" column="ENDDATE"/> <return-property name="regionCode" column="REGIONCODE"/> <return-property name="employmentId" column="EMPID"/> <return-property name="salary"> <return-column name="VALUE"/> <return-column name="CURRENCY"/> </return-property> </return> { ? = call allEmployments() } </sql-query> </hibernate-mapping> --- NEW FILE: OracleDataDirectDriverStoredProcedures.hbm.xml --- <?xml version="1.0"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- This version is for DataDirect drivers jdbc standard handling of stored procedures/functions. --> <hibernate-mapping package="org.hibernate.test.sql" default-access="field"> <sql-query name="simpleScalar" callable="true"> <return-scalar column="name" type="string"/> <return-scalar column="value" type="long"/> { call simpleScalar(:number) } </sql-query> <sql-query name="paramhandling" callable="true"> <return-scalar column="value" type="long" /> <return-scalar column="value2" type="long" /> { call testParamHandling(?,?) } </sql-query> <sql-query name="paramhandling_mixed" callable="true"> <return-scalar column="value" type="long" /> <return-scalar column="value2" type="long" /> { call testParamHandling(?,:second) } </sql-query> <sql-query name="selectAllEmployments" callable="true"> <return alias="emp" class="Employment"> <return-property name="employee" column="EMPLOYEE"/> <return-property name="employer" column="EMPLOYER"/> <return-property name="startDate" column="STARTDATE"/> <return-property name="endDate" column="ENDDATE"/> <return-property name="regionCode" column="REGIONCODE"/> <return-property name="employmentId" column="EMPID"/> <return-property name="salary"> <return-column name="VALUE"/> <return-column name="CURRENCY"/> </return-property> </return> { call allEmployments() } </sql-query> </hibernate-mapping> --- NEW FILE: DataDirectOracleSQLTest.java --- //$Id$ package org.hibernate.test.sql; import junit.framework.Test; import junit.framework.TestSuite; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Oracle9Dialect; /** * @author Gavin King */ public class DataDirectOracleSQLTest extends HandSQLTest { public DataDirectOracleSQLTest(String str) { super(str); } protected String[] getMappings() { return new String[] { "sql/OracleEmployment.hbm.xml", "sql/OracleDataDirectDriverStoredProcedures.hbm.xml" }; } public static Test suite() { return new TestSuite(DataDirectOracleSQLTest.class); } public boolean appliesTo(Dialect dialect) { return ( dialect instanceof Oracle9Dialect ); } } Index: OracleSQLTest.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -d -r1.9.2.1 -r1.9.2.2 --- OracleSQLTest.java 9 Feb 2006 17:30:48 -0000 1.9.2.1 +++ OracleSQLTest.java 21 Feb 2006 09:09:37 -0000 1.9.2.2 @@ -17,7 +17,7 @@ } protected String[] getMappings() { - return new String[] { "sql/OracleEmployment.hbm.xml" }; + return new String[] { "sql/OracleEmployment.hbm.xml", "sql/OracleDriverStoredProcedures.hbm.xml" }; } public static Test suite() { Index: OracleEmployment.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -d -r1.18.2.1 -r1.18.2.2 --- OracleEmployment.hbm.xml 9 Feb 2006 17:30:48 -0000 1.18.2.1 +++ OracleEmployment.hbm.xml 21 Feb 2006 09:09:37 -0000 1.18.2.2 @@ -154,41 +154,7 @@ ORDER BY STARTDATE ASC </sql-query> - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { ? = call simpleScalar(:number) } - </sql-query> - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { ? = call testParamHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { ? = call testParamHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="emp" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="employmentId" column="EMPID"/> - <return-property name="salary"> - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { ? = call allEmployments() } - </sql-query> - - - <database-object> + <database-object> <create> CREATE OR REPLACE FUNCTION testParamHandling (j number, i number) RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; @@ -235,5 +201,4 @@ </drop> </database-object> - </hibernate-mapping> |
