[hibernate-commits] Hibernate SVN: r15511 - in core/branches/Branch_3_2: etc and 12 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Nov 4 20:46:59 EST 2008
Author: gbadner
Date: 2008-11-04 20:46:59 -0500 (Tue, 04 Nov 2008)
New Revision: 15511
Modified:
core/branches/Branch_3_2/doc/reference/en/modules/basic_mapping.xml
core/branches/Branch_3_2/doc/reference/en/modules/configuration.xml
core/branches/Branch_3_2/etc/hibernate.properties
core/branches/Branch_3_2/src/org/hibernate/sql/OracleJoinFragment.java
core/branches/Branch_3_2/test/org/hibernate/test/bidi/AuctionTest2.java
core/branches/Branch_3_2/test/org/hibernate/test/cut/CompositeUserTypeTest.java
core/branches/Branch_3_2/test/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
core/branches/Branch_3_2/test/org/hibernate/test/generated/ComponentOwner.hbm.xml
core/branches/Branch_3_2/test/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml
core/branches/Branch_3_2/test/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java
core/branches/Branch_3_2/test/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java
core/branches/Branch_3_2/test/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java
core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml
core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java
core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java
core/branches/Branch_3_2/test/org/hibernate/test/hql/ASTParserLoadingTest.java
core/branches/Branch_3_2/test/org/hibernate/test/hql/HQLTest.java
core/branches/Branch_3_2/test/org/hibernate/test/legacy/FooBarTest.java
core/branches/Branch_3_2/test/org/hibernate/test/legacy/IJTest.java
core/branches/Branch_3_2/test/org/hibernate/test/legacy/MasterDetailTest.java
core/branches/Branch_3_2/test/org/hibernate/test/legacy/SQLFunctionsTest.java
core/branches/Branch_3_2/test/org/hibernate/test/legacy/SQLLoaderTest.java
core/branches/Branch_3_2/test/org/hibernate/test/rowid/RowIdTest.java
core/branches/Branch_3_2/test/org/hibernate/test/sql/check/OracleCheckStyleTest.java
core/branches/Branch_3_2/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java
Log:
HHH-3214 : Update unit tests and config files to use non-deprecated Oracle dialects
Modified: core/branches/Branch_3_2/doc/reference/en/modules/basic_mapping.xml
===================================================================
--- core/branches/Branch_3_2/doc/reference/en/modules/basic_mapping.xml 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/doc/reference/en/modules/basic_mapping.xml 2008-11-05 01:46:59 UTC (rev 15511)
@@ -3547,12 +3547,12 @@
Additionally, these database objects can be optionally scoped such that they only
apply when certain dialects are used.
</para>
- <programlisting><![CDATA[<hibernate-mapping>
+ <programlisting revision="1"><![CDATA[<hibernate-mapping>
...
<database-object>
<definition class="MyTriggerDefinition"/>
- <dialect-scope name="org.hibernate.dialect.Oracle9Dialect"/>
- <dialect-scope name="org.hibernate.dialect.OracleDialect"/>
+ <dialect-scope name="org.hibernate.dialect.Oracle9iDialect"/>
+ <dialect-scope name="org.hibernate.dialect.Oracle10gDialect"/>
</database-object>
</hibernate-mapping>]]></programlisting>
</sect1>
Modified: core/branches/Branch_3_2/doc/reference/en/modules/configuration.xml
===================================================================
--- core/branches/Branch_3_2/doc/reference/en/modules/configuration.xml 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/doc/reference/en/modules/configuration.xml 2008-11-05 01:46:59 UTC (rev 15511)
@@ -1028,7 +1028,7 @@
other properties listed above, saving you the effort of specifying them manually.
</para>
- <table frame="topbot" id="sql-dialects" revision="2">
+ <table frame="topbot" id="sql-dialects" revision="3">
<title>Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)</title>
<tgroup cols="2">
<colspec colwidth="1*"/>
@@ -1062,12 +1062,15 @@
<entry>MySQL with MyISAM</entry> <entry><literal>org.hibernate.dialect.MySQLMyISAMDialect</literal></entry>
</row>
<row>
- <entry>Oracle (any version)</entry> <entry><literal>org.hibernate.dialect.OracleDialect</literal></entry>
+ <entry>Oracle 8i</entry> <entry><literal>org.hibernate.dialect.Oracle8iDialect</literal></entry>
</row>
<row>
- <entry>Oracle 9i/10g</entry> <entry><literal>org.hibernate.dialect.Oracle9Dialect</literal></entry>
+ <entry>Oracle 9i</entry> <entry><literal>org.hibernate.dialect.Oracle9iDialect</literal></entry>
</row>
<row>
+ <entry>Oracle 10g</entry> <entry><literal>org.hibernate.dialect.Oracle10gDialect</literal></entry>
+ </row>
+ <row>
<entry>Sybase</entry> <entry><literal>org.hibernate.dialect.SybaseDialect</literal></entry>
</row>
<row>
Modified: core/branches/Branch_3_2/etc/hibernate.properties
===================================================================
--- core/branches/Branch_3_2/etc/hibernate.properties 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/etc/hibernate.properties 2008-11-05 01:46:59 UTC (rev 15511)
@@ -59,8 +59,8 @@
## Oracle
-#hibernate.dialect org.hibernate.dialect.OracleDialect
-#hibernate.dialect org.hibernate.dialect.Oracle9Dialect
+#hibernate.dialect org.hibernate.dialect.Oracle9iDialect
+#hibernate.dialect org.hibernate.dialect.Oracle10gDialect
#hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
#hibernate.connection.username ora
#hibernate.connection.password ora
Modified: core/branches/Branch_3_2/src/org/hibernate/sql/OracleJoinFragment.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/sql/OracleJoinFragment.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/src/org/hibernate/sql/OracleJoinFragment.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -91,7 +91,7 @@
addLeftOuterJoinCondition( on );
}
else {
- throw new UnsupportedOperationException( "join type not supported by OracleJoinFragment (use Oracle9Dialect)" );
+ throw new UnsupportedOperationException( "join type not supported by OracleJoinFragment (use Oracle9iDialect)" );
}
}
Modified: core/branches/Branch_3_2/test/org/hibernate/test/bidi/AuctionTest2.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/bidi/AuctionTest2.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/bidi/AuctionTest2.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -9,7 +9,6 @@
import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.dialect.Oracle9Dialect;
import junit.framework.Test;
Modified: core/branches/Branch_3_2/test/org/hibernate/test/cut/CompositeUserTypeTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/cut/CompositeUserTypeTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/cut/CompositeUserTypeTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -9,7 +9,6 @@
import org.hibernate.Session;
import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -45,7 +44,7 @@
result = s.createQuery("from Transaction tran where tran.value.amount > 1.0 and tran.value.currency = 'AUD'").list();
assertEquals( result.size(), 1 );
- if ( !(getDialect() instanceof HSQLDialect) && ! (getDialect() instanceof Oracle9Dialect) ) {
+ if ( !(getDialect() instanceof HSQLDialect) ) {
result = s.createQuery("from Transaction txn where txn.value = (1.5, 'AUD')").list();
assertEquals( result.size(), 1 );
Modified: core/branches/Branch_3_2/test/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -26,7 +26,6 @@
import org.hibernate.dialect.InterbaseDialect;
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
import org.hibernate.dialect.function.SQLFunction;
@@ -176,7 +175,6 @@
}
public void testBroken() throws Exception {
- if (getDialect() instanceof Oracle9Dialect) return;
Session s = openSession();
Transaction t = s.beginTransaction();
Broken b = new Fixed();
Modified: core/branches/Branch_3_2/test/org/hibernate/test/generated/ComponentOwner.hbm.xml
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/generated/ComponentOwner.hbm.xml 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/generated/ComponentOwner.hbm.xml 2008-11-05 01:46:59 UTC (rev 15511)
@@ -31,8 +31,8 @@
<drop>
<![CDATA[DROP TRIGGER t_iu_part_gen_comp]]>
</drop>
- <dialect-scope name="org.hibernate.dialect.Oracle9Dialect"/>
- <dialect-scope name="org.hibernate.dialect.OracleDialect"/>
+ <dialect-scope name="org.hibernate.dialect.Oracle9iDialect"/>
+ <dialect-scope name="org.hibernate.dialect.Oracle10gDialect"/>
</database-object>
</hibernate-mapping>
\ No newline at end of file
Modified: core/branches/Branch_3_2/test/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml 2008-11-05 01:46:59 UTC (rev 15511)
@@ -35,8 +35,8 @@
<drop>
<![CDATA[DROP TRIGGER t_iu_gen_prop]]>
</drop>
- <dialect-scope name="org.hibernate.dialect.Oracle9Dialect"/>
- <dialect-scope name="org.hibernate.dialect.OracleDialect"/>
+ <dialect-scope name="org.hibernate.dialect.Oracle9iDialect"/>
+ <dialect-scope name="org.hibernate.dialect.Oracle10gDialect"/>
</database-object>
</hibernate-mapping>
\ No newline at end of file
Modified: core/branches/Branch_3_2/test/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -5,7 +5,7 @@
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.Oracle9Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.Session;
/**
@@ -27,7 +27,7 @@
}
public boolean appliesTo(Dialect dialect) {
- return dialect instanceof Oracle9Dialect;
+ return dialect instanceof Oracle9iDialect;
}
public void testPartialComponentGeneration() {
Modified: core/branches/Branch_3_2/test/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -1,12 +1,11 @@
// $Id$
package org.hibernate.test.generated;
-import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* Implementation of TriggerGeneratedValuesWithoutCachingTest.
@@ -26,7 +25,7 @@
public boolean appliesTo(Dialect dialect) {
// currently have only defined triggers for oracle...
// TODO : add more triggers for dialects which allow mods in triggers...
- return ( dialect instanceof Oracle9Dialect );
+ return ( dialect instanceof Oracle9iDialect );
}
public static Test suite() {
Modified: core/branches/Branch_3_2/test/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -4,7 +4,7 @@
import junit.framework.Test;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.Oracle9Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
@@ -25,7 +25,7 @@
public boolean appliesTo(Dialect dialect) {
// currently have only defined triggers for oracle...
// TODO : add more triggers for dialects which allow mods in triggers...
- return ( dialect instanceof Oracle9Dialect );
+ return ( dialect instanceof Oracle9iDialect );
}
public String getCacheConcurrencyStrategy() {
Modified: core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml 2008-11-05 01:46:59 UTC (rev 15511)
@@ -29,8 +29,8 @@
<drop>
<![CDATA[DROP TRIGGER t_i_my_entity]]>
</drop>
- <dialect-scope name="org.hibernate.dialect.Oracle9Dialect"/>
- <dialect-scope name="org.hibernate.dialect.OracleDialect"/>
+ <dialect-scope name="org.hibernate.dialect.Oracle9iDialect"/>
+ <dialect-scope name="org.hibernate.dialect.Oracle10gDialect"/>
</database-object>
</hibernate-mapping>
\ No newline at end of file
Modified: core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -3,9 +3,8 @@
import junit.framework.Test;
import org.hibernate.Session;
-import org.hibernate.dialect.DataDirectOracle9Dialect;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.Oracle9Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -24,7 +23,7 @@
}
public boolean appliesTo(Dialect dialect) {
- return ( dialect instanceof Oracle9Dialect );
+ return ( dialect instanceof Oracle9iDialect );
}
public static Test suite() {
@@ -32,10 +31,6 @@
}
public void testJDBC3GetGeneratedKeysSupportOnOracle() {
- if ( getDialect() instanceof DataDirectOracle9Dialect ) {
- reportSkip( "DataDirect drivers known to not support JDBC3 getGeneratedKeys for Oracle", "oracle getGeneratedKeys support" );
- return;
- }
Session session = openSession();
session.beginTransaction();
Modified: core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -4,9 +4,8 @@
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
-import org.hibernate.dialect.DataDirectOracle9Dialect;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.Oracle9Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -25,7 +24,7 @@
public boolean appliesTo(Dialect dialect) {
// the DataDirect driver for Oracle known to not support
// JDBC3 getGeneratedKeys...
- return ( dialect instanceof Oracle9Dialect ) && ( ! ( dialect instanceof DataDirectOracle9Dialect ) ) ;
+ return ( dialect instanceof Oracle9iDialect );
}
public String[] getMappings() {
Modified: core/branches/Branch_3_2/test/org/hibernate/test/hql/ASTParserLoadingTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/hql/ASTParserLoadingTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/hql/ASTParserLoadingTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -30,7 +30,6 @@
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.Oracle8iDialect;
-import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseDialect;
@@ -1209,7 +1208,7 @@
String dateStr1 = (String) session.createQuery("select str(current_date) from Animal").uniqueResult();
String dateStr2 = (String) session.createQuery("select str(year(current_date))||'-'||str(month(current_date))||'-'||str(day(current_date)) from Animal").uniqueResult();
System.out.println(dateStr1 + '=' + dateStr2);
- if ( ! ( getDialect() instanceof Oracle9Dialect || getDialect() instanceof Oracle8iDialect ) ) { //Oracle renders the name of the month :(
+ if ( ! ( getDialect() instanceof Oracle8iDialect ) ) { //Oracle renders the name of the month :(
String[] dp1 = StringHelper.split("-", dateStr1);
String[] dp2 = StringHelper.split("-", dateStr2);
for (int i=0; i<3; i++) {
Modified: core/branches/Branch_3_2/test/org/hibernate/test/hql/HQLTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/hql/HQLTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/hql/HQLTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -18,7 +18,6 @@
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.Oracle8iDialect;
-import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.function.SQLFunction;
@@ -671,7 +670,6 @@
}
public void testGroupByFunction() {
- if ( getDialect() instanceof Oracle9Dialect ) return;
if ( getDialect() instanceof Oracle8iDialect ) return; // the new hiearchy...
if ( getDialect() instanceof PostgreSQLDialect ) return;
assertTranslation( "select count(*) from Human h group by year(h.birthdate)" );
@@ -850,7 +848,6 @@
public void testClassProperty() throws Exception {
// This test causes failures on theta-join dialects because the SQL is different.
// The queries are semantically the same however.
- if ( getDialect() instanceof Oracle9Dialect ) return;
if ( getDialect() instanceof Oracle8iDialect ) return;
assertTranslation( "from Animal a where a.mother.class = Reptile" );
}
@@ -1126,7 +1123,6 @@
// This test causes failures on theta-join dialects because the SQL is different. The old parser
// duplicates the condition, whereas the new parser does not. The queries are semantically the
// same however.
- if ( getDialect() instanceof Oracle9Dialect ) return;
if ( getDialect() instanceof Oracle8iDialect ) return;
assertTranslation( "select an.mother.bodyWeight from Animal an join an.mother m where an.mother.bodyWeight > 10" );
assertTranslation( "select an.mother.bodyWeight from Animal an where an.mother.bodyWeight > 10" );
Modified: core/branches/Branch_3_2/test/org/hibernate/test/legacy/FooBarTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/legacy/FooBarTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/legacy/FooBarTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -51,8 +51,6 @@
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.Oracle8iDialect;
-import org.hibernate.dialect.Oracle9Dialect;
-import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.PointbaseDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SAPDBDialect;
@@ -61,7 +59,6 @@
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.jmx.HibernateService;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.mapping.RootClass;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.type.Type;
import org.hibernate.util.JoinedIterator;
@@ -97,13 +94,6 @@
};
}
- public void configure(Configuration cfg) {
- super.configure( cfg );
- if ( Dialect.getDialect() instanceof OracleDialect ) {
- ( (RootClass) cfg.getClassMapping("org.hibernate.test.legacy.Foo") ).setForceDiscriminator(false);
- }
- }
-
public static Test suite() {
return new FunctionalTestClassTestSuite( FooBarTest.class );
}
@@ -680,7 +670,7 @@
s.find("from Foo foo where foo.integer not between 1 and 5 and foo.string not in ('cde', 'abc') and foo.string is not null and foo.integer<=3");
s.find("from Baz baz inner join baz.collectionComponent.nested.foos foo where foo.string is null");
- if ( !(getDialect() instanceof MySQLDialect) && !(getDialect() instanceof MckoiDialect) && !(getDialect() instanceof SAPDBDialect) && !(getDialect() instanceof PointbaseDialect) /*&& !(dialect instanceof Oracle9Dialect)*/ ) {
+ if ( !(getDialect() instanceof MySQLDialect) && !(getDialect() instanceof MckoiDialect) && !(getDialect() instanceof SAPDBDialect) && !(getDialect() instanceof PointbaseDialect) ) {
s.find("from Baz baz inner join baz.fooSet where '1' in (from baz.fooSet foo where foo.string is not null)");
s.find("from Baz baz where 'a' in elements(baz.collectionComponent.nested.foos) and 1.0 in elements(baz.collectionComponent.nested.floats)");
s.find("from Baz baz where 'b' in elements(baz.collectionComponent.nested.foos) and 1.0 in elements(baz.collectionComponent.nested.floats)");
@@ -2136,7 +2126,7 @@
s.find("select count(*) from Baz as baz where 1 in indices(baz.fooArray)");
s.find("select count(*) from Bar as bar where 'abc' in elements(bar.baz.fooArray)");
s.find("select count(*) from Bar as bar where 1 in indices(bar.baz.fooArray)");
- if ( !(getDialect() instanceof DB2Dialect) && !(getDialect() instanceof Oracle9Dialect) && !(getDialect() instanceof Oracle8iDialect ) ) {
+ if ( !(getDialect() instanceof DB2Dialect) && !(getDialect() instanceof Oracle8iDialect ) ) {
s.find("select count(*) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)");
s.find("select max( elements(bar.baz.fooArray) ) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)");
}
@@ -3301,7 +3291,7 @@
}
public void testScrollableIterator() throws Exception {
- if ( getDialect() instanceof DB2Dialect || getDialect() instanceof OracleDialect || getDialect() instanceof SybaseDialect || getDialect() instanceof HSQLDialect ) {
+ if ( getDialect() instanceof DB2Dialect || getDialect() instanceof SybaseDialect || getDialect() instanceof HSQLDialect ) {
Session s = openSession();
Transaction txn = s.beginTransaction();
s.save( new Foo() );
Modified: core/branches/Branch_3_2/test/org/hibernate/test/legacy/IJTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/legacy/IJTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/legacy/IJTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -8,7 +8,6 @@
import org.hibernate.LockMode;
import org.hibernate.classic.Session;
import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.dialect.OracleDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
@@ -29,7 +28,7 @@
}
public void testFormulaDiscriminator() throws Exception {
- if ( ( getDialect() instanceof OracleDialect ) || ( getDialect() instanceof HSQLDialect ) ) return;
+ if ( getDialect() instanceof HSQLDialect ) return;
Session s = getSessions().openSession();
I i = new I();
i.setName( "i" );
Modified: core/branches/Branch_3_2/test/org/hibernate/test/legacy/MasterDetailTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/legacy/MasterDetailTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/legacy/MasterDetailTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -23,7 +23,6 @@
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.dialect.SAPDBDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.mapping.MetaAttribute;
@@ -317,7 +316,7 @@
assertTrue( "generated id returned", s.save(d2)!=null);
master.addDetail(d1);
master.addDetail(d2);
- if ( !(getDialect() instanceof MySQLDialect) && !(getDialect() instanceof Oracle9Dialect) && !(getDialect() instanceof SAPDBDialect) && !(getDialect() instanceof MckoiDialect) && !(getDialect() instanceof org.hibernate.dialect.TimesTenDialect)) {
+ if ( !(getDialect() instanceof MySQLDialect) && !(getDialect() instanceof SAPDBDialect) && !(getDialect() instanceof MckoiDialect) && !(getDialect() instanceof org.hibernate.dialect.TimesTenDialect)) {
assertTrue(
"query",
s.find("from Detail d, Master m where m = d.master and size(m.outgoing) = 0 and size(m.incoming) = 0").size()==2
Modified: core/branches/Branch_3_2/test/org/hibernate/test/legacy/SQLFunctionsTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/legacy/SQLFunctionsTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/legacy/SQLFunctionsTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -23,10 +23,9 @@
import org.hibernate.dialect.InterbaseDialect;
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.Oracle9Dialect;
-import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.dialect.function.SQLFunction;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -80,7 +79,7 @@
s.find("select count(*) from Simple s").size() == 1
);
- if ( getDialect() instanceof OracleDialect) {
+ if ( getDialect() instanceof Oracle9iDialect ) {
// Check Oracle Dialect mix of dialect functions - no args (no parenthesis and single arg functions
java.util.List rset = s.find("select s.name, sysdate(), trunc(s.pay), round(s.pay) from Simple s");
assertNotNull("Name string should have been returned",(((Object[])rset.get(0))[0]));
@@ -181,7 +180,6 @@
s.close();
}
public void testBroken() throws Exception {
- if (getDialect() instanceof Oracle9Dialect) return;
Session s = openSession();
Transaction t = s.beginTransaction();
Broken b = new Fixed();
Modified: core/branches/Branch_3_2/test/org/hibernate/test/legacy/SQLLoaderTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/legacy/SQLLoaderTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/legacy/SQLLoaderTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -14,8 +14,6 @@
import org.hibernate.classic.Session;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.Oracle9Dialect;
-import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.TimesTenDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -47,7 +45,6 @@
}
public void testTS() throws Exception {
- if (getDialect() instanceof Oracle9Dialect) return;
Session session = openSession();
Transaction txn = session.beginTransaction();
Simple sim = new Simple();
@@ -150,7 +147,6 @@
s.close();
if ( getDialect() instanceof MySQLDialect ) return;
- if ( getDialect() instanceof OracleDialect ) return; // todo : this fails on Oracle8 also
s = openSession();
@@ -341,11 +337,7 @@
session = openSession();
Query query;
- if ( getDialect() instanceof OracleDialect ) {
- // Oracle8 does not support X/Open extension functions :)
- query = session.createSQLQuery("select identifier_column as {a.id}, clazz_discriminata as {a.class}, count_ as {a.count}, name as {a.name} from TA where upper(name) like upper('max')", "a", A.class);
- }
- else if( getDialect() instanceof TimesTenDialect) {
+ if( getDialect() instanceof TimesTenDialect) {
// TimesTen does not permit general expressions (like UPPER) in the second part of a LIKE expression,
// so we execute a similar test
query = session.createSQLQuery("select identifier_column as {a.id}, clazz_discriminata as {a.class}, count_ as {a.count}, name as {a.name} from TA where {fn ucase(name)} like 'MAX'", "a", A.class);
Modified: core/branches/Branch_3_2/test/org/hibernate/test/rowid/RowIdTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/rowid/RowIdTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/rowid/RowIdTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -10,8 +10,8 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
@@ -37,7 +37,7 @@
}
public boolean appliesTo(Dialect dialect) {
- return dialect instanceof Oracle9Dialect;
+ return dialect instanceof Oracle9iDialect;
}
public boolean createSchema() {
Modified: core/branches/Branch_3_2/test/org/hibernate/test/sql/check/OracleCheckStyleTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/sql/check/OracleCheckStyleTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/sql/check/OracleCheckStyleTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -3,7 +3,7 @@
import junit.framework.Test;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.Oracle9Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
@@ -21,7 +21,7 @@
}
public boolean appliesTo(Dialect dialect) {
- return dialect instanceof Oracle9Dialect;
+ return dialect instanceof Oracle9iDialect;
}
public static Test suite() {
Modified: core/branches/Branch_3_2/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java 2008-11-05 01:39:44 UTC (rev 15510)
+++ core/branches/Branch_3_2/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java 2008-11-05 01:46:59 UTC (rev 15511)
@@ -3,9 +3,8 @@
import junit.framework.Test;
-import org.hibernate.dialect.DataDirectOracle9Dialect;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.Oracle9Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport;
@@ -29,7 +28,7 @@
}
public boolean appliesTo(Dialect dialect) {
- return ( dialect instanceof Oracle9Dialect ) && !( dialect instanceof DataDirectOracle9Dialect );
+ return ( dialect instanceof Oracle9iDialect );
}
}
More information about the hibernate-commits
mailing list