[Hibernate-commits] Hibernate2/src/net/sf/hibernate/mapping Column.java,1.9,1.10 PersistentClass.java,1.10,1.11

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

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

Modified Files:
	Column.java PersistentClass.java 
Log Message:
refactored alias generation into Alias class

Index: Column.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Column.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Column.java	2 Mar 2003 06:58:50 -0000	1.9
--- Column.java	15 Mar 2003 04:38:17 -0000	1.10
***************
*** 6,9 ****
--- 6,10 ----
  import net.sf.hibernate.dialect.Dialect;
  import net.sf.hibernate.engine.Mapping;
+ import net.sf.hibernate.sql.Alias;
  import net.sf.hibernate.type.Type;
  import net.sf.hibernate.util.StringHelper;
***************
*** 48,52 ****
  		}
  		else {
! 			return name.substring(0, 10) + uniqueInteger + StringHelper.UNDERSCORE;
  		}
  	}
--- 49,53 ----
  		}
  		else {
! 			return new Alias(10, Integer.toString(uniqueInteger) + StringHelper.UNDERSCORE).toAliasString(name);
  		}
  	}

Index: PersistentClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/PersistentClass.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PersistentClass.java	27 Jan 2003 12:51:50 -0000	1.10
--- PersistentClass.java	15 Mar 2003 04:38:17 -0000	1.11
***************
*** 6,11 ****
  
  import net.sf.hibernate.cache.CacheConcurrencyStrategy;
  import net.sf.hibernate.util.JoinedIterator;
- import net.sf.hibernate.util.StringHelper;
  import net.sf.hibernate.util.Stringable;
  
--- 6,11 ----
  
  import net.sf.hibernate.cache.CacheConcurrencyStrategy;
+ import net.sf.hibernate.sql.Alias;
  import net.sf.hibernate.util.JoinedIterator;
  import net.sf.hibernate.util.Stringable;
  
***************
*** 160,164 ****
  		PrimaryKey pk = new PrimaryKey();
  		pk.setTable(table);
! 		pk.setName( StringHelper.suffix( table.getName(), "PK" ) );
  		table.setPrimaryKey(pk);
  		
--- 160,164 ----
  		PrimaryKey pk = new PrimaryKey();
  		pk.setTable(table);
! 		pk.setName( PK_ALIAS.toAliasString( table.getName() ) );
  		table.setPrimaryKey(pk);
  		
***************
*** 168,171 ****
--- 168,173 ----
  		}
  	}
+ 	
+ 	private static final Alias PK_ALIAS = new Alias(15, "PK");
  
  }