[Hibernate-commits] Hibernate2/src/net/sf/hibernate/sql QuerySelect.java,1.3,1.4

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

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

Modified Files:
	QuerySelect.java 
Log Message:
added some new logging
support SQL-style escapes in HQL strings

Index: QuerySelect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql/QuerySelect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QuerySelect.java	12 Mar 2003 08:24:23 -0000	1.3
--- QuerySelect.java	20 Mar 2003 13:59:09 -0000	1.4
***************
*** 116,125 ****
  	private void appendTokens(StringBuffer buf, Iterator iter) {
  		boolean lastSpaceable=true;
  		while ( iter.hasNext() ) {
  			String token = (String) iter.next();
  			boolean spaceable = !dontSpace.contains(token);
! 			if (spaceable && lastSpaceable) buf.append(' ');
  			lastSpaceable = spaceable;
  			buf.append(token);
  		}
  	}
--- 116,130 ----
  	private void appendTokens(StringBuffer buf, Iterator iter) {
  		boolean lastSpaceable=true;
+ 		boolean lastQuoted=false;
  		while ( iter.hasNext() ) {
  			String token = (String) iter.next();
  			boolean spaceable = !dontSpace.contains(token);
! 			boolean quoted = token.startsWith("'");
! 			if (spaceable && lastSpaceable) {
! 				if ( !quoted || !lastQuoted ) buf.append(' ');
! 			}
  			lastSpaceable = spaceable;
  			buf.append(token);
+ 			lastQuoted = token.endsWith("'");
  		}
  	}