Menu
▾
▴
hibernate-commits
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv947/hibernate/test
Modified Files:
ABC.hbm.xml ABCProxy.hbm.xml Bar.java BarProxy.java
Baz.hbm.xml Blobber.hbm.xml Category.hbm.xml Circular.hbm.xml
Container.hbm.xml Custom.hbm.xml Fee.hbm.xml Fo.hbm.xml
Foo.java FooBar.hbm.xml FooBarTest.java Fum.hbm.xml
Fumm.hbm.xml Glarch.hbm.xml Holder.hbm.xml Immutable.hbm.xml
Location.hbm.xml Many.hbm.xml MasterDetail.hbm.xml
Multi.hbm.xml Nameable.hbm.xml One.hbm.xml ParentChild.hbm.xml
Qux.hbm.xml Simple.hbm.xml SingleSeveral.hbm.xml Stuff.hbm.xml
Vetoer.hbm.xml
Log Message:
* fixed a bug in SQLExpression
* fixed a bug in Expression.ge()
* improved proxy handling
* fixed problems with select new
* reworked import mechanism
* added <any> mappings
Index: ABC.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABC.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ABC.hbm.xml 9 Feb 2003 06:28:16 -0000 1.4
--- ABC.hbm.xml 29 Mar 2003 04:08:48 -0000 1.5
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.A" discriminator-value="0">
<id name = "id" unsaved-value = "null">
<generator class="vm"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.A" import="A" discriminator-value="0">
<id name = "id" unsaved-value = "null">
<generator class="vm"/>
***************
*** 9,13 ****
<discriminator column="clazz" type="integer" not-null="false"/>
<property name="name"/>
! <subclass name="net.sf.hibernate.test.B" discriminator-value="-1">
<property name="count" column="count_"/>
<subclass name="net.sf.hibernate.test.C1" discriminator-value="null">
--- 9,13 ----
<discriminator column="clazz" type="integer" not-null="false"/>
<property name="name"/>
! <subclass name="net.sf.hibernate.test.B" import="B" discriminator-value="-1">
<property name="count" column="count_"/>
<subclass name="net.sf.hibernate.test.C1" discriminator-value="null">
***************
*** 21,25 ****
</class>
! <class name="net.sf.hibernate.test.D" discriminator-value="0" proxy="net.sf.hibernate.test.D">
<id name = "id" unsaved-value = "null">
<generator class="assigned"/>
--- 21,25 ----
</class>
! <class name="net.sf.hibernate.test.D" discriminator-value="0" import="D" proxy="net.sf.hibernate.test.D">
<id name = "id" unsaved-value = "null">
<generator class="assigned"/>
Index: ABCProxy.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABCProxy.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ABCProxy.hbm.xml 16 Mar 2003 01:45:53 -0000 1.5
--- ABCProxy.hbm.xml 29 Mar 2003 04:08:48 -0000 1.6
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.A" discriminator-value="0" proxy="net.sf.hibernate.test.A">
<id name = "id" unsaved-value = "null">
<generator class="vm"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.A" discriminator-value="0" import="A" proxy="net.sf.hibernate.test.A">
<id name = "id" unsaved-value = "null">
<generator class="vm"/>
***************
*** 9,19 ****
<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">
<property name="count" column="count_"/>
! <subclass name="net.sf.hibernate.test.C1" discriminator-value="1" proxy="net.sf.hibernate.test.C1">
<property name="address" column="c1"/>
<one-to-one name="d"/>
</subclass>
! <subclass name="net.sf.hibernate.test.C2" discriminator-value="2" proxy="net.sf.hibernate.test.C2">
<property name="address" column="c2"/>
</subclass>
--- 9,19 ----
<discriminator column="clazz" type="integer" force="true" not-null="false"/>
<property name="name"/>
! <subclass name="net.sf.hibernate.test.B" discriminator-value="null" import="B" proxy="net.sf.hibernate.test.B">
<property name="count" column="count_"/>
! <subclass name="net.sf.hibernate.test.C1" discriminator-value="1" import="C1" proxy="net.sf.hibernate.test.C1">
<property name="address" column="c1"/>
<one-to-one name="d"/>
</subclass>
! <subclass name="net.sf.hibernate.test.C2" discriminator-value="2" import="C2" proxy="net.sf.hibernate.test.C2">
<property name="address" column="c2"/>
</subclass>
***************
*** 21,25 ****
</class>
! <class name="net.sf.hibernate.test.D" discriminator-value="0" proxy="net.sf.hibernate.test.D">
<id name = "id" unsaved-value = "null">
<generator class="assigned"/>
--- 21,25 ----
</class>
! <class name="net.sf.hibernate.test.D" discriminator-value="0" proxy="net.sf.hibernate.test.D" import="D">
<id name = "id" unsaved-value = "null">
<generator class="assigned"/>
Index: Bar.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Bar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Bar.java 20 Mar 2003 13:59:09 -0000 1.4
--- Bar.java 29 Mar 2003 04:08:48 -0000 1.5
***************
*** 7,10 ****
--- 7,11 ----
private Baz baz;
private int x;
+ private Object object;
public int getX() {
***************
*** 48,52 ****
this.name = name;
}
!
}
--- 49,61 ----
this.name = name;
}
!
! public Object getObject() {
! return object;
! }
!
! public void setObject(Object object) {
! this.object = object;
! }
!
}
Index: BarProxy.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/BarProxy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BarProxy.java 5 Jan 2003 02:11:23 -0000 1.3
--- BarProxy.java 29 Mar 2003 04:08:49 -0000 1.4
***************
*** 9,12 ****
--- 9,14 ----
//public void setBarString(String arg0);
public String getBarString();
+ public Object getObject();
+ public void setObject(Object o);
}
Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Baz.hbm.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Baz.hbm.xml 9 Mar 2003 04:04:09 -0000 1.12
--- Baz.hbm.xml 29 Mar 2003 04:08:49 -0000 1.13
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Baz">
<id name="code" type="string">
<column name="baz_id" length="32"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Baz" import="Baz" >
<id name="code" type="string">
<column name="baz_id" length="32"/>
Index: Blobber.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Blobber.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Blobber.hbm.xml 15 Feb 2003 01:00:56 -0000 1.1
--- Blobber.hbm.xml 29 Mar 2003 04:08:49 -0000 1.2
***************
*** 2,6 ****
<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Blobber" dynamic-update="true">
<id name="id">
<generator class="hilo"/>
--- 2,6 ----
<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Blobber" import="Blobber" dynamic-update="true">
<id name="id">
<generator class="hilo"/>
Index: Category.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Category.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Category.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Category.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Category" table="category">
<id name="id" unsaved-value="0">
<generator class="native"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Category" import="Category" table="category">
<id name="id" unsaved-value="0">
<generator class="native"/>
Index: Circular.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Circular.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Circular.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Circular.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping default-cascade="save-update">
! <class name="net.sf.hibernate.test.Circular">
<id name="id" column="id_" length="64" unsaved-value="null">
<generator class="uuid.hex"/>
--- 3,7 ----
<hibernate-mapping default-cascade="save-update">
! <class name="net.sf.hibernate.test.Circular" import="Circular" >
<id name="id" column="id_" length="64" unsaved-value="null">
<generator class="uuid.hex"/>
Index: Container.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Container.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Container.hbm.xml 22 Mar 2003 04:39:49 -0000 1.5
--- Container.hbm.xml 29 Mar 2003 04:08:49 -0000 1.6
***************
*** 4,8 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Container" proxy="net.sf.hibernate.test.Container">
<id name="id" column="container_id">
<generator class="native" />
--- 4,8 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Container" import="Container" proxy="net.sf.hibernate.test.Container">
<id name="id" column="container_id">
<generator class="native" />
***************
*** 74,78 ****
</class>
! <class name="net.sf.hibernate.test.Contained" proxy="net.sf.hibernate.test.Contained">
<id name="id" column="container_id" unsaved-value="0">
<generator class="native" />
--- 74,78 ----
</class>
! <class name="net.sf.hibernate.test.Contained" import="Contained" proxy="net.sf.hibernate.test.Contained">
<id name="id" column="container_id" unsaved-value="0">
<generator class="native" />
Index: Custom.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Custom.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Custom.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3
--- Custom.hbm.xml 29 Mar 2003 04:08:49 -0000 1.4
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Custom" persister="net.sf.hibernate.test.CustomPersister">
<id type="string" name="key" column="id_" length="64" unsaved-value="null">
<generator class="uuid.hex"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Custom" import="Custom" persister="net.sf.hibernate.test.CustomPersister">
<id type="string" name="key" column="id_" length="64" unsaved-value="null">
<generator class="uuid.hex"/>
Index: Fee.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fee.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Fee.hbm.xml 22 Mar 2003 04:39:49 -0000 1.4
--- Fee.hbm.xml 29 Mar 2003 04:08:49 -0000 1.5
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Fee">
<id type="string" name="key" column="id_" length="64" unsaved-value="null">
<generator class="uuid.hex"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Fee" import="Fee" >
<id type="string" name="key" column="id_" length="64" unsaved-value="null">
<generator class="uuid.hex"/>
Index: Fo.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fo.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Fo.hbm.xml 20 Mar 2003 13:59:09 -0000 1.3
--- Fo.hbm.xml 29 Mar 2003 04:08:49 -0000 1.4
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Fo">
<composite-id class="net.sf.hibernate.test.FumCompositeID">
<key-property name="string">
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Fo" import="Fo" table="foes">
<composite-id class="net.sf.hibernate.test.FumCompositeID">
<key-property name="string">
Index: Foo.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Foo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Foo.java 20 Mar 2003 13:59:09 -0000 1.5
--- Foo.java 29 Mar 2003 04:08:49 -0000 1.6
***************
*** 71,74 ****
--- 71,82 ----
this.x = x;
}
+
+ public Foo() {
+ }
+
+ public Foo(int x) {
+ this.x=x;
+ }
+
public boolean onSave(Session db) throws CallbackException {
_string = "a string";
Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBar.hbm.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FooBar.hbm.xml 20 Mar 2003 13:59:09 -0000 1.9
--- FooBar.hbm.xml 29 Mar 2003 04:08:49 -0000 1.10
***************
*** 3,6 ****
--- 3,9 ----
<hibernate-mapping>
+ <import class="net.sf.hibernate.test.Result"/>
+ <import class="net.sf.hibernate.test.Named"/>
+
<class
name="net.sf.hibernate.test.Foo"
***************
*** 8,12 ****
proxy="net.sf.hibernate.test.FooProxy"
discriminator-value="F"
! dynamic-update="true">
<jcs-cache usage="read-write"/>
--- 11,16 ----
proxy="net.sf.hibernate.test.FooProxy"
discriminator-value="F"
! dynamic-update="true"
! import="Foo">
<jcs-cache usage="read-write"/>
***************
*** 108,112 ****
name="net.sf.hibernate.test.Bar"
proxy="net.sf.hibernate.test.BarProxy"
! discriminator-value="B">
<many-to-one name="baz"/>
<property name="barString">
--- 112,117 ----
name="net.sf.hibernate.test.Bar"
proxy="net.sf.hibernate.test.BarProxy"
! discriminator-value="B"
! import="Bar" >
<many-to-one name="baz"/>
<property name="barString">
***************
*** 124,127 ****
--- 129,136 ----
</array>
</component>
+ <any name="object" id-type="long">
+ <column name="clazz" length="100"/>
+ <column name="gen_id"/>
+ </any>
</subclass>
</subclass>
Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** FooBarTest.java 25 Mar 2003 13:49:44 -0000 1.44
--- FooBarTest.java 29 Mar 2003 04:08:49 -0000 1.45
***************
*** 1032,1035 ****
--- 1032,1043 ----
foo.setFoo(foo2);
+ List list = s.find(
+ "select foo, bar from Foo foo left outer join foo.foo bar where foo = ?",
+ foo,
+ Hibernate.association(Foo.class)
+ );
+ Object[] row1 = (Object[]) list.get(0);
+ assertTrue( row1[0]==foo && row1[1]==foo2 );
+
s.find("select foo.foo.foo.string from foo in class Foo where foo.foo = 'bar'");
s.find("select foo.foo.foo.foo.string from foo in class Foo where foo.foo.foo = 'bar'");
***************
*** 1049,1052 ****
--- 1057,1063 ----
}
+ s.find("from Foo as foo where foo.component.glarch.name is not null");
+ s.find("from Foo as foo left outer join foo.component.glarch as glarch where glarch.name = 'foo'");
+
/*Query q = s.createQuery("from foo in class Foo where foo.string = ? or foo.string = ? or foo.string in (:list)");
q.setString(0, "foo");
***************
*** 1057,1061 ****
q.list();*/
! List list = s.find("from foo in class net.sf.hibernate.test.Foo where foo.string='osama bin laden' and foo.boolean = true order by foo.string asc, foo.component.count desc");
assertTrue( list.size()==0, "empty query" );
Iterator iter = s.iterate("from foo in class net.sf.hibernate.test.Foo where foo.string='osama bin laden' order by foo.string asc, foo.component.count desc");
--- 1068,1072 ----
q.list();*/
! list = s.find("from foo in class net.sf.hibernate.test.Foo where foo.string='osama bin laden' and foo.boolean = true order by foo.string asc, foo.component.count desc");
assertTrue( list.size()==0, "empty query" );
Iterator iter = s.iterate("from foo in class net.sf.hibernate.test.Foo where foo.string='osama bin laden' order by foo.string asc, foo.component.count desc");
***************
*** 1178,1181 ****
--- 1189,1194 ----
list = s.find( "from foo in class Foo where foo.boolean = ?", new Boolean(true), Hibernate.BOOLEAN );
+ s.find("select new Foo(fo.x) from Fo fo");
+
list = s.find("select foo.long, foo.component.name, foo, foo.foo from foo in class Foo");
rs = list.iterator();
***************
*** 2760,2763 ****
--- 2773,2820 ----
}
+ public void testOneToOneGenerator() throws Exception {
+ Session s = sessions.openSession();
+ X x = new X();
+ Y y = new Y();
+ x.setY(y);
+ s.save(y);
+ s.save(x);
+ s.flush();
+ s.connection().commit();
+ s.close();
+ }
+
+ public void testAny() throws Exception {
+ Session s = sessions.openSession();
+ One one = new One();
+ BarProxy foo = new Bar();
+ foo.setObject(one);
+ Serializable oid = s.save(one);
+ Serializable fid = s.save(foo);
+ s.flush();
+ s.connection().commit();
+ s.close();
+ s = sessions.openSession();
+ assertTrue( s.find(
+ "from Bar bar where bar.object.id = ? and bar.object.class = ?",
+ new Object[] { oid, One.class },
+ new Type[] { Hibernate.LONG, Hibernate.CLASS }
+ ).size()==1 );
+ assertTrue( s.find(
+ "select one from One one, Bar bar where bar.object.id = one.id and bar.object.class = 'net.sf.hibernate.test.One'"
+ ).size()==1 );
+ s.flush();
+ s.connection().commit();
+ s.close();
+ s = sessions.openSession();
+ foo = (BarProxy) s.load(Foo.class, fid);
+ assertTrue( foo.getObject()!=null && foo.getObject() instanceof One && s.getIdentifier( foo.getObject() ).equals(oid) );
+ s.delete( foo.getObject() );
+ s.delete(foo);
+ s.flush();
+ s.connection().commit();
+ s.close();
+ }
+
public void testEmbeddedCompositeID() throws Exception {
Session s = sessions.openSession();
***************
*** 2938,2942 ****
"Stuff.hbm.xml",
"Container.hbm.xml",
! "Simple.hbm.xml"
} );
return new TestSuite(FooBarTest.class);
--- 2995,3000 ----
"Stuff.hbm.xml",
"Container.hbm.xml",
! "Simple.hbm.xml",
! "XY.hbm.xml"
} );
return new TestSuite(FooBarTest.class);
Index: Fum.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fum.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Fum.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Fum.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Fum">
<composite-id name="id" unsaved-value="any">
<key-property name="string">
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Fum" import="Fum">
<composite-id name="id" unsaved-value="any">
<key-property name="string">
Index: Fumm.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fumm.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Fumm.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Fumm.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Fumm">
<composite-id name="id">
<key-property name="string">
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Fumm" import="Fumm">
<composite-id name="id">
<key-property name="string">
Index: Glarch.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Glarch.hbm.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Glarch.hbm.xml 22 Mar 2003 04:39:49 -0000 1.8
--- Glarch.hbm.xml 29 Mar 2003 04:08:49 -0000 1.9
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Glarch" table="glarchez" proxy="net.sf.hibernate.test.GlarchProxy">
<!--<jcs-cache usage="read-write"/>-->
<id type="string" column="tha_key" length="32">
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Glarch" table="glarchez" import="Glarch" proxy="net.sf.hibernate.test.GlarchProxy">
<!--<jcs-cache usage="read-write"/>-->
<id type="string" column="tha_key" length="32">
Index: Holder.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Holder.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Holder.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Holder.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 2,6 ****
<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Holder">
<id name="id" column="id_" type="string" length="32" unsaved-value="null">
<generator class="uuid.hex"/>
</id>
<property name="name" unique="true" not-null="true" length="36"/>
<list name="ones">
<key column="holder"/>
<index column="i"/>
<one-to-many class="net.sf.hibernate.test.One"/>
</list>
<array name="fooArray">
<key column="holder1"/>
<index column="j1"/>
<one-to-many class="net.sf.hibernate.test.Foo"/>
</array>
--- 2,6 ----
<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Holder" import="Holder">
<id name="id" column="id_" type="string" length="32" unsaved-value="null">
<generator class="uuid.hex"/>
</id>
<property name="name" unique="true" not-null="true" length="36"/>
<list name="ones">
<key column="holder"/>
<index column="i"/>
<one-to-many class="net.sf.hibernate.test.One"/>
</list>
<array name="fooArray">
<key column="holder1"/>
<index column="j1"/>
<one-to-many class="net.sf.hibernate.test.Foo"/>
</array>
Index: Immutable.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Immutable.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Immutable.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3
--- Immutable.hbm.xml 29 Mar 2003 04:08:49 -0000 1.4
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Immutable" table="immut" mutable="false">
<jcs-cache usage="read-only"/>
<id name="id" column="id_" length="64">
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Immutable" import="Immutable" table="immut" mutable="false">
<jcs-cache usage="read-only"/>
<id name="id" column="id_" length="64">
Index: Location.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Location.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Location.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Location.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Location">
<composite-id>
<key-property name="streetNumber"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Location" import="Location">
<composite-id>
<key-property name="streetNumber"/>
Index: Many.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Many.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Many.hbm.xml 20 Mar 2003 13:59:10 -0000 1.5
--- Many.hbm.xml 29 Mar 2003 04:08:49 -0000 1.6
***************
*** 4,8 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Many" table="many">
<id name="key" column="many_key" unsaved-value="0">
<generator class="native" />
--- 4,8 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Many" import="Many" table="many">
<id name="key" column="many_key" unsaved-value="0">
<generator class="native" />
Index: MasterDetail.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MasterDetail.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MasterDetail.hbm.xml 20 Mar 2003 13:59:10 -0000 1.5
--- MasterDetail.hbm.xml 29 Mar 2003 04:08:49 -0000 1.6
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Master">
<id column="master_key" type="long">
<generator class="native"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Master" import="Master">
<id column="master_key" type="long">
<generator class="native"/>
***************
*** 32,36 ****
</class>
! <class name="net.sf.hibernate.test.Detail">
<id column="detail_key" type="long">
<generator class="native"/>
--- 32,36 ----
</class>
! <class name="net.sf.hibernate.test.Detail" import="Detail">
<id column="detail_key" type="long">
<generator class="native"/>
***************
*** 46,50 ****
</class>
! <class name="net.sf.hibernate.test.SubDetail">
<id column="subdetail_key" type="long">
<generator class="native">
--- 46,50 ----
</class>
! <class name="net.sf.hibernate.test.SubDetail" import="SubDetail">
<id column="subdetail_key" type="long">
<generator class="native">
Index: Multi.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Multi.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Multi.hbm.xml 17 Mar 2003 07:24:20 -0000 1.6
--- Multi.hbm.xml 29 Mar 2003 04:08:49 -0000 1.7
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Simple" table="rootclass" dynamic-update="true">
<jcs-cache usage="read-write"/>
<id type="long" column="id_" >
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Simple" table="rootclass" import="Simple" dynamic-update="true">
<jcs-cache usage="read-write"/>
<id type="long" column="id_" >
***************
*** 13,17 ****
<property name="date" column="date_"/>
! <joined-subclass name="net.sf.hibernate.test.Mono" table="mono">
<key column="superid"/>
<set name="strings" table="monostrings">
--- 13,17 ----
<property name="date" column="date_"/>
! <joined-subclass name="net.sf.hibernate.test.Mono" import="Mono" table="mono">
<key column="superid"/>
<set name="strings" table="monostrings">
***************
*** 21,29 ****
</joined-subclass>
! <joined-subclass name="net.sf.hibernate.test.TrivialClass">
<key column="tcid"/>
</joined-subclass>
! <joined-subclass name="net.sf.hibernate.test.LessSimple" table="leafsubclass">
<key column="id__"/>
<property name="intprop" not-null="true"/>
--- 21,29 ----
</joined-subclass>
! <joined-subclass name="net.sf.hibernate.test.TrivialClass" import="TrivialClass">
<key column="tcid"/>
</joined-subclass>
! <joined-subclass name="net.sf.hibernate.test.LessSimple" import="LessSimple" table="leafsubclass">
<key column="id__"/>
<property name="intprop" not-null="true"/>
***************
*** 43,47 ****
</joined-subclass>
! <joined-subclass name="net.sf.hibernate.test.Multi" table="nonleafsubclass" dynamic-update="true">
<key column="sid"/>
<property name="extraProp"/>
--- 43,47 ----
</joined-subclass>
! <joined-subclass name="net.sf.hibernate.test.Multi" table="nonleafsubclass" import="Multi" dynamic-update="true">
<key column="sid"/>
<property name="extraProp"/>
***************
*** 54,58 ****
</component>
! <joined-subclass name="net.sf.hibernate.test.SubMulti" table="leafsubsubclass">
<key column="sid"/>
<property name="amount"/>
--- 54,58 ----
</component>
! <joined-subclass name="net.sf.hibernate.test.SubMulti" import="SubMulti" table="leafsubsubclass">
<key column="sid"/>
<property name="amount"/>
***************
*** 68,72 ****
</class>
! <class name="net.sf.hibernate.test.Po">
<id type="long" column="id_">
<generator class="native"/>
--- 68,72 ----
</class>
! <class name="net.sf.hibernate.test.Po" import="Po">
<id type="long" column="id_">
<generator class="native"/>
Index: Nameable.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Nameable.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Nameable.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Nameable.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Nameable">
<id name="key" column="key_">
<generator class="native"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Nameable" import="Nameable">
<id name="key" column="key_">
<generator class="native"/>
Index: One.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/One.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** One.hbm.xml 20 Mar 2003 13:59:10 -0000 1.5
--- One.hbm.xml 29 Mar 2003 04:08:49 -0000 1.6
***************
*** 4,8 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.One" table="one">
<id name="key" column="one_key" unsaved-value="0">
<generator class="native" />
--- 4,8 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.One" import="One" table="one">
<id name="key" column="one_key" unsaved-value="0">
<generator class="native" />
Index: ParentChild.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ParentChild.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ParentChild.hbm.xml 20 Mar 2003 13:59:10 -0000 1.5
--- ParentChild.hbm.xml 29 Mar 2003 04:08:49 -0000 1.6
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Parent">
<id name="id" type="long">
<generator class="native"> <!--seqhilo-->
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Parent" import="Parent">
<id name="id" type="long">
<generator class="native"> <!--seqhilo-->
***************
*** 18,22 ****
</class>
! <class name="net.sf.hibernate.test.Child">
<id name="id" type="long">
<generator class="assigned"/>
--- 18,22 ----
</class>
! <class name="net.sf.hibernate.test.Child" import="Child">
<id name="id" type="long">
<generator class="assigned"/>
Index: Qux.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Qux.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Qux.hbm.xml 28 Jan 2003 10:22:21 -0000 1.4
--- Qux.hbm.xml 29 Mar 2003 04:08:49 -0000 1.5
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Qux" table="quux" proxy="net.sf.hibernate.test.Qux"> <!---->
<id name="key" column="qux_key" unsaved-value="0">
<generator class="hilo"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Qux" table="quux" import="Qux" proxy="net.sf.hibernate.test.Qux"> <!---->
<id name="key" column="qux_key" unsaved-value="0">
<generator class="hilo"/>
Index: Simple.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Simple.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Simple.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Simple.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Simple">
<id type="long" column="id_">
<generator class="assigned"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Simple" import="Simple">
<id type="long" column="id_">
<generator class="assigned"/>
Index: SingleSeveral.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/SingleSeveral.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SingleSeveral.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- SingleSeveral.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 5,9 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Single">
<composite-id>
<key-property name="id" length="32"/>
--- 5,9 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Single" import="Single">
<composite-id>
<key-property name="id" length="32"/>
***************
*** 20,24 ****
</class>
! <class name="net.sf.hibernate.test.Several">
<composite-id>
<key-property name="id" length="32"/>
--- 20,24 ----
</class>
! <class name="net.sf.hibernate.test.Several" import="Several">
<composite-id>
<key-property name="id" length="32"/>
Index: Stuff.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Stuff.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Stuff.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Stuff.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.MoreStuff">
<composite-id>
<key-property name="intId"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.MoreStuff" import="MoreStuff">
<composite-id>
<key-property name="intId"/>
***************
*** 19,23 ****
</class>
! <class name="net.sf.hibernate.test.Stuff">
<composite-id>
<key-property name="id"/>
--- 19,23 ----
</class>
! <class name="net.sf.hibernate.test.Stuff" import="Stuff">
<composite-id>
<key-property name="id"/>
Index: Vetoer.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Vetoer.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Vetoer.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2
--- Vetoer.hbm.xml 29 Mar 2003 04:08:49 -0000 1.3
***************
*** 3,7 ****
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Vetoer">
<id type="string" column="id_" length="32">
<generator class="uuid.hex"/>
--- 3,7 ----
<hibernate-mapping>
! <class name="net.sf.hibernate.test.Vetoer" import="Vetoer">
<id type="string" column="id_" length="32">
<generator class="uuid.hex"/>
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X