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

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

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

Modified Files:
	Column.java PersistentClass.java RootClass.java 
Log Message:
fixed problem loading one-to-many in Sybase
alias length limitation for collection columns
added force attribute to <discriminator>
better handling of 'null' discriminators

Index: Column.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Column.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Column.java	15 Mar 2003 04:38:17 -0000	1.10
--- Column.java	16 Mar 2003 01:45:52 -0000	1.11
***************
*** 79,83 ****
  		catch (Exception e) {
  			throw new MappingException(
! 				"Could not determine type for column " + name + " of type " + type.getClass().getName() + ": " + e.getClass().getName(),
  				e
  			);
--- 79,88 ----
  		catch (Exception e) {
  			throw new MappingException(
! 				"Could not determine type for column " + 
! 				name + 
! 				" of type " + 
! 				type.getClass().getName() + 
! 				": " + 
! 				e.getClass().getName(),
  				e
  			);

Index: PersistentClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/PersistentClass.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PersistentClass.java	15 Mar 2003 04:38:17 -0000	1.11
--- PersistentClass.java	16 Mar 2003 01:45:52 -0000	1.12
***************
*** 156,159 ****
--- 156,163 ----
  	}
  	
+ 	public boolean isForceDiscriminator() {
+ 		return false;
+ 	}
+ 	
  	public void createPrimaryKey() {
  		//Primary key constraint

Index: RootClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/RootClass.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RootClass.java	27 Jan 2003 07:12:03 -0000	1.9
--- RootClass.java	16 Mar 2003 01:45:52 -0000	1.10
***************
*** 27,30 ****
--- 27,31 ----
  	private boolean explicitPolymorphism;
  	private Class persister;
+ 	private boolean forceDiscriminator;
  	
  	public Property getIdentifierProperty() {
***************
*** 166,169 ****
--- 167,186 ----
  	public void setCache(CacheConcurrencyStrategy cache) {
  		this.cache = cache;
+ 	}
+ 
+ 	/**
+ 	 * Returns the forceDiscriminator.
+ 	 * @return boolean
+ 	 */
+ 	public boolean isForceDiscriminator() {
+ 		return forceDiscriminator;
+ 	}
+ 
+ 	/**
+ 	 * Sets the forceDiscriminator.
+ 	 * @param forceDiscriminator The forceDiscriminator to set
+ 	 */
+ 	public void setForceDiscriminator(boolean forceDiscriminator) {
+ 		this.forceDiscriminator = forceDiscriminator;
  	}