[Hibernate-commits] Hibernate/cirrus/hibernate/persister AbstractEntityPersister.java,1.19,1.20 EntityPersister.java,1.47,1.48 MultiTableEntityPersister.java,1.45,1.46

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

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

Modified Files:
	AbstractEntityPersister.java EntityPersister.java 
	MultiTableEntityPersister.java 
Log Message:
Mark Woon's patch to limit length of aliases

Index: AbstractEntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/AbstractEntityPersister.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AbstractEntityPersister.java	6 Dec 2002 12:24:31 -0000	1.19
--- AbstractEntityPersister.java	9 Jan 2003 09:40:19 -0000	1.20
***************
*** 131,135 ****
  				.append( cols[i] )
  				.append(" as ")
! 				.append( aliasColumn(cols[i], suffix) );
  			if (i!=cols.length-1) buf.append(", ");
  		}
--- 131,135 ----
  				.append( cols[i] )
  				.append(" as ")
! 				.append( StringHelper.suffix(cols[i], suffix) );
  			if (i!=cols.length-1) buf.append(", ");
  		}
***************
*** 686,707 ****
  	public Class getConcreteProxyClass() {
  		return concreteProxyClass;
- 	}
- 	
- 	//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();
  	}
  	
--- 686,689 ----

Index: EntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/EntityPersister.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** EntityPersister.java	19 Dec 2002 11:49:20 -0000	1.47
--- EntityPersister.java	9 Jan 2003 09:40:19 -0000	1.48
***************
*** 900,904 ****
  				.append(discr)
  				.append(" as ")
! 				.append( aliasColumn(discr, suffix) );
  		}
  
--- 900,904 ----
  				.append(discr)
  				.append(" as ")
! 				.append( StringHelper.suffix(discr, suffix) );
  		}
  
***************
*** 911,915 ****
  				.append( cols[i] )
  				.append(" as ")
! 				.append( aliasColumn(cols[i], suffix) );
  		}
  		return buf.toString();
--- 911,915 ----
  				.append( cols[i] )
  				.append(" as ")
! 				.append( StringHelper.suffix(cols[i], suffix) );
  		}
  		return buf.toString();

Index: MultiTableEntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/MultiTableEntityPersister.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** MultiTableEntityPersister.java	19 Dec 2002 11:54:19 -0000	1.45
--- MultiTableEntityPersister.java	9 Jan 2003 09:40:19 -0000	1.46
***************
*** 99,104 ****
  	private static final String[] STRING_ARRAY = {};
  	private static final Type[] TYPE_ARRAY = {};
! 	private static final Class[] NO_CLASSES = new Class[0];
! 	
  	private static final Log log = LogFactory.getLog(MultiTableEntityPersister.class);
  
--- 99,103 ----
  	private static final String[] STRING_ARRAY = {};
  	private static final Type[] TYPE_ARRAY = {};
! 
  	private static final Log log = LogFactory.getLog(MultiTableEntityPersister.class);
  
***************
*** 1094,1098 ****
  			}
  			buf.append(" end as ")
! 				.append( aliasColumn( getDiscriminatorColumnName(), suffix) );
  		}
  
--- 1093,1097 ----
  			}
  			buf.append(" end as ")
! 				.append( StringHelper.suffix( getDiscriminatorColumnName(), suffix) );
  		}
  
***************
*** 1107,1111 ****
  				.append( cols[i] )
  				.append(" as ")
! 				.append( aliasColumn( subclassColumnClosureAliases[i], suffix) );
  		}
  		return buf.toString();
--- 1106,1111 ----
  				.append( cols[i] )
  				.append(" as ")
! 				.append( StringHelper.suffix( subclassColumnClosureAliases[i], suffix) );
! 
  		}
  		return buf.toString();