[Hibernate-commits] Hibernate2/src/net/sf/hibernate/hql PreprocessingParser.java,1.4,1.5

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

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

Modified Files:
	PreprocessingParser.java 
Log Message:
fixed conflict with SQL function names

Index: PreprocessingParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/PreprocessingParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PreprocessingParser.java	12 Jan 2003 07:07:48 -0000	1.4
--- PreprocessingParser.java	12 Jan 2003 08:21:35 -0000	1.5
***************
*** 37,45 ****
  		collectionProps.put("elements", "elements");
  		collectionProps.put("indices", "indices");
! 		collectionProps.put("count", "size");
  		collectionProps.put("maxindex", "maxIndex");
  		collectionProps.put("minindex", "minIndex");
! 		collectionProps.put("max", "maxElement");
! 		collectionProps.put("min", "minElement");
  	}
  	
--- 37,45 ----
  		collectionProps.put("elements", "elements");
  		collectionProps.put("indices", "indices");
! 		collectionProps.put("size", "size");
  		collectionProps.put("maxindex", "maxIndex");
  		collectionProps.put("minindex", "minIndex");
! 		collectionProps.put("maxelement", "maxElement");
! 		collectionProps.put("minelement", "minElement");
  	}
  	
***************
*** 95,102 ****
  			}
  		}
! 		
! 		String prop = (String) collectionProps.get( token.toLowerCase() );
! 		if ( prop!=null ) {
! 			currentCollectionProp = prop;
  		}
  		
--- 95,101 ----
  			}
  		}
! 		else {
! 			String prop = (String) collectionProps.get( token.toLowerCase() );
! 			if ( prop!=null ) currentCollectionProp = prop;
  		}