[Hibernate-commits] Hibernate/cirrus/hibernate/map Collection.java,1.44,1.45 RootClass.java,1.47,1.48 Subclass.java,1.17,1.18 Value.java,1.39,1.40

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

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

Modified Files:
	Collection.java RootClass.java Subclass.java Value.java 
Log Message:
support for SQL quoted identifiers

Index: Collection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Collection.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Collection.java	26 Oct 2002 16:43:27 -0000	1.44
--- Collection.java	31 Oct 2002 14:00:27 -0000	1.45
***************
*** 212,216 ****
  	public Index createIndex() {
  		Index index = new Index();
! 		index.setName( table.getQualifiedName() + "IDX" + table.generateConstraintID() );
  		index.setTable(table);
  		Iterator iter = getIdentifier().getColumnIterator();
--- 212,216 ----
  	public Index createIndex() {
  		Index index = new Index();
! 		index.setName( StringHelper.suffix( table.getQualifiedName(), "IDX" + table.generateConstraintID() ) );
  		index.setTable(table);
  		Iterator iter = getIdentifier().getColumnIterator();

Index: RootClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/RootClass.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** RootClass.java	27 Oct 2002 03:11:33 -0000	1.47
--- RootClass.java	31 Oct 2002 14:00:27 -0000	1.48
***************
*** 223,227 ****
  		PrimaryKey pk = new PrimaryKey();
  		pk.setTable(table);
! 		pk.setName( table.getName() + "PK" );
  		Iterator iter = identifier.getColumnIterator();
  		while ( iter.hasNext() ) {
--- 223,227 ----
  		PrimaryKey pk = new PrimaryKey();
  		pk.setTable(table);
! 		pk.setName( StringHelper.suffix( table.getName(), "PK" ) );
  		Iterator iter = identifier.getColumnIterator();
  		while ( iter.hasNext() ) {

Index: Subclass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Subclass.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Subclass.java	11 Oct 2002 04:37:43 -0000	1.17
--- Subclass.java	31 Oct 2002 14:00:28 -0000	1.18
***************
*** 8,11 ****
--- 8,12 ----
  import cirrus.hibernate.cache.CacheConcurrencyStrategy;
  import cirrus.hibernate.helpers.JoinedIterator;
+ import cirrus.hibernate.helpers.StringHelper;
  import cirrus.hibernate.persister.EntityPersister;
  import cirrus.hibernate.persister.MultiTableEntityPersister;
***************
*** 118,122 ****
  			PrimaryKey pk = new PrimaryKey();
  			pk.setTable(this.table);
! 			pk.setName( tableName + "PK" );
  			this.table.setPrimaryKey(pk);
  
--- 119,123 ----
  			PrimaryKey pk = new PrimaryKey();
  			pk.setTable(this.table);
! 			pk.setName( StringHelper.suffix( tableName, "PK" ) );
  			this.table.setPrimaryKey(pk);
  

Index: Value.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Value.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Value.java	27 Oct 2002 03:11:33 -0000	1.39
--- Value.java	31 Oct 2002 14:00:28 -0000	1.40
***************
*** 7,10 ****
--- 7,11 ----
  import cirrus.hibernate.*;
  import cirrus.hibernate.helpers.ReflectHelper;
+ import cirrus.hibernate.helpers.StringHelper;
  import cirrus.hibernate.id.Assigned;
  import cirrus.hibernate.id.IdentifierGenerator;
***************
*** 115,119 ****
  		}
  		fk.setTable(table);
! 		fk.setName( table.getName() + "FK" + table.generateConstraintID() );
  		fk.setReferencedClass(persistentClass);
  		root.addForeignKey(fk);
--- 116,120 ----
  		}
  		fk.setTable(table);
! 		fk.setName( StringHelper.suffix( table.getName(), "FK" + table.generateConstraintID() ) );
  		fk.setReferencedClass(persistentClass);
  		root.addForeignKey(fk);