Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Category.hbm.xml,NONE,1.1 Circular.hbm.xml,NONE,1.1 INameable.hbm.xml,NONE,1.1 MasterDetail.hbm.xml,NONE,1.1 Middle.hbm.xml,NONE,1.1 Multi.hbm.xml,NONE,1.1 SingleSeveral.hbm.xml,NONE,1.1 WZ.hbm.xml,NONE,1.1 A.cs,1.1,1.2 ABC.hbm.xml,1.3,1.4 ABCProxy.hbm.xml,1.2,1.3 B.cs,1.1,1.2 Bar.cs,1.2,1.3 Baz.cs,1.5,1.6 C1.cs,1.2,1.3 C2.cs,1.1,1.2 Container.hbm.xml,1.2,1.3 NHibernate.DomainModel-1.1.csproj,1.16,1.17
|
From: Michael D. <mik...@us...> - 2004-06-03 18:01:37
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29900 Modified Files: A.cs ABC.hbm.xml ABCProxy.hbm.xml B.cs Bar.cs Baz.cs C1.cs C2.cs Container.hbm.xml NHibernate.DomainModel-1.1.csproj Added Files: Category.hbm.xml Circular.hbm.xml INameable.hbm.xml MasterDetail.hbm.xml Middle.hbm.xml Multi.hbm.xml SingleSeveral.hbm.xml WZ.hbm.xml Log Message: Continued to add Domain Classes for test fixtures. Index: Baz.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Baz.cs 28 Apr 2004 14:17:10 -0000 1.5 --- Baz.cs 3 Jun 2004 18:01:24 -0000 1.6 *************** *** 1,12 **** - //------------------------------------------------------------------------------ - // <autogenerated> - // This code was generated by a tool. - // Runtime Version: v1.1.4322 - // - // Changes to this file may cause incorrect behavior and will be lost if - // the code is regenerated. - // </autogenerated> - //------------------------------------------------------------------------------ - using System; using System.Collections; --- 1,2 ---- *************** *** 45,48 **** --- 35,39 ---- } } + #region Fields /// <summary> Index: NHibernate.DomainModel-1.1.csproj =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** NHibernate.DomainModel-1.1.csproj 3 Jun 2004 14:54:40 -0000 1.16 --- NHibernate.DomainModel-1.1.csproj 3 Jun 2004 18:01:24 -0000 1.17 *************** *** 186,189 **** --- 186,193 ---- /> <File + RelPath = "Category.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "Child.cs" SubType = "Code" *************** *** 200,203 **** --- 204,211 ---- /> <File + RelPath = "Circular.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "ClassWithCompositeId.cs" SubType = "Code" *************** *** 365,368 **** --- 373,380 ---- /> <File + RelPath = "INameable.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "INamed.cs" SubType = "Code" *************** *** 422,425 **** --- 434,441 ---- /> <File + RelPath = "MasterDetail.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "Middle.cs" SubType = "Code" *************** *** 427,430 **** --- 443,450 ---- /> <File + RelPath = "Middle.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "MiddleKey.cs" SubType = "Code" *************** *** 447,450 **** --- 467,474 ---- /> <File + RelPath = "Multi.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "Multiplicity.cs" SubType = "Code" *************** *** 569,572 **** --- 593,600 ---- /> <File + RelPath = "SingleSeveral.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "Sortable.cs" SubType = "Code" *************** *** 649,652 **** --- 677,684 ---- /> <File + RelPath = "WZ.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "X.cs" SubType = "Code" --- NEW FILE: INameable.hbm.xml --- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="NHibernate.DomainModel.INameable, NHibernate.DomainModel" > <id name="Key" column="key_" > <generator class="native"/> </id> <discriminator column="clazz"/> <property name="Name"/> <subclass name="NHibernate.DomainModel.BasicNameable, NHibernate.DomainModel" /> </class> </hibernate-mapping> Index: B.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/B.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** B.cs 6 Apr 2004 10:51:42 -0000 1.1 --- B.cs 3 Jun 2004 18:01:24 -0000 1.2 *************** *** 72,76 **** /// Get/set for count /// </summary> ! public Int32 count { get --- 72,76 ---- /// Get/set for count /// </summary> ! public Int32 Count { get *************** *** 87,91 **** /// Get/set for map /// </summary> ! public System.Collections.IDictionary map { get --- 87,91 ---- /// Get/set for map /// </summary> ! public System.Collections.IDictionary Map { get --- NEW FILE: Circular.hbm.xml --- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0" default-cascade="save-update"> <class name="NHibernate.DomainModel.Circular, NHibernate.DomainModel" dynamic-update="true" > <id name="Id" column="id_" length="64" unsaved-value="null" > <generator class="uuid.hex"/> </id> <property name="Clazz"/> <many-to-one name="Other"/> <property name="AnyEntity"> <column name="classname"/> <column name="any_id"/> </property> </class> </hibernate-mapping> Index: ABCProxy.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABCProxy.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABCProxy.hbm.xml 7 Apr 2004 21:23:16 -0000 1.2 --- ABCProxy.hbm.xml 3 Jun 2004 18:01:24 -0000 1.3 *************** *** 3,15 **** <class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0" proxy="NHibernate.DomainModel.A, NHibernate.DomainModel"> ! <id name="id" unsaved-value="null" type="Int64"> <generator class="native" /> </id> <discriminator column="clazz" type="Int32" force="true" not-null="false" /> ! <property name="name" /> <subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="null" proxy="NHibernate.DomainModel.B, NHibernate.DomainModel"> ! <property name="count" column="count_" type="Int32" /> ! <map name="map"> <key column="BID" /> <index column="MAPKEY" type="String" /> --- 3,15 ---- <class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0" proxy="NHibernate.DomainModel.A, NHibernate.DomainModel"> ! <id name="Id" unsaved-value="null" type="Int64"> <generator class="native" /> </id> <discriminator column="clazz" type="Int32" force="true" not-null="false" /> ! <property name="Name" /> <subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="null" proxy="NHibernate.DomainModel.B, NHibernate.DomainModel"> ! <property name="Count" column="count_" type="Int32" /> ! <map name="Map"> <key column="BID" /> <index column="MAPKEY" type="String" /> *************** *** 18,27 **** <subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="1" proxy="NHibernate.DomainModel.C1, NHibernate.DomainModel"> ! <property name="address" column="c1" /> ! <one-to-one name="d" class="NHibernate.DomainModel.D, NHibernate.DomainModel" /> </subclass> <subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2" proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel"> ! <property name="address" column="c2" /> </subclass> </subclass> --- 18,27 ---- <subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="1" proxy="NHibernate.DomainModel.C1, NHibernate.DomainModel"> ! <property name="Address" column="c1" /> ! <one-to-one name="D" class="NHibernate.DomainModel.D, NHibernate.DomainModel" /> </subclass> <subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2" proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel"> ! <property name="Address" column="c2" /> </subclass> </subclass> --- NEW FILE: Multi.hbm.xml --- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="NHibernate.DomainModel.Simple, NHibernate.DomainModel" table="rootclass" dynamic-insert="true" dynamic-update="true" > <jcs-cache usage="read-write"/> <id type="Int64" column="id_" > <generator class="native"/> </id> <version name="Count" column="count_" /> <property name="Name"/> <property name="Address"/> <property name="Date" column="date_" /> <joined-subclass name="NHibernate.DomainModel.Mono, NHibernate.DomainModel" table="mono" dynamic-insert="true" dynamic-update="true" > <key column="superid"/> <set name="Strings" table="monostrings" > <key column="monoid_"/> <element type="String" column="str_" /> </set> </joined-subclass> <joined-subclass name="NHibernate.DomainModel.TrivialClass, NHibernate.DomainModel" > <key column="tcid"/> </joined-subclass> <joined-subclass name="NHibernate.DomainModel.LessSimple, NHibernate.DomainModel" table="leafsubclass" dynamic-insert="true" dynamic-update="true" > <key column="id__"/> <property name="Intprop" not-null="true" /> <one-to-one name="Other" class="NHibernate.DomainModel.LessSimple, NHibernate.DomainModel" /> <many-to-one name="Another" column="other1" class="NHibernate.DomainModel.Simple, NHibernate.DomainModel" /> <many-to-one name="Yetanother" column="other3" class="NHibernate.DomainModel.LessSimple, NHibernate.DomainModel" /> <property name="foo"/> <set name="Set" lazy="false" > <key column="parent"/> <one-to-many class="NHibernate.DomainModel.Simple, NHibernate.DomainModel"/> </set> <bag name="Bag" lazy="true" table="simple_simple" > <key column="simple1"/> <many-to-many column="simple2" class="NHibernate.DomainModel.Simple" /> </bag> <one-to-one name="Mypo"/> </joined-subclass> <joined-subclass name="NHibernate.DomainModel.Multi, NHibernate.DomainModel" table="nonleafsubclass" > <key column="sid"/> <property name="extraProp"/> <many-to-one name="Other" column="other2" class="NHibernate.DomainModel.Multi, NHibernate.DomainModel" /> <many-to-one name="Po"/> <component name="comp" class="NHibernate.DomainModel.Multi$Component, NHibernate.DomainModel" > <!-- TODO: figure out how to reflect on a nested type --> <property name="cal"/> <property name="floaty"/> </component> <joined-subclass name="NHibernate.DomainModel.SubMulti, NHibernate.DomainModel" table="leafsubsubclass" > <key column="sid"/> <property name="amount"/> <bag name="Children" lazy="true" inverse="true" > <key column="parent"/> <one-to-many class="NHibernate.DomainModel.SubMulti, NHibernate.DomainModel"/> </bag> <many-to-one name="parent"/> <list name="moreChildren" lazy="true"> <key column="another_parent"/> <index column="list_ind"/> <one-to-many class="NHibernate.DomainModel.SubMulti, NHibernate.DomainModel"/> </list> </joined-subclass> </joined-subclass> </class> <class name="NHibernate.DomainModel.Po, NHibernate.DomainModel" dynamic-insert="true" > <id type="Int64" column="id_" > <generator class="native"/> </id> <property name="Value" column="value_" /> <list name="list" cascade="all" > <key column="list_po"/> <index column="i"/> <one-to-many class="NHibernate.DomainModel.SubMulti, NHibernate.DomainModel" /> </list> <set name="Set" inverse="true" cascade="all" > <key column="po" /> <one-to-many class="NHibernate.DomainModel.Multi, NHibernate.DomainModel" /> </set> </class> </hibernate-mapping> Index: C1.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C1.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** C1.cs 8 Apr 2004 14:59:32 -0000 1.2 --- C1.cs 3 Jun 2004 18:01:24 -0000 1.3 *************** *** 74,78 **** /// Get/set for address /// </summary> ! public String address { get --- 74,78 ---- /// Get/set for address /// </summary> ! public String Address { get *************** *** 89,93 **** /// Get/set for d /// </summary> ! public D d { get --- 89,93 ---- /// Get/set for d /// </summary> ! public D D { get Index: C2.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C2.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C2.cs 6 Apr 2004 10:51:42 -0000 1.1 --- C2.cs 3 Jun 2004 18:01:24 -0000 1.2 *************** *** 67,71 **** /// Get/set for address /// </summary> ! public String address { get --- 67,71 ---- /// Get/set for address /// </summary> ! public String Address { get --- NEW FILE: MasterDetail.hbm.xml --- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="NHibernate.DomainModel.Master, NHibernate.DomainModel" > <id column="master_key" type="Int64" > <generator class="native"/> </id> <!--TODO: make sure this type has an equiv .net type--> <version type="Timestamp" name="stamp" column="ts_" /> <property name="name"/> <property name="x"/> <!-- length="5" <column name="big_dec" sql-type="DECIMAL(5,3)"/> --> <property name="BigDecimal" type="Decimal(5,3)" column="big_dec" /> <set name="Details" inverse="true" lazy="true" order-by="i asc" > <key column="master_key"/> <one-to-many class="NHibernate.DomainModel.Detail, NHibernate.DomainModel"/> </set> <set name="MoreDetails" cascade="all" lazy="true" order-by="i desc" > <key column="more_master_key"/> <one-to-many class="NHibernate.DomainModel.Detail, NHibernate.DomainModel"/> </set> <set name="Incoming" lazy="true" table="mtm" > <key column="outgoingabcdef"/> <many-to-many class="NHibernate.DomainModel.Master, NHibernate.DomainModel" column="incomingabcdef" /> </set> <set name="Outgoing" lazy="true" table="mtm" inverse="true" > <key column="incomingabcdef"/> <many-to-many class="NHibernate.DomainModel.Master, NHibernate.DomainModel" column="outgoingabcdef" /> </set> <many-to-one name="OtherMaster"/> </class> <class name="NHibernate.DomainModel.Detail, NHibernate.DomainModel" > <id column="detail_key" type="Int64" > <generator class="native"/> </id> <property name="X"> <column name="x" unique-key="uk"/> </property> <property name="I"> <column name="i" unique-key="uk"/> </property> <many-to-one name="Master"> <column name="master_key" unique-key="uk"/> </many-to-one> <set name="SubDetails" lazy="true" cascade="all" > <key column="detail_key"/> <one-to-many class="NHibernate.DomainModel.SubDetail, NHibernate.DomainModel"/> </set> </class> <class name="NHibernate.DomainModel.SubDetail, NHibernate.DomainModel" > <id column="subdetail_key" type="Int64" > <generator class="native"> <param name="sequence">fooseq</param> </generator> </id> <property name="Name"/> </class> <query name="all_details"><![CDATA[ from d in class NHibernate.DomainModel.Detail ]]></query> </hibernate-mapping> Index: Container.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Container.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Container.hbm.xml 6 Apr 2004 13:36:17 -0000 1.2 --- Container.hbm.xml 3 Jun 2004 18:01:24 -0000 1.3 *************** *** 1,88 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0" auto-import="false"> ! <import class="net.sf.hibernate.test.Container" rename="ContainerX" /> ! <import class="net.sf.hibernate.test.Contained" /> ! <import class="java.lang.Object" rename="Universe" /> ! <class name="net.sf.hibernate.test.Container" proxy="net.sf.hibernate.test.Container"> ! <id name="id" column="container_id"> <generator class="native" /> </id> ! <list name="oneToMany" lazy="true"> <key column="container_id1" /> <index column="list_index" /> ! <one-to-many class="net.sf.hibernate.test.Simple" /> </list> ! <list name="manyToMany" lazy="true"> <key column="container_id2" /> <index column="list_index" /> ! <many-to-many class="net.sf.hibernate.test.Simple" /> </list> ! <list name="components" lazy="true"> <key column="container_id" /> <index column="list_index" /> ! <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name" /> ! <property name="count" column="count_" /> ! <many-to-one name="simple" /> ! <many-to-one name="one" /> ! <many-to-one name="many" /> </composite-element> </list> ! <set name="composites" lazy="true"> <key column="container_id" /> ! <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name" /> ! <many-to-one name="simple" /> ! <many-to-one name="one" /> ! <many-to-one name="many" /> </composite-element> </set> ! <bag name="cascades" cascade="all" table="abcd"> <key column="container_id" /> ! <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name" /> ! <many-to-one name="simple" cascade="all" /> ! <many-to-one name="one" cascade="all" not-null="true" /> ! <many-to-one name="many" cascade="all" not-null="true" /> </composite-element> </bag> ! <bag name="bag" inverse="true" cascade="save-update" table="CCBAG"> <key column="container_id" /> ! <many-to-many column="contained_id" class="net.sf.hibernate.test.Contained" outer-join="true" /> </bag> ! <bag name="lazyBag" inverse="true" lazy="true" table="LCCBAG" cascade="save-update"> <!--jcs-cache usage="read-write"--> <key column="container_id" /> ! <many-to-many column="contained_id" class="net.sf.hibernate.test.Contained" /> </bag> ! <map name="ternaryMap"> <key column="container_id" /> ! <index column="idx" type="string" length="32" /> ! <composite-element class="net.sf.hibernate.test.Container$Ternary"> ! <property name="name" /> ! <many-to-one name="foo" /> ! <many-to-one name="glarch" /> </composite-element> </map> ! <set name="ternarySet"> <key column="container_id" /> ! <composite-element class="net.sf.hibernate.test.Container$Ternary"> ! <property name="name" /> ! <many-to-one name="foo" /> ! <many-to-one name="glarch" /> </composite-element> </set> </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" /> </id> ! <bag name="bag" table="CCBAG"> <key column="contained_id" /> ! <many-to-many column="container_id" class="net.sf.hibernate.test.Container" outer-join="false" /> </bag> ! <bag name="lazyBag" lazy="true" table="LCCBAG"> <key column="contained_id" /> ! <many-to-many column="container_id" class="net.sf.hibernate.test.Container" /> </bag> </class> --- 1,190 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0" auto-import="false"> ! <import ! class="NHibernate.DomainModel.Container, NHibernate.DomainModel" ! rename="ContainerX" ! /> ! <import ! class="NHibernate.DomainModel.Contained, NHibernate.DomainModel" ! /> ! <import ! class="System.Object" ! rename="Universe" ! /> ! <class ! name="NHibernate.DomainModel.Container, NHibernate.DomainModel" ! proxy="net.sf.hibernate.test.Container" ! > ! <id ! name="Id" ! column="container_id" ! > <generator class="native" /> </id> ! ! <list ! name="OneToMany" ! lazy="true" ! > <key column="container_id1" /> <index column="list_index" /> ! <one-to-many ! class="NHibernate.DomainModel.Simple, NHibernate.DomainModel" ! /> </list> ! <list ! name="ManyToMany" ! lazy="true" ! > <key column="container_id2" /> <index column="list_index" /> ! <many-to-many ! class="net.sf.hibernate.test.Simple" ! /> </list> ! <list ! name="Components" ! lazy="true" ! > <key column="container_id" /> <index column="list_index" /> ! <composite-element ! class="NHibernate.DomainModel.Container$ContainerInnerClass, NHibernate.DomainModel" ! > ! <property name="Name" /> ! <property ! name="Count" ! column="count_" ! /> ! <many-to-one name="Simple" /> ! <many-to-one name="One" /> ! <many-to-one name="Many" /> </composite-element> </list> ! <set ! name="Composites" ! lazy="true" ! > <key column="container_id" /> ! <composite-element ! class="NHibernate.DomainModel.Container$ContainerInnerClass, NHibernate.DomainModel" ! > ! <property name="Name" /> ! <many-to-one name="Simple" /> ! <many-to-one name="One" /> ! <many-to-one name="Many" /> </composite-element> </set> ! <bag ! name="Cascades" ! cascade="all" ! table="abcd" ! > <key column="container_id" /> ! <composite-element ! class="NHibernate.DomainModel.Container$ContainerInnerClass, NHibernate.DomainModel" ! > ! <property name="Name" /> ! <many-to-one ! name="Simple" ! cascade="all" ! /> ! <many-to-one ! name="One" ! cascade="all" ! not-null="true" ! /> ! <many-to-one ! name="Many" ! cascade="all" ! not-null="true" ! /> </composite-element> </bag> ! <bag ! name="Bag" ! inverse="true" ! cascade="save-update" ! table="CCBAG" ! > <key column="container_id" /> ! <many-to-many ! column="contained_id" ! class="NHibernate.DomainModel.Contained, NHibernate.DomainModel" ! outer-join="true" ! /> </bag> ! <bag ! name="LazyBag" ! inverse="true" ! lazy="true" ! table="LCCBAG" ! cascade="save-update" ! > <!--jcs-cache usage="read-write"--> <key column="container_id" /> ! <many-to-many ! column="contained_id" ! class="NHibernate.DomainModel.Contained, NHibernate.DomainModel" ! /> </bag> ! <map name="TernaryMap"> <key column="container_id" /> ! <index ! column="idx" ! type="string" ! length="32" ! /> ! <composite-element ! class="NHibernate.DomainModel.Container$Ternary, NHibernate.DomainModel" ! > ! <property name="Name" /> ! <many-to-one name="Foo" /> ! <many-to-one name="Glarch" /> </composite-element> </map> ! <set name="TernarySet"> <key column="container_id" /> ! <composite-element ! class="NHibernate.DomainModel.Container$Ternary, NHibernate.DomainModel" ! > ! <property name="Name" /> ! <many-to-one name="Foo" /> ! <many-to-one name="Glarch" /> </composite-element> </set> </class> ! <class ! name="NHibernate.DomainModel.Contained, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.Contained, NHibernate.DomainModel" ! > ! <id ! name="Id" ! column="container_id" ! unsaved-value="0" ! > <generator class="native" /> </id> ! <bag ! name="Bag" ! table="CCBAG" ! > <key column="contained_id" /> ! <many-to-many ! column="container_id" ! class="NHibernate.DomainModel.Container, NHibernate.DomainModel" ! outer-join="false" ! /> </bag> ! <bag ! name="LazyBag" ! lazy="true" ! table="LCCBAG" ! > <key column="contained_id" /> ! <many-to-many ! column="container_id" ! class="NHibernate.DomainModel.Container, NHibernate.DomainModel" ! /> </bag> </class> --- NEW FILE: SingleSeveral.hbm.xml --- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="NHibernate.DomainModel.Single, NHibernate.DomainModel" > <composite-id> <key-property name="Id" length="32" /> <key-property name="String" length="32" column="string_" /> </composite-id> <property name="Prop"/> <bag name="Several" inverse="true" lazy="false" cascade="all" > <!--important: test for bidirectional with lazy="false" --> <key> <column name="single_id" not-null="true" /> <column name="single_string" not-null="true" /> </key> <one-to-many class="NHibernate.DomainModel.Several, NHibernate.DomainModel" /> </bag> </class> <class name="NHibernate.DomainModel.Several, NHibernate.DomainModel" > <composite-id unsaved-value="any" > <key-property name="Id" length="32" /> <key-property name="String" length="32" column="string_" /> </composite-id> <many-to-one name="single" > <column name="single_id" length="32" /> <column name="single_string" length="32" /> </many-to-one> </class> </hibernate-mapping> Index: Bar.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Bar.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Bar.cs 2 Jun 2004 04:53:24 -0000 1.2 --- Bar.cs 3 Jun 2004 18:01:24 -0000 1.3 *************** *** 4,15 **** namespace NHibernate.DomainModel { - public class Bar : Abstract, BarProxy { - - /// <summary> - /// Holds the _x - /// </summary> private int _x; /// <summary> --- 4,16 ---- namespace NHibernate.DomainModel { public class Bar : Abstract, BarProxy { private int _x; + private string _barString; + private FooComponent _barComponent = new FooComponent("bar", 69, null, null); + private Baz _baz; + private string _name = "bar"; + private object _object; + /// <summary> *************** *** 18,35 **** public int X { ! get ! { ! return _x; ! } ! set ! { ! _x = value; ! } } - - /// <summary> - /// Holds the _barString - /// </summary> - private string _barString; /// <summary> --- 19,25 ---- public int X { ! get { return _x; } ! set { _x = value; } } /// <summary> *************** *** 38,56 **** public string BarString { ! get ! { ! return _barString; ! } ! set ! { ! _barString = value; ! } } ! /// <summary> ! /// Holds the _barComponent ! /// </summary> ! private FooComponent _barComponent = new FooComponent("bar", 69, null, null); ! /// <summary> /// Gets or sets the _barComponent --- 28,36 ---- public string BarString { ! get { return _barString; } ! set { _barString = value; } } ! /// <summary> /// Gets or sets the _barComponent *************** *** 58,76 **** public FooComponent BarComponent { ! get ! { ! return _barComponent; ! } ! set ! { ! _barComponent = value; ! } } ! /// <summary> ! /// Holds the _baz ! /// </summary> ! private Baz _baz; ! /// <summary> /// Gets or sets the _baz --- 38,46 ---- public FooComponent BarComponent { ! get { return _barComponent; } ! set { _barComponent = value; } } ! /// <summary> /// Gets or sets the _baz *************** *** 78,96 **** public Baz Baz { ! get ! { ! return _baz; ! } ! set ! { ! _baz = value; ! } } ! /// <summary> ! /// Holds the _name ! /// </summary> ! private string _name = "bar"; ! /// <summary> /// Gets or sets the _name --- 48,56 ---- public Baz Baz { ! get { return _baz; } ! set { _baz = value; } } ! /// <summary> /// Gets or sets the _name *************** *** 98,116 **** public string Name { ! get ! { ! return _name; ! } ! set ! { ! _name = value; ! } } ! /// <summary> ! /// Holds the _object ! /// </summary> ! private object _object; ! /// <summary> /// Gets or sets the _object --- 58,66 ---- public string Name { ! get { return _name; } ! set { _name = value; } } ! /// <summary> /// Gets or sets the _object *************** *** 118,129 **** public object Object { ! get ! { ! return _object; ! } ! set ! { ! _object = value; ! } } } --- 68,73 ---- public object Object { ! get { return _object; } ! set { _object = value; } } } Index: ABC.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABC.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ABC.hbm.xml 7 Apr 2004 21:23:16 -0000 1.3 --- ABC.hbm.xml 3 Jun 2004 18:01:24 -0000 1.4 *************** *** 1,27 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0"> ! <id name="id" unsaved-value="null"> <generator class="native" /> </id> ! <discriminator column="clazz" type="Int32" not-null="false" /> ! <property name="name" /> ! <subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="-1"> ! <property name="count" column="count_" type="Int32" /> ! <subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="null"> ! <property name="address" column="c1" /> ! <one-to-one name="d" class="NHibernate.DomainModel.D, NHibernate.DomainModel" /> </subclass> ! <subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2"> ! <property name="address" column="c2" /> </subclass> </subclass> </class> ! <class name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" ! proxy="NHibernate.DomainModel.D, NHibernate.DomainModel"> ! <id name="id" unsaved-value="null"> <generator class="assigned" /> </id> ! <property name="amount" type="Double" /> </class> </hibernate-mapping> \ No newline at end of file --- 1,72 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.A, NHibernate.DomainModel" ! discriminator-value="0" ! > ! <id ! name="Id" ! unsaved-value="null" ! > <generator class="native" /> </id> ! ! <discriminator ! column="clazz" ! type="Int32" ! not-null="false" ! /> ! ! <property name="Name" /> ! ! <subclass ! name="NHibernate.DomainModel.B, NHibernate.DomainModel" ! discriminator-value="-1" ! > ! <property ! name="Count" ! column="count_" ! type="Int32" ! /> ! ! <subclass ! name="NHibernate.DomainModel.C1, NHibernate.DomainModel" ! discriminator-value="null" ! > ! <property ! name="Address" ! column="c1" ! /> ! <one-to-one ! name="D" ! class="NHibernate.DomainModel.D, NHibernate.DomainModel" ! /> </subclass> ! <subclass ! name="NHibernate.DomainModel.C2, NHibernate.DomainModel" ! discriminator-value="2" ! > ! <property ! name="Address" ! column="c2" ! /> </subclass> </subclass> </class> ! <class ! name="NHibernate.DomainModel.D, NHibernate.DomainModel" ! discriminator-value="0" ! proxy="NHibernate.DomainModel.D, NHibernate.DomainModel" ! > ! <id ! name="id" ! unsaved-value="null" ! > <generator class="assigned" /> </id> ! <property ! name="amount" ! type="Double" ! /> </class> </hibernate-mapping> \ No newline at end of file --- NEW FILE: Middle.hbm.xml --- <?xml version="1.0" encoding="UTF-8"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="NHibernate.DomainModel.Inner, NHibernate.DomainModel" table="CID_IN" > <composite-id name="Id"> <key-property name="akey" type="String(10)" length="10" column="AKEY" /> <key-property name="bkey" type="String(10)" length="10" column="BKEY" /> </composite-id> <property name="Dudu" length="10" column="DUDU" not-null="true" type="String(10)" /> </class> <class name="NHibernate.DomainModel.Middle, NHibernate.DomainModel" table="CID_MID" > <composite-id name="Id"> <key-many-to-one name="sup"> <column length="10" name="AKEY" /> <column length="10" name="BKEY" /> </key-many-to-one> <key-property name="One" type="String(10)" length="10" column="ONE" /> <key-property name="Two" type="String(10)" length="10" column="TWO" /> </composite-id> <property column="BLA" length="10" name="Bla" not-null="true" type="String(10)" /> </class> <class name="NHibernate.DomainModel.Outer, NHibernate.DomainModel" table="CID_OUT" > <composite-id name="Id"> <key-many-to-one name="master"> <column name="AKEY"/> <column name="BKEY"/> <column name="ONE"/> <column name="TWO"/> </key-many-to-one> <key-property name="detailId" type="String(10)" column="ID" length="10" /> </composite-id> <property name="Bubu" column="BUBU" length="10" type="String(10)" /> </class> </hibernate-mapping> Index: A.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/A.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** A.cs 6 Apr 2004 10:51:42 -0000 1.1 --- A.cs 3 Jun 2004 18:01:24 -0000 1.2 *************** *** 1,11 **** - //------------------------------------------------------------------------------ - // <autogenerated> - // This code was generated by a tool. - // Runtime Version: v1.1.4322 - // - // Changes to this file may cause incorrect behavior and will be lost if - // the code is regenerated. - // </autogenerated> - //------------------------------------------------------------------------------ using System; --- 1,2 ---- *************** *** 15,23 **** /// <summary> ! /// POJO for A /// </summary> - /// <remark> - /// This class is autogenerated - /// </remark> [Serializable] public class A --- 6,11 ---- /// <summary> ! /// POCO for A /// </summary> [Serializable] public class A *************** *** 60,64 **** /// Get/set for id /// </summary> ! public Int64 id { get --- 48,52 ---- /// Get/set for id /// </summary> ! public Int64 Id { get *************** *** 75,79 **** /// Get/set for name /// </summary> ! public String name { get --- 63,67 ---- /// Get/set for name /// </summary> ! public String Name { get --- NEW FILE: Category.hbm.xml --- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="NHibernate.DomainModel.Category, NHibernate.DomainModel" table="category" dynamic-update="true" dynamic-insert="true" > <id name="Id" unsaved-value="0" > <generator class="native"/> </id> <list name="Subcategories" lazy="true" cascade="all" > <key column="parent"/> <index column="ord"/> <one-to-many class="NHibernate.DomainModel.Category, NHibernate.DomainModel"/> </list> <property name="Name"/> <many-to-one name="Assignable" column="`assign able id`" /> </class> <class name="NHibernate.DomainModel.Assignable, NHibernate.DomainModel" table="`assign able`" > <id name="Id"> <generator class="assigned"/> </id> <bag name="Categories" inverse="true" cascade="all" > <key column="`assign able id`"/> <one-to-many class="NHibernate.DomainModel.Category, NHibernate.DomainModel"/> </bag> </class> </hibernate-mapping> --- NEW FILE: WZ.hbm.xml --- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="NHibernate.DomainModel.Z, NHibernate.DomainModel" > <id name="Id" unsaved-value="0"> <generator class="hilo"/> </id> <many-to-one name="W" class="NHibernate.DomainModel.W, NHibernate.DomainModel" cascade="save-update" insert="true" update="false" not-null="true" /> </class> <class name="NHibernate.DomainModel.W, NHibernate.DomainModel" discriminator-value="0" proxy="NHibernate.DomainModel.Z, NHibernate.DomainModel" > <id name="Id" unsaved-value="0"> <generator class="hilo"/> </id> <!-- This was commented out in the H2.0.3 test... <set name="zeds" lazy="true"> <key column="w"/> <one-to-many class="net.sf.hibernate.test.Z"/> </set> --> </class> </hibernate-mapping> |
