hibernate-commits

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister
In directory usw-pr-cvs1:/tmp/cvs-serv519/cirrus/hibernate/persister

Modified Files:
	AbstractEntityPersister.java EntityPersister.java 
Log Message:
support for SQL quoted identifiers

Index: AbstractEntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/AbstractEntityPersister.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AbstractEntityPersister.java	26 Oct 2002 16:43:27 -0000	1.9
--- AbstractEntityPersister.java	31 Oct 2002 14:00:25 -0000	1.10
***************
*** 1,564 ****
! //$Id$
! package cirrus.hibernate.persister;
! 
! import java.io.Serializable;
! import java.lang.reflect.Constructor;
! import java.lang.reflect.Method;
! import java.lang.reflect.Modifier;
! import java.util.HashSet;
! import java.util.Iterator;
! 
[...1116 lines suppressed...]
! 	
! 	//TODO: refactor! this is a duplicate of a method in the Loader heirarchy
! 	protected static String aliasColumn(String name, String suffix) {
! 
! 		char quote = name.charAt(0);
! 	    boolean nameEscaped = Dialect.QUOTE.indexOf(quote) > -1;
! 
! 	    if (nameEscaped) name = name.substring(1, name.length()-1);
! 
! 	    StringBuffer aliasBuilder = new StringBuffer(name.length());
! 
! 	    if (nameEscaped) aliasBuilder.append(quote);
! 	    aliasBuilder.append(name);
! 	    aliasBuilder.append(suffix);
! 	    if (nameEscaped) aliasBuilder.append(quote);
! 
! 	    return aliasBuilder.toString();
! 	}
! 	
! }

Index: EntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/EntityPersister.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** EntityPersister.java	27 Oct 2002 03:11:33 -0000	1.32
--- EntityPersister.java	31 Oct 2002 14:00:25 -0000	1.33
***************
*** 998,1002 ****
  				.append(discr)
  				.append(" as ")
! 				.append(discr).append(suffix);
  		}
  
--- 998,1002 ----
  				.append(discr)
  				.append(" as ")
! 				.append( aliasColumn(discr, suffix) );
  		}
  
***************
*** 1004,1012 ****
  
  		for ( int i=0; i<cols.length; i++ ) {
! 			buf.append(", ").append(name).append('.').append( cols[i] ).append(" as ").append(cols[i]).append(suffix);
  		}
  		return buf.toString();
  	}
- 
  }
  
--- 1004,1016 ----
  
  		for ( int i=0; i<cols.length; i++ ) {
! 			buf.append(", ")
! 				.append(name)
! 				.append('.')
! 				.append( cols[i] )
! 				.append(" as ")
! 				.append( aliasColumn(cols[i], suffix) );
  		}
  		return buf.toString();
  	}
  }