Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-3159 replace 'oracle.jdbc.driver' with 'oracle.jdbc' 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@15820 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Chris Bredesen 2009-01-26 20:30:09 +00:00
parent a115232c65
commit 4167921ea3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java
View File

@ -32,7 +32,9 @@ import org.hibernate.sql.ANSIJoinFragment;
* A dialect specifically for use with Oracle 10g. * A dialect specifically for use with Oracle 10g.
* <p/> * <p/>
* The main difference between this dialect and {@link Oracle9iDialect} * The main difference between this dialect and {@link Oracle9iDialect}
* is the use of "ANSI join syntax" here... * is the use of "ANSI join syntax". This dialect also retires the use
* of the <tt>oracle.jdbc.driver</tt> package in favor of
* <tt>oracle.jdbc</tt>.
* *
* @author Steve Ebersole * @author Steve Ebersole
*/ */
@ -46,4 +48,12 @@ public class Oracle10gDialect extends Oracle9iDialect {
return new ANSIJoinFragment(); return new ANSIJoinFragment();
} }
/*
* The package "oracle.jdbc.driver" was retired in 9.0.1 but works fine up
* through 10g. So as not to mess with 9i, we're changing it in 10g -- we
* may not need an 11g Dialect at all.
*/
String getOracleTypesClassName() {
return "oracle.jdbc.OracleTypes";
}
} }

6
core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
View File

@ -388,12 +388,16 @@ public class Oracle8iDialect extends Dialect {
}; };
String getOracleTypesClassName() {
return "oracle.jdbc.driver.OracleTypes";
}
// not final-static to avoid possible classcast exceptions if using different oracle drivers. // not final-static to avoid possible classcast exceptions if using different oracle drivers.
int oracletypes_cursor_value = 0; int oracletypes_cursor_value = 0;
public int registerResultSetOutParameter(java.sql.CallableStatement statement,int col) throws SQLException { public int registerResultSetOutParameter(java.sql.CallableStatement statement,int col) throws SQLException {
if(oracletypes_cursor_value==0) { if(oracletypes_cursor_value==0) {
try { try {
Class types = ReflectHelper.classForName("oracle.jdbc.driver.OracleTypes"); Class types = ReflectHelper.classForName(getOracleTypesClassName());
oracletypes_cursor_value = types.getField("CURSOR").getInt(types.newInstance()); oracletypes_cursor_value = types.getField("CURSOR").getInt(types.newInstance());
} catch (Exception se) { } catch (Exception se) {
throw new HibernateException("Problem while trying to load or access OracleTypes.CURSOR value",se); throw new HibernateException("Problem while trying to load or access OracleTypes.CURSOR value",se);