hibernate-commits

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

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

Modified Files:
	QueryTranslator.java 
Log Message:
bugfixes from 2.0 stream
* now uses interface proxies correctly
* bugfixes to Filters
* reference to self for a native id

Index: QueryTranslator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/query/QueryTranslator.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** QueryTranslator.java	4 Mar 2003 10:43:06 -0000	1.53
--- QueryTranslator.java	16 Apr 2003 06:30:54 -0000	1.54
***************
*** 781,785 ****
  
  
! 	protected void bindNamedParameters(PreparedStatement ps, Map namedParams, SessionImplementor session) throws SQLException, HibernateException {
  		if (namedParams!=null) {
  			Iterator iter = namedParams.entrySet().iterator();
--- 781,785 ----
  
  
! 	protected void bindNamedParameters(PreparedStatement ps, Map namedParams, int start, SessionImplementor session) throws SQLException, HibernateException {
  		if (namedParams!=null) {
  			Iterator iter = namedParams.entrySet().iterator();
***************
*** 790,794 ****
  				int[] locs = getNamedParameterLocs(name);
  				for ( int i=0; i<locs.length; i++ ) {
! 					typedval.type.nullSafeSet( ps, typedval.value, locs[i], session );
  				}	
  			}
--- 790,794 ----
  				int[] locs = getNamedParameterLocs(name);
  				for ( int i=0; i<locs.length; i++ ) {
! 					typedval.type.nullSafeSet( ps, typedval.value, locs[i] + start, session );
  				}	
  			}
***************
*** 798,804 ****
  	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 );
  		try {
- 			bindNamedParameters(st, namedParams, session);
  			setMaxRows(st, selection);
  			ResultSet rs = st.executeQuery();
--- 798,803 ----
  	public Iterator iterate(Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams, SessionImplementor session) throws HibernateException, SQLException {
  	
! 		PreparedStatement st = prepareQueryStatement( getScalarSelectSQL(), values, types, namedParams, selection, false, session );
  		try {
  			setMaxRows(st, selection);
  			ResultSet rs = st.executeQuery();
***************
*** 815,821 ****
  	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 );
  		try {
- 			bindNamedParameters(st, namedParams, session);
  			setMaxRows(st, selection);
  			ResultSet rs = st.executeQuery();
--- 814,819 ----
  	public ScrollableResults scroll(Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams, SessionImplementor session) throws HibernateException, SQLException {
  	
! 		PreparedStatement st = prepareQueryStatement( getScalarSelectSQL(), values, types, namedParams, selection, true, session );
  		try {
  			setMaxRows(st, selection);
  			ResultSet rs = st.executeQuery();
***************
*** 841,845 ****
  		}
  		ArrayList list = new ArrayList();
! 		PreparedStatement st = prepareQueryStatement( getSelectIdentifiersSQL(), values, types, null, false, session );
  		try {
  			ResultSet rs = st.executeQuery();
--- 839,843 ----
  		}
  		ArrayList list = new ArrayList();
! 		PreparedStatement st = prepareQueryStatement( getSelectIdentifiersSQL(), values, types, null, null, false, session );
  		try {
  			ResultSet rs = st.executeQuery();