[Hibernate-commits] Hibernate2/src/net/sf/hibernate/mapping Column.java,1.6,1.7 Table.java,1.6,1.7

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

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

Modified Files:
	Column.java Table.java 
Log Message:
applied Mark Woon's new patch for long column names

Index: Column.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Column.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Column.java	27 Jan 2003 12:51:50 -0000	1.6
--- Column.java	2 Feb 2003 06:41:05 -0000	1.7
***************
*** 7,10 ****
--- 7,11 ----
  import net.sf.hibernate.engine.Mapping;
  import net.sf.hibernate.type.Type;
+ import net.sf.hibernate.util.StringHelper;
  import net.sf.hibernate.util.Stringable;
  
***************
*** 20,23 ****
--- 21,25 ----
  	private boolean unique=false;
  	private String sqlType;
+ 	int uniqueInteger;
  	
  	public int getLength() {
***************
*** 38,41 ****
--- 40,53 ----
  	public void setName(String name) {
  		this.name = name;
+ 	}
+ 	
+ 	public String getAlias() {
+ 		//TODO: handle quoted identifiers!
+ 		if ( name.length() < 11 ) {
+ 			return name;
+ 		}
+ 		else {
+ 			return name.substring(0, 10) + uniqueInteger + StringHelper.UNDERSCORE;
+ 		}
  	}
  	

Index: Table.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Table.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Table.java	27 Jan 2003 12:51:50 -0000	1.6
--- Table.java	2 Feb 2003 06:41:05 -0000	1.7
***************
*** 57,62 ****
  	}
  	public void addColumn(Column column) {
! 		if ( columns.get( column.getName() )==null ) {
  			columns.put( column.getName(), column );
  		}
  	}
--- 57,67 ----
  	}
  	public void addColumn(Column column) {
! 		Column old = (Column) columns.get( column.getName() );
! 		if ( old==null ) {
  			columns.put( column.getName(), column );
+ 			column.uniqueInteger = columns.size();
+ 		}
+ 		else {
+ 			column.uniqueInteger = old.uniqueInteger;
  		}
  	}