[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test ABCProxy.hbm.xml,1.4,1.5 ABCProxyTest.java,1.4,1.5 MasterDetail.hbm.xml,1.3,1.4

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

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

Modified Files:
	ABCProxy.hbm.xml ABCProxyTest.java MasterDetail.hbm.xml 
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: ABCProxy.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABCProxy.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ABCProxy.hbm.xml	9 Feb 2003 06:28:16 -0000	1.4
--- ABCProxy.hbm.xml	16 Mar 2003 01:45:53 -0000	1.5
***************
*** 7,11 ****
  			<generator class="vm"/>
  		</id>
! 		<discriminator column="clazz" type="integer"/>
  		<property name="name"/>
  		<subclass name="net.sf.hibernate.test.B" discriminator-value="null" proxy="net.sf.hibernate.test.B">
--- 7,11 ----
  			<generator class="vm"/>
  		</id>
! 		<discriminator column="clazz" type="integer" force="true" not-null="false"/>
  		<property name="name"/>
  		<subclass name="net.sf.hibernate.test.B" discriminator-value="null" proxy="net.sf.hibernate.test.B">

Index: ABCProxyTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABCProxyTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ABCProxyTest.java	9 Feb 2003 06:28:16 -0000	1.4
--- ABCProxyTest.java	16 Mar 2003 01:45:53 -0000	1.5
***************
*** 116,119 ****
--- 116,120 ----
  			c1b.getName().equals("c1")
  		);
+ 		System.out.println( s.delete("from a in class A") );
  		t.commit();
  		s.close();
***************
*** 121,125 ****
  		s = sessions.openSession();
  		t = s.beginTransaction();
! 		s.find("from b in class B");
  		t.commit();
  		s.close();
--- 122,130 ----
  		s = sessions.openSession();
  		t = s.beginTransaction();
! 		s.save( new B() );
! 		s.save( new A() );
! 		assertTrue( s.find("from b in class B").size()==1 );
! 		assertTrue( s.find("from a in class A").size()==2 );
! 		s.delete("from a in class A");
  		t.commit();
  		s.close();

Index: MasterDetail.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MasterDetail.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MasterDetail.hbm.xml	28 Jan 2003 10:22:21 -0000	1.3
--- MasterDetail.hbm.xml	16 Mar 2003 01:45:53 -0000	1.4
***************
*** 21,30 ****
  		</set>
  		<set name="incoming" lazy="true" table="mtm">
! 			<key column="outg"/>
! 			<many-to-many class="net.sf.hibernate.test.Master" column="incm"/>
  		</set>
  		<set name="outgoing" lazy="true" table="mtm" inverse="true">
! 			<key column="incm"/>
! 			<many-to-many class="net.sf.hibernate.test.Master" column="outg"/>
  		</set>
  		<!-- <cache timeout="10000" type="readwrite"/> -->
--- 21,30 ----
  		</set>
  		<set name="incoming" lazy="true" table="mtm">
! 			<key column="outgoingabcdef"/>
! 			<many-to-many class="net.sf.hibernate.test.Master" column="incomingabcdef"/>
  		</set>
  		<set name="outgoing" lazy="true" table="mtm" inverse="true">
! 			<key column="incomingabcdef"/>
! 			<many-to-many class="net.sf.hibernate.test.Master" column="outgoingabcdef"/>
  		</set>
  		<!-- <cache timeout="10000" type="readwrite"/> -->