Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv5218/hibernate/test
Modified Files:
Multi.hbm.xml MultiTableTest.java
Log Message:
improved SQL for <joined-subclass> mappings
Index: Multi.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Multi.hbm.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Multi.hbm.xml 22 Nov 2002 00:27:09 -0000 1.14
--- Multi.hbm.xml 25 Nov 2002 07:25:21 -0000 1.15
***************
*** 12,16 ****
<property name="date" column="date_"/>
! <joined-subclass name="cirrus.hibernate.test.LessSimple" table="subclass">
<key column="id_"/>
<property name="intprop" not-null="true"/>
--- 12,16 ----
<property name="date" column="date_"/>
! <joined-subclass name="cirrus.hibernate.test.LessSimple" table="leafsubclass">
<key column="id_"/>
<property name="intprop" not-null="true"/>
***************
*** 25,29 ****
</joined-subclass>
! <joined-subclass name="cirrus.hibernate.test.Multi" table="nuthasubclass">
<key column="sid"/>
<property name="extraProp"/>
--- 25,29 ----
</joined-subclass>
! <joined-subclass name="cirrus.hibernate.test.Multi" table="nonleafsubclass">
<key column="sid"/>
<property name="extraProp"/>
***************
*** 35,39 ****
</component>
! <joined-subclass name="cirrus.hibernate.test.SubMulti" table="submulti">
<key column="sid"/>
<property name="amount"/>
--- 35,39 ----
</component>
! <joined-subclass name="cirrus.hibernate.test.SubMulti" table="leafsubsubclass">
<key column="sid"/>
<property name="amount"/>
Index: MultiTableTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/MultiTableTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MultiTableTest.java 20 Nov 2002 10:30:45 -0000 1.11
--- MultiTableTest.java 25 Nov 2002 07:25:21 -0000 1.12
***************
*** 93,96 ****
--- 93,112 ----
s.find("from m in class LessSimple where m.other is not null");
s.find("from m in class SubMulti where m.amount > 0.0");
+
+ assertTrue(
+ s.find("from m in class Multi").size()==2
+ );
+ /*assertTrue(
+ s.find("from m in class Multi where m.class = Multi").size()==1
+ );*/
+ assertTrue(
+ s.find("from s in class Simple").size()==3
+ );
+ assertTrue(
+ s.find("from ls in class LessSimple").size()==0
+ );
+ assertTrue(
+ s.find("from sm in class SubMulti").size()==1
+ );
t.commit();
s.close();
|
