[Hibernate-commits] Hibernate/cirrus/hibernate/query QueryTranslator.java,1.49,1.50

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

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

Modified Files:
	QueryTranslator.java 
Log Message:
miscellaneous refactoring

Index: QueryTranslator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/query/QueryTranslator.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** QueryTranslator.java	25 Nov 2002 02:21:10 -0000	1.49
--- QueryTranslator.java	25 Nov 2002 05:18:00 -0000	1.50
***************
*** 626,639 ****
  			//render the " and foo.class in ( 'Foo', 'Bar' ) " bit
  			String where = p.getQueryWhereClause(name);
- 			String ojWhere = p.outerJoinsAfterWhere(name);
  			if ( where!=null ) {
! 				if (!first) inClassWheres.append(" and ");
  				first=false;
  				inClassWheres.append(where);
- 			}
- 			if (ojWhere.length()>1) { //UGLY
- 				if (first) ojWhere = ojWhere.substring(5); //get rid of leading " AND "?
- 				first=false;
- 				inClassWheres.append(ojWhere);
  			}
  			
--- 626,633 ----
  			//render the " and foo.class in ( 'Foo', 'Bar' ) " bit
  			String where = p.getQueryWhereClause(name);
  			if ( where!=null ) {
! 				if (!first) inClassWheres.append(" AND ");
  				first=false;
  				inClassWheres.append(where);
  			}