[Hibernate-commits] Hibernate2/src/net/sf/hibernate/hql PathExpressionParser.java,1.1.1.1,1.2 QueryTranslator.java,1.1.1.1,1.2

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

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

Modified Files:
	PathExpressionParser.java QueryTranslator.java 
Log Message:
removed exceptions that occur if an object is saved or deleted multiple times in a session
added <parent> subelement to <composite-element> and <nested-composite-element>


Index: PathExpressionParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/PathExpressionParser.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PathExpressionParser.java	1 Jan 2003 13:54:33 -0000	1.1.1.1
--- PathExpressionParser.java	3 Jan 2003 13:36:00 -0000	1.2
***************
*** 7,11 ****
  import net.sf.hibernate.QueryException;
  import net.sf.hibernate.util.StringHelper;
! import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.persister.ClassPersister;
--- 7,11 ----
  import net.sf.hibernate.QueryException;
  import net.sf.hibernate.util.StringHelper;
! import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.persister.ClassPersister;

Index: QueryTranslator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/QueryTranslator.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** QueryTranslator.java	1 Jan 2003 13:54:37 -0000	1.1.1.1
--- QueryTranslator.java	3 Jan 2003 13:36:00 -0000	1.2
***************
*** 24,37 ****
  import net.sf.hibernate.QueryException;
  import net.sf.hibernate.ScrollableResults;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.util.ArrayHelper;
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.ReflectHelper;
  import net.sf.hibernate.util.StringHelper;
- import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.impl.IteratorImpl;
- import net.sf.hibernate.impl.QueryImpl;
  import net.sf.hibernate.impl.ScrollableResultsImpl;
  import net.sf.hibernate.loader.Loader;
  import net.sf.hibernate.persister.*;
--- 24,39 ----
  import net.sf.hibernate.QueryException;
  import net.sf.hibernate.ScrollableResults;
+ import net.sf.hibernate.collection.CollectionPersister;
+ import net.sf.hibernate.engine.RowSelection;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
+ import net.sf.hibernate.engine.TypedValue;
  import net.sf.hibernate.util.ArrayHelper;
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.ReflectHelper;
  import net.sf.hibernate.util.StringHelper;
  import net.sf.hibernate.impl.IteratorImpl;
  import net.sf.hibernate.impl.ScrollableResultsImpl;
+ import net.sf.hibernate.engine.TypedValue;
  import net.sf.hibernate.loader.Loader;
  import net.sf.hibernate.persister.*;
***************
*** 774,781 ****
  				Map.Entry e = (Map.Entry) iter.next();
  				String name = (String) e.getKey();
! 				QueryImpl.TypedValue typedval = (QueryImpl.TypedValue) e.getValue();
  				int[] locs = getNamedParameterLocs(name);
  				for ( int i=0; i<locs.length; i++ ) {
! 					typedval.type.nullSafeSet( ps, typedval.value, locs[i], session );
  				}	
  			}
--- 776,783 ----
  				Map.Entry e = (Map.Entry) iter.next();
  				String name = (String) e.getKey();
! 				TypedValue typedval = (TypedValue) e.getValue();
  				int[] locs = getNamedParameterLocs(name);
  				for ( int i=0; i<locs.length; i++ ) {
! 					typedval.getType().nullSafeSet( ps, typedval.getValue(), locs[i], session );
  				}	
  			}
***************
*** 783,787 ****
  	}
  	
! 	public Iterator iterate(Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams, SessionImplementor session) throws HibernateException, SQLException {
  	
  		PreparedStatement st = prepareQueryStatement( getScalarSelectSQL(), values, types, selection, false, session );
--- 785,789 ----
  	}
  	
! 	public Iterator iterate(Object[] values, Type[] types, RowSelection selection, Map namedParams, SessionImplementor session) throws HibernateException, SQLException {
  	
  		PreparedStatement st = prepareQueryStatement( getScalarSelectSQL(), values, types, selection, false, session );
***************
*** 800,804 ****
  	}
  	
! 	public ScrollableResults scroll(Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams, SessionImplementor session) throws HibernateException, SQLException {
  	
  		PreparedStatement st = prepareQueryStatement( getScalarSelectSQL(), values, types, selection, true, session );
--- 802,806 ----
  	}
  	
! 	public ScrollableResults scroll(Object[] values, Type[] types, RowSelection selection, Map namedParams, SessionImplementor session) throws HibernateException, SQLException {
  	
  		PreparedStatement st = prepareQueryStatement( getScalarSelectSQL(), values, types, selection, true, session );