[Hibernate-commits] Hibernate2/src/net/sf/hibernate/id PersistentIdentifierGenerator.java,1.3,1.4 SequenceGenerator.java,1.5,1.6 TableGenerator.java,1.2,1.3

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

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

Modified Files:
	PersistentIdentifierGenerator.java SequenceGenerator.java 
	TableGenerator.java 
Log Message:
added CompositeUserType
refactored handling of component path expressions
PersistentIdentifierGenerators now aware of schema

Index: PersistentIdentifierGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id/PersistentIdentifierGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PersistentIdentifierGenerator.java	5 Jan 2003 02:11:21 -0000	1.3
--- PersistentIdentifierGenerator.java	6 Apr 2003 02:28:57 -0000	1.4
***************
*** 14,17 ****
--- 14,22 ----
  	
  	/**
+ 	 * The configuration parameter holding the schema name
+ 	 */
+ 	public static final String SCHEMA = "schema";
+ 	
+ 	/**
  	 * The SQL required to create the underlying database objects.
  	 * @param dialect

Index: SequenceGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id/SequenceGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SequenceGenerator.java	19 Jan 2003 11:47:07 -0000	1.5
--- SequenceGenerator.java	6 Apr 2003 02:28:57 -0000	1.6
***************
*** 17,20 ****
--- 17,21 ----
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.PropertiesHelper;
+ import net.sf.hibernate.util.StringHelper;
  import net.sf.hibernate.dialect.Dialect;
  
***************
*** 46,49 ****
--- 47,53 ----
  	public void configure(Type type, Properties params, Dialect dialect) throws MappingException {
  		this.sequenceName = PropertiesHelper.getString(SEQUENCE, params, "hibernate_sequence");
+ 		String schemaName = params.getProperty(SCHEMA);
+ 		if ( schemaName!=null && sequenceName.indexOf(StringHelper.DOT)<0 ) 
+ 			sequenceName = schemaName + '.' + sequenceName;
  		returnClass = type.getReturnedClass();
  		sql = dialect.getSequenceNextValString(sequenceName);

Index: TableGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id/TableGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TableGenerator.java	1 Mar 2003 21:27:30 -0000	1.2
--- TableGenerator.java	6 Apr 2003 02:28:57 -0000	1.3
***************
*** 18,21 ****
--- 18,22 ----
  import net.sf.hibernate.type.Type;
  import net.sf.hibernate.util.PropertiesHelper;
+ import net.sf.hibernate.util.StringHelper;
  
  /**
***************
*** 61,64 ****
--- 62,68 ----
  		this.tableName = PropertiesHelper.getString(TABLE, params, "hibernate_unique_key");
  		this.columnName = PropertiesHelper.getString(COLUMN, params, "next_hi");
+ 		String schemaName = params.getProperty(SCHEMA);
+ 		if ( schemaName!=null && tableName.indexOf(StringHelper.DOT)<0 ) 
+ 			tableName = schemaName + '.' + tableName;
  		
  		query = "select " + columnName + " from " + tableName;