[Hibernate-commits] Hibernate/cirrus/hibernate/impl IteratorImpl.java,1.10,1.11

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv11168/cirrus/hibernate/impl

Modified Files:
	IteratorImpl.java 
Log Message:
QueryTranslator code cleanup

Index: IteratorImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/IteratorImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IteratorImpl.java	23 Nov 2002 00:24:16 -0000	1.10
--- IteratorImpl.java	24 Nov 2002 06:30:11 -0000	1.11
***************
*** 13,17 ****
  import cirrus.hibernate.LazyInitializationException;
  import cirrus.hibernate.engine.SessionImplementor;
- import cirrus.hibernate.query.QueryTranslator;
  import cirrus.hibernate.type.Type;
  
--- 13,16 ----
***************
*** 29,33 ****
  	private final String[][] names;
  	
! 	public IteratorImpl(ResultSet rs, SessionImplementor sess, Type[] types) 
  		throws HibernateException, SQLException {
  			
--- 28,32 ----
  	private final String[][] names;
  	
! 	public IteratorImpl(ResultSet rs, SessionImplementor sess, Type[] types, String[][] columnNames) 
  		throws HibernateException, SQLException {
  			
***************
*** 35,42 ****
  		this.sess = sess;
  		this.types = types;
  		
! 		single = types.length==1;
! 		
! 		names = QueryTranslator.generateColumnNames( types, sess.getFactory() );
  		
  		postNext( rs.next() );
--- 34,40 ----
  		this.sess = sess;
  		this.types = types;
+ 		this.names = columnNames;
  		
! 		single = types.length==1;		
  		
  		postNext( rs.next() );