[hibernate-commits] Hibernate SVN: r18254 - core/trunk/core/src/main/java/org/hibernate/dialect.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Thu Dec 17 00:51:21 EST 2009


Author: steve.ebersole at jboss.com
Date: 2009-12-17 00:51:20 -0500 (Thu, 17 Dec 2009)
New Revision: 18254

Modified:
   core/trunk/core/src/main/java/org/hibernate/dialect/Cache71Dialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/IngresDialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/MckoiDialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/MySQLDialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java
Log:
HHH-4709 - registered length functions should return Integer


Modified: core/trunk/core/src/main/java/org/hibernate/dialect/Cache71Dialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/Cache71Dialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/Cache71Dialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -305,7 +305,6 @@
 		registerFunction( "lcase", new StandardJDBCEscapeFunction( "lcase", Hibernate.STRING ) );
 		registerFunction( "left", new StandardJDBCEscapeFunction( "left", Hibernate.STRING ) );
 		registerFunction( "len", new StandardSQLFunction( "len", Hibernate.INTEGER ) );
-		registerFunction( "length", new StandardSQLFunction( "length", Hibernate.INTEGER ) );
 		registerFunction( "$length", new VarArgsSQLFunction( "$length(", ",", ")" ) );
 		// aggregate functions shouldn't be registered, right?
 		//registerFunction( "list", new StandardSQLFunction("list",Hibernate.STRING) );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -134,7 +134,6 @@
 		registerFunction("lower", new StandardSQLFunction("lower") );
 		registerFunction("ucase", new StandardSQLFunction("ucase") );
 		registerFunction("lcase", new StandardSQLFunction("lcase") );
-		registerFunction("length", new StandardSQLFunction("length", Hibernate.LONG) );
 		registerFunction("ltrim", new StandardSQLFunction("ltrim") );
 		registerFunction("rtrim", new StandardSQLFunction("rtrim") );
 		registerFunction( "substr", new StandardSQLFunction( "substr", Hibernate.STRING ) );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/HSQLDialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/HSQLDialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -85,7 +85,6 @@
 
 		registerFunction( "ascii", new StandardSQLFunction( "ascii", Hibernate.INTEGER ) );
 		registerFunction( "char", new StandardSQLFunction( "char", Hibernate.CHARACTER ) );
-		registerFunction( "length", new StandardSQLFunction( "length", Hibernate.LONG ) );
 		registerFunction( "lower", new StandardSQLFunction( "lower" ) );
 		registerFunction( "upper", new StandardSQLFunction( "upper" ) );
 		registerFunction( "lcase", new StandardSQLFunction( "lcase" ) );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/IngresDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/IngresDialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/IngresDialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -100,7 +100,6 @@
 		registerFunction( "intextract", new StandardSQLFunction( "intextract", Hibernate.INTEGER ) );
 		registerFunction( "left", new StandardSQLFunction( "left", Hibernate.STRING ) );
 		registerFunction( "locate", new SQLFunctionTemplate( Hibernate.LONG, "locate(?1, ?2)" ) );
-		registerFunction( "length", new StandardSQLFunction( "length", Hibernate.LONG ) );
 		registerFunction( "ln", new StandardSQLFunction( "ln", Hibernate.DOUBLE ) );
 		registerFunction( "log", new StandardSQLFunction( "log", Hibernate.DOUBLE ) );
 		registerFunction( "lower", new StandardSQLFunction( "lower" ) );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/MckoiDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/MckoiDialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/MckoiDialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -64,7 +64,6 @@
 		registerFunction( "sqrt", new StandardSQLFunction("sqrt", Hibernate.DOUBLE) );
 		registerFunction( "abs", new StandardSQLFunction("abs") );
 		registerFunction( "sign", new StandardSQLFunction( "sign", Hibernate.INTEGER ) );
-		registerFunction( "length", new StandardSQLFunction( "length", Hibernate.INTEGER ) );
 		registerFunction( "round", new StandardSQLFunction( "round", Hibernate.INTEGER ) );
 		registerFunction( "mod", new StandardSQLFunction( "mod", Hibernate.INTEGER ) );
 		registerFunction( "least", new StandardSQLFunction("least") );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/MySQLDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/MySQLDialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/MySQLDialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -76,7 +76,6 @@
 		registerFunction("character_length", new StandardSQLFunction("character_length", Hibernate.LONG) );
 		registerFunction("lcase", new StandardSQLFunction("lcase") );
 		registerFunction("lower", new StandardSQLFunction("lower") );
-		registerFunction("length", new StandardSQLFunction("length", Hibernate.LONG) );
 		registerFunction("ltrim", new StandardSQLFunction("ltrim") );
 		registerFunction("ord", new StandardSQLFunction("ord", Hibernate.INTEGER) );
 		registerFunction("quote", new StandardSQLFunction("quote") );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -138,7 +138,6 @@
 		registerFunction( "soundex", new StandardSQLFunction("soundex") );
 		registerFunction( "upper", new StandardSQLFunction("upper") );
 		registerFunction( "ascii", new StandardSQLFunction("ascii", Hibernate.INTEGER) );
-		registerFunction( "length", new StandardSQLFunction("length", Hibernate.LONG) );
 
 		registerFunction( "to_char", new StandardSQLFunction("to_char", Hibernate.STRING) );
 		registerFunction( "to_date", new StandardSQLFunction("to_date", Hibernate.TIMESTAMP) );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -117,7 +117,6 @@
 		registerFunction( "soundex", new StandardSQLFunction("soundex") );
 		registerFunction( "upper", new StandardSQLFunction("upper") );
 		registerFunction( "ascii", new StandardSQLFunction("ascii", Hibernate.INTEGER) );
-		registerFunction( "length", new StandardSQLFunction("length", Hibernate.LONG) );
 
 		registerFunction( "to_char", new StandardSQLFunction("to_char", Hibernate.STRING) );
 		registerFunction( "to_date", new StandardSQLFunction("to_date", Hibernate.TIMESTAMP) );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -106,7 +106,6 @@
 		registerFunction( "quote_literal", new StandardSQLFunction("quote_literal", Hibernate.STRING) );
 		registerFunction( "md5", new StandardSQLFunction("md5") );
 		registerFunction( "ascii", new StandardSQLFunction("ascii", Hibernate.INTEGER) );
-		registerFunction( "length", new StandardSQLFunction("length", Hibernate.LONG) );
 		registerFunction( "char_length", new StandardSQLFunction("char_length", Hibernate.LONG) );
 		registerFunction( "bit_length", new StandardSQLFunction("bit_length", Hibernate.LONG) );
 		registerFunction( "octet_length", new StandardSQLFunction("octet_length", Hibernate.LONG) );

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java	2009-12-17 00:21:49 UTC (rev 18253)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java	2009-12-17 05:51:20 UTC (rev 18254)
@@ -73,7 +73,6 @@
 		registerFunction("ascii", new StandardSQLFunction("ascii", Hibernate.INTEGER) );
 		registerFunction("char_length", new StandardSQLFunction("char_length", Hibernate.INTEGER) );
 		registerFunction("character_length", new StandardSQLFunction("character_length", Hibernate.INTEGER) );
-		registerFunction("length", new StandardSQLFunction("length", Hibernate.INTEGER) );
 
 		// The RDMS concat() function only supports 2 parameters
 		registerFunction( "concat", new SQLFunctionTemplate(Hibernate.STRING, "concat(?1, ?2)") );



More information about the hibernate-commits mailing list