[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl FilterImpl.java,1.5,1.6 QueryImpl.java,1.12,1.13

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

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

Modified Files:
	FilterImpl.java QueryImpl.java 
Log Message:
* imporvements to CompositeUserType
* cascades for <any> mappings
* fixed some bugs withy collection Filter parameters
* correct Type for avg(int)


Index: FilterImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/FilterImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FilterImpl.java	14 Jan 2003 13:42:11 -0000	1.5
--- FilterImpl.java	8 Apr 2003 09:49:29 -0000	1.6
***************
*** 1,6 ****
--- 1,8 ----
  package net.sf.hibernate.impl;
  
+ import java.util.HashMap;
  import java.util.Iterator;
  import java.util.List;
+ import java.util.Map;
  
  import net.sf.hibernate.HibernateException;
***************
*** 26,32 ****
  	 */
  	public Iterator iterate() throws HibernateException {
! 		getValues().add(0, null);
! 		getTypes().add(0, null);
! 		return getSession().iterateFilter(collection, getQueryString(), getValues().toArray(), (Type[]) getTypes().toArray(NO_TYPES), getSelection(), getNamedParams() );
  	}
  	
--- 28,34 ----
  	 */
  	public Iterator iterate() throws HibernateException {
! 		Map namedParams = new HashMap( getNamedParams() );
! 		String query = bindParameterLists(namedParams);
! 		return getSession().iterateFilter(collection, query, valueArray(), typeArray(), getSelection(), namedParams);
  	}
  	
***************
*** 35,41 ****
  	 */
  	public List list() throws HibernateException {
! 		getValues().add(0, null);
! 		getTypes().add(0, null);
! 		return getSession().filter(collection, getQueryString(), getValues().toArray(), (Type[]) getTypes().toArray(NO_TYPES), getSelection(), getNamedParams() );
  	}
  	
--- 37,43 ----
  	 */
  	public List list() throws HibernateException {
! 		Map namedParams = new HashMap( getNamedParams() );
! 		String query = bindParameterLists(namedParams);
! 		return getSession().filter(collection, query, valueArray(), typeArray(), getSelection(), namedParams);
  	}
  	
***************
*** 45,48 ****
--- 47,66 ----
  	public ScrollableResults scroll() throws HibernateException {
  		throw new UnsupportedOperationException("Can't scroll filters");
+ 	}
+ 	
+ 	private Type[] typeArray() {
+ 		List typeList = getTypes();
+ 		int size = typeList.size();
+ 		Type[] result = new Type[size+1];
+ 		for (int i=0; i<size; i++) result[i+1] = (Type) typeList.get(i);
+ 		return result;
+ 	}
+ 	
+ 	private Object[] valueArray() {
+ 		List valueList = getValues();
+ 		int size = valueList.size();
+ 		Object[] result = new Object[size+1];
+ 		for (int i=0; i<size; i++) result[i+1] = valueList.get(i);
+ 		return result;
  	}
  	

Index: QueryImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/QueryImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** QueryImpl.java	13 Mar 2003 03:16:00 -0000	1.12
--- QueryImpl.java	8 Apr 2003 09:49:30 -0000	1.13
***************
*** 52,57 ****
  	
  	public Iterator iterate() throws HibernateException {
! 		Map namedParams = new HashMap();
! 		namedParams.putAll(namedParameters);
  		String query = bindParameterLists(namedParams);
  		return session.iterate(query, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
--- 52,56 ----
  	
  	public Iterator iterate() throws HibernateException {
! 		Map namedParams = new HashMap(namedParameters);
  		String query = bindParameterLists(namedParams);
  		return session.iterate(query, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
***************
*** 59,64 ****
  	
  	public ScrollableResults scroll() throws HibernateException {
! 		Map namedParams = new HashMap();
! 		namedParams.putAll(namedParameters);
  		String query = bindParameterLists(namedParams);
  		return session.scroll(query, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
--- 58,62 ----
  	
  	public ScrollableResults scroll() throws HibernateException {
! 		Map namedParams = new HashMap(namedParameters);
  		String query = bindParameterLists(namedParams);
  		return session.scroll(query, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
***************
*** 66,71 ****
  	
  	public List list() throws HibernateException {
! 		Map namedParams = new HashMap();
! 		namedParams.putAll(namedParameters);
  		String query = bindParameterLists(namedParams);
  		return session.find(query, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
--- 64,68 ----
  	
  	public List list() throws HibernateException {
! 		Map namedParams = new HashMap(namedParameters);
  		String query = bindParameterLists(namedParams);
  		return session.find(query, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
***************
*** 357,361 ****
  	}
  	
! 	private String bindParameterLists(Map namedParams) {
  		Iterator iter = namedParameterLists.entrySet().iterator();
  		String query = queryString;
--- 354,358 ----
  	}
  	
! 	protected String bindParameterLists(Map namedParams) {
  		Iterator iter = namedParameterLists.entrySet().iterator();
  		String query = queryString;