[Hibernate-commits] Hibernate2/src/net/sf/hibernate/loader CriteriaLoader.java,1.1,1.2

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv31647/hibernate/loader

Modified Files:
	CriteriaLoader.java 
Log Message:
expanded Criteria API
allowed unmapped-class queries with new from syntax

Index: CriteriaLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/CriteriaLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CriteriaLoader.java	8 Mar 2003 06:39:21 -0000	1.1
--- CriteriaLoader.java	9 Mar 2003 04:04:08 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  import net.sf.hibernate.engine.TypedValue;
  import net.sf.hibernate.expression.Expression;
+ import net.sf.hibernate.expression.Order;
  import net.sf.hibernate.impl.CriteriaImpl;
  import net.sf.hibernate.persister.Loadable;
***************
*** 31,35 ****
  		StringBuffer condition = new StringBuffer(30);
  		Iterator iter = criteria.iterateExpressions();
! 		if ( !iter.hasNext() ) condition.append(" 1=1"); //TODO: fix this ugliness
  		while ( iter.hasNext() ) {
  			Expression expr = (Expression) iter.next();
--- 32,36 ----
  		StringBuffer condition = new StringBuffer(30);
  		Iterator iter = criteria.iterateExpressions();
! 		if ( !iter.hasNext() ) condition.append("1=1"); //TODO: fix this ugliness
  		while ( iter.hasNext() ) {
  			Expression expr = (Expression) iter.next();
***************
*** 37,41 ****
  			if ( iter.hasNext() ) condition.append(" and ");
  		}
! 
  		renderStatement( condition.toString(), factory );
  		
--- 38,50 ----
  			if ( iter.hasNext() ) condition.append(" and ");
  		}
! 		
! 		iter = criteria.iterateOrderings();
! 		if ( iter.hasNext() ) condition.append(" order by ");
! 		while ( iter.hasNext() ) {
! 			Order ord = (Order) iter.next();
! 			condition.append( ord.toSqlString(factory, criteria.getPersistentClass(), alias) );
! 			if ( iter.hasNext() ) condition.append(", ");
! 		}
! 		
  		renderStatement( condition.toString(), factory );