Hibernate SVN: r15721 - core/trunk/core/src/main/java/org/hibernate/dialect.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 19:37:02 -0500 (Fri, 19 Dec 2008)
New Revision: 15721
Modified:
core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
Log:
HHH-3672 - Sybase - second(), minute(), hour(), and extract() cause GenericJDBCException
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2008-12-20 00:36:24 UTC (rev 15720)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2008-12-20 00:37:02 UTC (rev 15721)
@@ -43,12 +43,8 @@
registerColumnType( Types.VARBINARY, "image" );
registerColumnType( Types.VARBINARY, 8000, "varbinary($l)" );
- registerFunction( "second", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(second, ?1)" ) );
- registerFunction( "minute", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(minute, ?1)" ) );
- registerFunction( "hour", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(hour, ?1)" ) );
registerFunction( "locate", new StandardSQLFunction( "charindex", Hibernate.INTEGER ) );
- registerFunction( "extract", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(?1, ?3)" ) );
registerFunction( "mod", new SQLFunctionTemplate( Hibernate.INTEGER, "?1 % ?2" ) );
registerFunction( "bit_length", new SQLFunctionTemplate( Hibernate.INTEGER, "datalength(?1) * 8" ) );
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java 2008-12-20 00:36:24 UTC (rev 15720)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java 2008-12-20 00:37:02 UTC (rev 15721)
@@ -88,7 +88,11 @@
registerFunction( "month", new StandardSQLFunction("month", Hibernate.INTEGER) );
registerFunction( "year", new StandardSQLFunction("year", Hibernate.INTEGER) );
registerFunction( "datename", new StandardSQLFunction("datename", Hibernate.STRING) );
-
+ registerFunction( "second", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(second, ?1)") );
+ registerFunction( "minute", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(minute, ?1)") );
+ registerFunction( "hour", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(hour, ?1)") );
+ registerFunction( "extract", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(?1, ?3)" ) );
+
registerFunction( "abs", new StandardSQLFunction("abs") );
registerFunction( "sign", new StandardSQLFunction("sign", Hibernate.INTEGER) );
17 years, 4 months
Hibernate SVN: r15720 - core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 19:36:24 -0500 (Fri, 19 Dec 2008)
New Revision: 15720
Modified:
core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
Log:
HHH-3672 - Sybase - second(), minute(), hour(), and extract() cause GenericJDBCException
Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
===================================================================
--- core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2008-12-20 00:33:49 UTC (rev 15719)
+++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2008-12-20 00:36:24 UTC (rev 15720)
@@ -43,12 +43,8 @@
registerColumnType( Types.VARBINARY, "image" );
registerColumnType( Types.VARBINARY, 8000, "varbinary($l)" );
- registerFunction( "second", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(second, ?1)" ) );
- registerFunction( "minute", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(minute, ?1)" ) );
- registerFunction( "hour", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(hour, ?1)" ) );
registerFunction( "locate", new StandardSQLFunction( "charindex", Hibernate.INTEGER ) );
- registerFunction( "extract", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(?1, ?3)" ) );
registerFunction( "mod", new SQLFunctionTemplate( Hibernate.INTEGER, "?1 % ?2" ) );
registerFunction( "bit_length", new SQLFunctionTemplate( Hibernate.INTEGER, "datalength(?1) * 8" ) );
Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
===================================================================
--- core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SybaseDialect.java 2008-12-20 00:33:49 UTC (rev 15719)
+++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SybaseDialect.java 2008-12-20 00:36:24 UTC (rev 15720)
@@ -88,7 +88,11 @@
registerFunction( "month", new StandardSQLFunction("month", Hibernate.INTEGER) );
registerFunction( "year", new StandardSQLFunction("year", Hibernate.INTEGER) );
registerFunction( "datename", new StandardSQLFunction("datename", Hibernate.STRING) );
-
+ registerFunction( "second", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(second, ?1)") );
+ registerFunction( "minute", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(minute, ?1)") );
+ registerFunction( "hour", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(hour, ?1)") );
+ registerFunction( "extract", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(?1, ?3)" ) );
+
registerFunction( "abs", new StandardSQLFunction("abs") );
registerFunction( "sign", new StandardSQLFunction("sign", Hibernate.INTEGER) );
17 years, 4 months
Hibernate SVN: r15719 - core/branches/Branch_3_2/src/org/hibernate/dialect.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 19:33:49 -0500 (Fri, 19 Dec 2008)
New Revision: 15719
Modified:
core/branches/Branch_3_2/src/org/hibernate/dialect/SQLServerDialect.java
core/branches/Branch_3_2/src/org/hibernate/dialect/SybaseDialect.java
Log:
HHH-3672 - Sybase - second(), minute(), hour(), and extract() cause GenericJDBCException
Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/SQLServerDialect.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/dialect/SQLServerDialect.java 2008-12-20 00:32:37 UTC (rev 15718)
+++ core/branches/Branch_3_2/src/org/hibernate/dialect/SQLServerDialect.java 2008-12-20 00:33:49 UTC (rev 15719)
@@ -20,12 +20,8 @@
registerColumnType( Types.VARBINARY, "image" );
registerColumnType( Types.VARBINARY, 8000, "varbinary($l)" );
- registerFunction( "second", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(second, ?1)") );
- registerFunction( "minute", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(minute, ?1)") );
- registerFunction( "hour", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(hour, ?1)") );
registerFunction( "locate", new StandardSQLFunction("charindex", Hibernate.INTEGER) );
- registerFunction( "extract", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(?1, ?3)" ) );
registerFunction( "mod", new SQLFunctionTemplate( Hibernate.INTEGER, "?1 % ?2" ) );
registerFunction( "bit_length", new SQLFunctionTemplate( Hibernate.INTEGER, "datalength(?1) * 8" ) );
Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/SybaseDialect.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/dialect/SybaseDialect.java 2008-12-20 00:32:37 UTC (rev 15718)
+++ core/branches/Branch_3_2/src/org/hibernate/dialect/SybaseDialect.java 2008-12-20 00:33:49 UTC (rev 15719)
@@ -65,6 +65,10 @@
registerFunction( "month", new StandardSQLFunction("month", Hibernate.INTEGER) );
registerFunction( "year", new StandardSQLFunction("year", Hibernate.INTEGER) );
registerFunction( "datename", new StandardSQLFunction("datename", Hibernate.STRING) );
+ registerFunction( "second", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(second, ?1)") );
+ registerFunction( "minute", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(minute, ?1)") );
+ registerFunction( "hour", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(hour, ?1)") );
+ registerFunction( "extract", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(?1, ?3)" ) );
registerFunction( "abs", new StandardSQLFunction("abs") );
registerFunction( "sign", new StandardSQLFunction("sign", Hibernate.INTEGER) );
17 years, 4 months
Hibernate SVN: r15718 - core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 19:32:37 -0500 (Fri, 19 Dec 2008)
New Revision: 15718
Modified:
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SQLServerDialect.java
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SybaseDialect.java
Log:
JBPAPP-1524 HHH-3672 - Sybase - second(), minute(), hour(), and extract() cause GenericJDBCException
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SQLServerDialect.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SQLServerDialect.java 2008-12-19 23:08:24 UTC (rev 15717)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SQLServerDialect.java 2008-12-20 00:32:37 UTC (rev 15718)
@@ -20,12 +20,8 @@
registerColumnType( Types.VARBINARY, "image" );
registerColumnType( Types.VARBINARY, 8000, "varbinary($l)" );
- registerFunction( "second", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(second, ?1)") );
- registerFunction( "minute", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(minute, ?1)") );
- registerFunction( "hour", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(hour, ?1)") );
registerFunction( "locate", new StandardSQLFunction("charindex", Hibernate.INTEGER) );
- registerFunction( "extract", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(?1, ?3)" ) );
registerFunction( "mod", new SQLFunctionTemplate( Hibernate.INTEGER, "?1 % ?2" ) );
registerFunction( "bit_length", new SQLFunctionTemplate( Hibernate.INTEGER, "datalength(?1) * 8" ) );
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SybaseDialect.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SybaseDialect.java 2008-12-19 23:08:24 UTC (rev 15717)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SybaseDialect.java 2008-12-20 00:32:37 UTC (rev 15718)
@@ -65,6 +65,10 @@
registerFunction( "month", new StandardSQLFunction("month", Hibernate.INTEGER) );
registerFunction( "year", new StandardSQLFunction("year", Hibernate.INTEGER) );
registerFunction( "datename", new StandardSQLFunction("datename", Hibernate.STRING) );
+ registerFunction( "second", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(second, ?1)") );
+ registerFunction( "minute", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(minute, ?1)") );
+ registerFunction( "hour", new SQLFunctionTemplate(Hibernate.INTEGER, "datepart(hour, ?1)") );
+ registerFunction( "extract", new SQLFunctionTemplate( Hibernate.INTEGER, "datepart(?1, ?3)" ) );
registerFunction( "abs", new StandardSQLFunction("abs") );
registerFunction( "sign", new StandardSQLFunction("sign", Hibernate.INTEGER) );
17 years, 4 months
Hibernate SVN: r15717 - in core/trunk/testsuite/src/test/java/org/hibernate/test: legacy and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 18:08:24 -0500 (Fri, 19 Dec 2008)
New Revision: 15717
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
Log:
HHH-3668 : Sybase does not support implicit conversion from character types to numeric types causes failing unit tests
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java 2008-12-19 23:07:25 UTC (rev 15716)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java 2008-12-19 23:08:24 UTC (rev 15717)
@@ -23,7 +23,7 @@
public void testJpaStylePositionalParametersInNativeSql() {
Session s = openSession();
s.beginTransaction();
- s.createSQLQuery( "select NAME from EJB3_ITEM where ITEM_ID = ?1" ).setParameter( "1", "123" ).list();
+ s.createSQLQuery( "select NAME from EJB3_ITEM where ITEM_ID = ?1" ).setParameter( "1", new Long( 123 ) ).list();
s.getTransaction().commit();
s.close();
}
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2008-12-19 23:07:25 UTC (rev 15716)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2008-12-19 23:08:24 UTC (rev 15717)
@@ -56,6 +56,7 @@
import org.hibernate.dialect.PointbaseDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SAPDBDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
import org.hibernate.engine.SessionFactoryImplementor;
@@ -2135,7 +2136,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 Oracle9Dialect) && !(getDialect() instanceof Oracle8iDialect ) && !( getDialect() instanceof SybaseDialect && !(getDialect() instanceof SQLServerDialect ) ) ) {
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)");
}
17 years, 4 months
Hibernate SVN: r15716 - in core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test: legacy and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 18:07:25 -0500 (Fri, 19 Dec 2008)
New Revision: 15716
Modified:
core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java
core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
Log:
HHH-3668 : Sybase does not support implicit conversion from character types to numeric types causes failing unit tests
Modified: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java 2008-12-19 23:06:29 UTC (rev 15715)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java 2008-12-19 23:07:25 UTC (rev 15716)
@@ -23,7 +23,7 @@
public void testJpaStylePositionalParametersInNativeSql() {
Session s = openSession();
s.beginTransaction();
- s.createSQLQuery( "select NAME from EJB3_ITEM where ITEM_ID = ?1" ).setParameter( "1", "123" ).list();
+ s.createSQLQuery( "select NAME from EJB3_ITEM where ITEM_ID = ?1" ).setParameter( "1", new Long( 123 ) ).list();
s.getTransaction().commit();
s.close();
}
Modified: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2008-12-19 23:06:29 UTC (rev 15715)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2008-12-19 23:07:25 UTC (rev 15716)
@@ -56,6 +56,7 @@
import org.hibernate.dialect.PointbaseDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SAPDBDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
import org.hibernate.engine.SessionFactoryImplementor;
@@ -2135,7 +2136,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 Oracle9Dialect) && !(getDialect() instanceof Oracle8iDialect ) && !( getDialect() instanceof SybaseDialect && !(getDialect() instanceof SQLServerDialect ) ) ) {
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)");
}
17 years, 4 months
Hibernate SVN: r15715 - in core/branches/Branch_3_2/test/org/hibernate/test: legacy and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 18:06:29 -0500 (Fri, 19 Dec 2008)
New Revision: 15715
Modified:
core/branches/Branch_3_2/test/org/hibernate/test/jpa/ql/NativeQueryTest.java
core/branches/Branch_3_2/test/org/hibernate/test/legacy/FooBarTest.java
Log:
HHH-3668 : Sybase does not support implicit conversion from character types to numeric types causes failing unit tests
Modified: core/branches/Branch_3_2/test/org/hibernate/test/jpa/ql/NativeQueryTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/jpa/ql/NativeQueryTest.java 2008-12-19 23:04:48 UTC (rev 15714)
+++ core/branches/Branch_3_2/test/org/hibernate/test/jpa/ql/NativeQueryTest.java 2008-12-19 23:06:29 UTC (rev 15715)
@@ -23,7 +23,7 @@
public void testJpaStylePositionalParametersInNativeSql() {
Session s = openSession();
s.beginTransaction();
- s.createSQLQuery( "select NAME from EJB3_ITEM where ITEM_ID = ?1" ).setParameter( "1", "123" ).list();
+ s.createSQLQuery( "select NAME from EJB3_ITEM where ITEM_ID = ?1" ).setParameter( "1", new Long( 123 ) ).list();
s.getTransaction().commit();
s.close();
}
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-12-19 23:04:48 UTC (rev 15714)
+++ core/branches/Branch_3_2/test/org/hibernate/test/legacy/FooBarTest.java 2008-12-19 23:06:29 UTC (rev 15715)
@@ -54,6 +54,7 @@
import org.hibernate.dialect.PointbaseDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SAPDBDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
import org.hibernate.engine.SessionFactoryImplementor;
@@ -2126,7 +2127,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 Oracle8iDialect ) ) {
+ if ( !(getDialect() instanceof DB2Dialect) && !(getDialect() instanceof Oracle8iDialect ) && !( getDialect() instanceof SybaseDialect && !(getDialect() instanceof SQLServerDialect ) ) ) {
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)");
}
17 years, 4 months
Hibernate SVN: r15714 - in core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test: legacy and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 18:04:48 -0500 (Fri, 19 Dec 2008)
New Revision: 15714
Modified:
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/jpa/ql/NativeQueryTest.java
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/FooBarTest.java
Log:
JBPAPP-1520 HHH-3668 : Sybase does not support implicit conversion from 'VARCHAR' to 'INT' causes failing unit tests
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/jpa/ql/NativeQueryTest.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/jpa/ql/NativeQueryTest.java 2008-12-19 20:56:19 UTC (rev 15713)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/jpa/ql/NativeQueryTest.java 2008-12-19 23:04:48 UTC (rev 15714)
@@ -23,7 +23,7 @@
public void testJpaStylePositionalParametersInNativeSql() {
Session s = openSession();
s.beginTransaction();
- s.createSQLQuery( "select NAME from EJB3_ITEM where ITEM_ID = ?1" ).setParameter( "1", "123" ).list();
+ s.createSQLQuery( "select NAME from EJB3_ITEM where ITEM_ID = ?1" ).setParameter( "1", new Long( 123 ) ).list();
s.getTransaction().commit();
s.close();
}
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/FooBarTest.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/FooBarTest.java 2008-12-19 20:56:19 UTC (rev 15713)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/FooBarTest.java 2008-12-19 23:04:48 UTC (rev 15714)
@@ -56,6 +56,7 @@
import org.hibernate.dialect.PointbaseDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SAPDBDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
import org.hibernate.engine.SessionFactoryImplementor;
@@ -2136,7 +2137,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 Oracle9Dialect) && !(getDialect() instanceof Oracle8iDialect ) && !( getDialect() instanceof SybaseDialect && !(getDialect() instanceof SQLServerDialect ) ) ) {
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)");
}
17 years, 4 months
Hibernate SVN: r15713 - core/trunk/testsuite/src/test/java/org/hibernate/test/hql.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 15:56:19 -0500 (Fri, 19 Dec 2008)
New Revision: 15713
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
Log:
HHH-3670 - Invalid test for str() for SQL Server and Sybase
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2008-12-19 20:55:43 UTC (rev 15712)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2008-12-19 20:56:19 UTC (rev 15713)
@@ -1194,13 +1194,18 @@
Animal an = new Animal();
an.setBodyWeight(123.45f);
session.persist(an);
- String str = (String) session.createQuery("select str(an.bodyWeight) from Animal an where str(an.bodyWeight) like '123%' or str(an.bodyWeight) like '1.23%'").uniqueResult();
+ String str = (String) session.createQuery("select str(an.bodyWeight) from Animal an where str(an.bodyWeight) like '%1%'").uniqueResult();
if ( getDialect() instanceof DB2Dialect ) {
assertTrue( str.startsWith("1.234") );
}
- else if ( getDialect() instanceof SQLServerDialect ) {
- // no assertion as SQLServer always returns nulls here; even trying directly against the
- // database, it seems to have problems with str() in the where clause...
+ else if ( getDialect() instanceof SybaseDialect ) {
+ // str(val) on sybase assumes a default of 10 characters with no decimal point or decimal values
+ // str(val) on sybase result is right-justified
+ assertEquals( str.length(), 10 );
+ assertTrue( str.endsWith("123") );
+ str = (String) session.createQuery("select str(an.bodyWeight, 8, 3) from Animal an where str(an.bodyWeight, 8, 3) like '%1%'").uniqueResult();
+ assertEquals( str.length(), 8 );
+ assertTrue( str.endsWith( "123.450" ) );
}
else {
assertTrue( str.startsWith("123.4") );
17 years, 4 months
Hibernate SVN: r15712 - core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-12-19 15:55:43 -0500 (Fri, 19 Dec 2008)
New Revision: 15712
Modified:
core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
Log:
HHH-3670 - Invalid test for str() for SQL Server and Sybase
Modified: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2008-12-19 20:55:04 UTC (rev 15711)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2008-12-19 20:55:43 UTC (rev 15712)
@@ -1194,13 +1194,18 @@
Animal an = new Animal();
an.setBodyWeight(123.45f);
session.persist(an);
- String str = (String) session.createQuery("select str(an.bodyWeight) from Animal an where str(an.bodyWeight) like '123%' or str(an.bodyWeight) like '1.23%'").uniqueResult();
+ String str = (String) session.createQuery("select str(an.bodyWeight) from Animal an where str(an.bodyWeight) like '%1%'").uniqueResult();
if ( getDialect() instanceof DB2Dialect ) {
assertTrue( str.startsWith("1.234") );
}
- else if ( getDialect() instanceof SQLServerDialect ) {
- // no assertion as SQLServer always returns nulls here; even trying directly against the
- // database, it seems to have problems with str() in the where clause...
+ else if ( getDialect() instanceof SybaseDialect ) {
+ // str(val) on sybase assumes a default of 10 characters with no decimal point or decimal values
+ // str(val) on sybase result is right-justified
+ assertEquals( str.length(), 10 );
+ assertTrue( str.endsWith("123") );
+ str = (String) session.createQuery("select str(an.bodyWeight, 8, 3) from Animal an where str(an.bodyWeight, 8, 3) like '%1%'").uniqueResult();
+ assertEquals( str.length(), 8 );
+ assertTrue( str.endsWith( "123.450" ) );
}
else {
assertTrue( str.startsWith("123.4") );
17 years, 4 months