[Hibernate-commits] Hibernate Code SVN: r9915 - trunk/Hibernate3/src/org/hibernate/hql/classic

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-09 05:38:15 -0400 (Tue, 09 May 2006)
New Revision: 9915

Modified:
   trunk/Hibernate3/src/org/hibernate/hql/classic/SelectParser.java
Log:
Revert HHH-1724 Criteria/HQL alignment (missing classic query translator count(*))


Modified: trunk/Hibernate3/src/org/hibernate/hql/classic/SelectParser.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/hql/classic/SelectParser.java	2006-05-09 09:37:18 UTC (rev 9914)
+++ trunk/Hibernate3/src/org/hibernate/hql/classic/SelectParser.java	2006-05-09 09:38:15 UTC (rev 9915)
@@ -121,7 +121,7 @@
 		else if ( COUNT_MODIFIERS.contains( lctoken ) ) {
 			if ( !ready || !aggregate ) throw new QueryException( token + " only allowed inside aggregate function in SELECT" );
 			q.appendScalarSelectToken( token );
-			if ( "*".equals( token ) ) q.addSelectScalar( Hibernate.LONG ); //special case
+			if ( "*".equals( token ) ) q.addSelectScalar( getFunction( "count", q ).getReturnType( Hibernate.LONG, q.getFactory() ) ); //special case
 		}
 		else if ( getFunction( lctoken, q ) != null && token.equals( q.unalias( token ) ) ) {
 			// the name of an SQL function