Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel B.cs,1.2,1.3 Baz.cs,1.6,1.7 Baz.hbm.xml,1.9,1.10
|
From: Michael D. <mik...@us...> - 2004-06-04 12:02:55
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23194/NHibernate.DomainModel Modified Files: B.cs Baz.cs Baz.hbm.xml Log Message: Continued to work on the Domain Model and hbms for testing. Index: Baz.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Baz.cs 3 Jun 2004 18:01:24 -0000 1.6 --- Baz.cs 4 Jun 2004 12:02:44 -0000 1.7 *************** *** 16,273 **** { - /// <summary> - /// Holds the _collectionComponent - /// </summary> - private NestingComponent _collectionComponent; - - /// <summary> - /// Gets or sets the _collectionComponent - /// </summary> - public NestingComponent collectionComponent - { - get - { - return _collectionComponent; - } - set - { - _collectionComponent = value; - } - } - #region Fields ! /// <summary> ! /// Holder for code ! /// </summary> private String _code; ! ! ! /// <summary> ! /// Holds the _timeArray ! /// </summary> ! private DateTime[] _timeArray; ! ! /// <summary> ! /// Gets or sets the _timeArray ! /// </summary> ! public DateTime[] timeArray ! { ! get ! { ! return _timeArray; ! } ! set ! { ! _timeArray = value; ! } ! } ! /// <summary> ! /// Holds the _components ! /// </summary> ! private FooComponent[] _components; ! ! /// <summary> ! /// Gets or sets the _components ! /// </summary> ! public FooComponent[] components ! { ! get ! { ! return _components; ! } ! set ! { ! _components = value; ! } ! } ! /// <summary> ! /// Holds the stringArray ! /// </summary> ! private string[] _stringArray; ! ! /// <summary> ! /// Gets or sets the stringArray ! /// </summary> ! public string[] stringArray ! { ! get ! { ! return _stringArray; ! } ! set ! { ! _stringArray = value; ! } ! } ! ! /// <summary> ! /// Holds the intArray ! /// </summary> ! private int[] _intArray; ! ! /// <summary> ! /// Gets or sets the intArray ! /// </summary> ! public int[] intArray ! { ! get ! { ! return _intArray; ! } ! set ! { ! _intArray = value; ! } ! } ! /// <summary> ! /// Holds the fooArray ! /// </summary> ! private FooProxy[] _fooArray; ! ! /// <summary> ! /// Gets or sets the fooArray ! /// </summary> ! public FooProxy[] fooArray ! { ! get ! { ! return _fooArray; ! } ! set ! { ! _fooArray = value; ! } ! } ! ! /// <summary> ! /// Holder for count ! /// </summary> private Int32 _count; - - /// <summary> - /// Holder for name - /// </summary> private String _name; - - /// <summary> - /// Holder for foo - /// </summary> private Foo _foo; - - /// <summary> - /// Holder for stringList - /// </summary> private System.Collections.IList _stringList; - - /// <summary> - /// Holder for fees - /// </summary> private System.Collections.IList _fees; - - /// <summary> - /// Holder for customs - /// </summary> private System.Collections.IList _customs; - - /// <summary> - /// Holder for topComponents - /// </summary> private System.Collections.IList _topComponents; - - /// <summary> - /// Holder for fooToGlarch - /// </summary> private System.Collections.IDictionary _fooToGlarch; - - /// <summary> - /// Holder for fooComponentToFoo - /// </summary> private System.Collections.IDictionary _fooComponentToFoo; - - /// <summary> - /// Holder for glarchToFoo - /// </summary> private System.Collections.IDictionary _glarchToFoo; - - /// <summary> - /// Holder for stringDateMap - /// </summary> private System.Collections.IDictionary _stringDateMap; - - /// <summary> - /// Holder for topGlarchez - /// </summary> private System.Collections.IDictionary _topGlarchez; - - /// <summary> - /// Holder for cachedMap - /// </summary> private System.Collections.IDictionary _cachedMap; - - /// <summary> - /// Holder for stringGlarchMap - /// </summary> private System.Collections.IDictionary _stringGlarchMap; - - /// <summary> - /// Holder for anyToAny - /// </summary> private System.Collections.IDictionary _anyToAny; - - /// <summary> - /// Holder for fooSet - /// </summary> private System.Collections.IDictionary _fooSet; - - /// <summary> - /// Holder for stringSet - /// </summary> private System.Collections.IDictionary _stringSet; - - /// <summary> - /// Holder for topFoos - /// </summary> private System.Collections.IDictionary _topFoos; - - /// <summary> - /// Holder for cascadingBars - /// </summary> private System.Collections.IDictionary _cascadingBars; - - /// <summary> - /// Holder for cached - /// </summary> private System.Collections.IDictionary _cached; - - /// <summary> - /// Holder for sortablez - /// </summary> private System.Collections.IDictionary _sortablez; - - /// <summary> - /// Holder for bag - /// </summary> private System.Collections.IList _bag; - - /// <summary> - /// Holder for fooBag - /// </summary> private System.Collections.IList _fooBag; - - /// <summary> - /// Holder for bazez - /// </summary> private System.Collections.IList _bazez; - - /// <summary> - /// Holder for idFooBag - /// </summary> private System.Collections.IList _idFooBag; - - /// <summary> - /// Holder for byteBag - /// </summary> private System.Collections.IList _byteBag; ! #endregion --- 16,55 ---- { #region Fields ! ! private NestingComponent _collectionComponent; private String _code; ! private DateTime[] _timeArray; ! private FooComponent[] _components; ! private string[] _stringArray; ! private int[] _intArray; ! private FooProxy[] _fooArray; private Int32 _count; private String _name; private Foo _foo; private System.Collections.IList _stringList; private System.Collections.IList _fees; private System.Collections.IList _customs; private System.Collections.IList _topComponents; private System.Collections.IDictionary _fooToGlarch; private System.Collections.IDictionary _fooComponentToFoo; private System.Collections.IDictionary _glarchToFoo; private System.Collections.IDictionary _stringDateMap; private System.Collections.IDictionary _topGlarchez; private System.Collections.IDictionary _cachedMap; private System.Collections.IDictionary _stringGlarchMap; private System.Collections.IDictionary _anyToAny; private System.Collections.IDictionary _fooSet; private System.Collections.IDictionary _stringSet; private System.Collections.IDictionary _topFoos; private System.Collections.IDictionary _cascadingBars; private System.Collections.IDictionary _cached; private System.Collections.IDictionary _sortablez; private System.Collections.IList _bag; private System.Collections.IList _fooBag; private System.Collections.IList _bazez; private System.Collections.IList _idFooBag; private System.Collections.IList _byteBag; ! #endregion *************** *** 284,291 **** #region Properties /// <summary> ! /// Get/set for code /// </summary> ! public String code { get --- 66,89 ---- #region Properties + + /// <summary> + /// Gets or sets the _collectionComponent + /// </summary> + public NestingComponent CollectionComponent + { + get + { + return _collectionComponent; + } + set + { + _collectionComponent = value; + } + } + /// <summary> ! /// Get/set for Code /// </summary> ! public String Code { get *************** *** 302,306 **** /// Get/set for count /// </summary> ! public Int32 count { get --- 100,104 ---- /// Get/set for count /// </summary> ! public Int32 Count { get *************** *** 317,321 **** /// Get/set for name /// </summary> ! public String name { get --- 115,119 ---- /// Get/set for name /// </summary> ! public String Name { get *************** *** 330,336 **** /// <summary> ! /// Get/set for foo /// </summary> ! public Foo foo { get --- 128,134 ---- /// <summary> ! /// Get/set for Foo /// </summary> ! public Foo Foo { get *************** *** 347,351 **** /// Get/set for stringList /// </summary> ! public System.Collections.IList stringList { get --- 145,149 ---- /// Get/set for stringList /// </summary> ! public System.Collections.IList StringList { get *************** *** 362,366 **** /// Get/set for fees /// </summary> ! public System.Collections.IList fees { get --- 160,164 ---- /// Get/set for fees /// </summary> ! public System.Collections.IList Fees { get *************** *** 377,381 **** /// Get/set for customs /// </summary> ! public System.Collections.IList customs { get --- 175,179 ---- /// Get/set for customs /// </summary> ! public System.Collections.IList Customs { get *************** *** 392,396 **** /// Get/set for topComponents /// </summary> ! public System.Collections.IList topComponents { get --- 190,194 ---- /// Get/set for topComponents /// </summary> ! public System.Collections.IList TopComponents { get *************** *** 407,411 **** /// Get/set for fooToGlarch /// </summary> ! public System.Collections.IDictionary fooToGlarch { get --- 205,209 ---- /// Get/set for fooToGlarch /// </summary> ! public System.Collections.IDictionary FooToGlarch { get *************** *** 422,426 **** /// Get/set for fooComponentToFoo /// </summary> ! public System.Collections.IDictionary fooComponentToFoo { get --- 220,224 ---- /// Get/set for fooComponentToFoo /// </summary> ! public System.Collections.IDictionary FooComponentToFoo { get *************** *** 437,441 **** /// Get/set for glarchToFoo /// </summary> ! public System.Collections.IDictionary glarchToFoo { get --- 235,239 ---- /// Get/set for glarchToFoo /// </summary> ! public System.Collections.IDictionary GlarchToFoo { get *************** *** 452,456 **** /// Get/set for stringDateMap /// </summary> ! public System.Collections.IDictionary stringDateMap { get --- 250,254 ---- /// Get/set for stringDateMap /// </summary> ! public System.Collections.IDictionary StringDateMap { get *************** *** 467,471 **** /// Get/set for topGlarchez /// </summary> ! public System.Collections.IDictionary topGlarchez { get --- 265,269 ---- /// Get/set for topGlarchez /// </summary> ! public System.Collections.IDictionary TopGlarchez { get *************** *** 482,486 **** /// Get/set for cachedMap /// </summary> ! public System.Collections.IDictionary cachedMap { get --- 280,284 ---- /// Get/set for cachedMap /// </summary> ! public System.Collections.IDictionary CachedMap { get *************** *** 497,501 **** /// Get/set for stringGlarchMap /// </summary> ! public System.Collections.IDictionary stringGlarchMap { get --- 295,299 ---- /// Get/set for stringGlarchMap /// </summary> ! public System.Collections.IDictionary StringGlarchMap { get *************** *** 512,516 **** /// Get/set for anyToAny /// </summary> ! public System.Collections.IDictionary anyToAny { get --- 310,314 ---- /// Get/set for anyToAny /// </summary> ! public System.Collections.IDictionary AnyToAny { get *************** *** 523,531 **** } } /// <summary> /// Get/set for fooSet /// </summary> ! public System.Collections.IDictionary fooSet { get --- 321,392 ---- } } + + /// <summary> + /// Gets or sets the intArray + /// </summary> + public int[] IntArray + { + get + { + return _intArray; + } + set + { + _intArray = value; + } + } + + /// <summary> + /// Gets or sets the _components + /// </summary> + public FooComponent[] Components + { + get + { + return _components; + } + set + { + _components = value; + } + } + + /// <summary> + /// Gets or sets the stringArray + /// </summary> + public string[] StringArray + { + get + { + return _stringArray; + } + set + { + _stringArray = value; + } + } + + /// <summary> + /// Gets or sets the fooArray + /// </summary> + public FooProxy[] FooArray + { + get + { + return _fooArray; + } + set + { + _fooArray = value; + } + } + + + /// <summary> /// Get/set for fooSet /// </summary> ! public System.Collections.IDictionary FooSet { get *************** *** 539,546 **** } /// <summary> /// Get/set for stringSet /// </summary> ! public System.Collections.IDictionary stringSet { get --- 400,422 ---- } + /// <summary> + /// Gets or sets the _timeArray + /// </summary> + public DateTime[] TimeArray + { + get + { + return _timeArray; + } + set + { + _timeArray = value; + } + } + /// <summary> /// Get/set for stringSet /// </summary> ! public System.Collections.IDictionary StringSet { get *************** *** 557,561 **** /// Get/set for topFoos /// </summary> ! public System.Collections.IDictionary topFoos { get --- 433,437 ---- /// Get/set for topFoos /// </summary> ! public System.Collections.IDictionary TopFoos { get *************** *** 572,576 **** /// Get/set for cascadingBars /// </summary> ! public System.Collections.IDictionary cascadingBars { get --- 448,452 ---- /// Get/set for cascadingBars /// </summary> ! public System.Collections.IDictionary CascadingBars { get *************** *** 587,591 **** /// Get/set for cached /// </summary> ! public System.Collections.IDictionary cached { get --- 463,467 ---- /// Get/set for cached /// </summary> ! public System.Collections.IDictionary Cached { get *************** *** 602,606 **** /// Get/set for sortablez /// </summary> ! public System.Collections.IDictionary sortablez { get --- 478,482 ---- /// Get/set for sortablez /// </summary> ! public System.Collections.IDictionary Sortablez { get *************** *** 617,621 **** /// Get/set for bag /// </summary> ! public System.Collections.IList bag { get --- 493,497 ---- /// Get/set for bag /// </summary> ! public System.Collections.IList Bag { get *************** *** 632,636 **** /// Get/set for fooBag /// </summary> ! public System.Collections.IList fooBag { get --- 508,512 ---- /// Get/set for fooBag /// </summary> ! public System.Collections.IList FooBag { get *************** *** 647,651 **** /// Get/set for bazez /// </summary> ! public System.Collections.IList bazez { get --- 523,527 ---- /// Get/set for bazez /// </summary> ! public System.Collections.IList Bazez { get *************** *** 662,666 **** /// Get/set for idFooBag /// </summary> ! public System.Collections.IList idFooBag { get --- 538,542 ---- /// Get/set for idFooBag /// </summary> ! public System.Collections.IList IdFooBag { get *************** *** 677,681 **** /// Get/set for byteBag /// </summary> ! public System.Collections.IList byteBag { get --- 553,557 ---- /// Get/set for byteBag /// </summary> ! public System.Collections.IList ByteBag { get *************** *** 691,736 **** #endregion ! public void setDefaults() { ! stringSet = new Hashtable(); ! stringSet.Add("foo", new object()); ! stringSet.Add("bar", new object()); ! stringSet.Add("baz", new object()); ! stringDateMap = new SortedList(); ! stringDateMap.Add( "now", DateTime.Now ); ! stringDateMap.Add( "never", null ); ! stringDateMap.Add( "big bang", new DateTime(0) ); ArrayList list = new ArrayList(); ! list.AddRange(stringSet.Keys); ! stringList = list; ! intArray = new int[] { 1,3,3,7 }; ! fooArray =new Foo[0]; ! stringArray = (String[]) list.ToArray(typeof(string) ); ! customs = new ArrayList(); ! customs.Add( new String[] { "foo", "bar" } ); ! customs.Add( new String[] { "A", "B" } ); ! customs.Add( new String[] { "1", "2" } ); ! fooSet = new Hashtable(); ! components = new FooComponent[] { new FooComponent("foo", 42, null, null), new FooComponent("bar", 88, null, new FooComponent("sub", 69, null, null) ) }; ! timeArray = new DateTime[] { new DateTime(), new DateTime(), DateTime.MinValue, new DateTime(0) }; ! count = 667; ! name="Bazza"; ! topComponents = new ArrayList(); ! topComponents.Add( new FooComponent("foo", 11, new DateTime[] { new DateTime(), new DateTime(2123,1,1) }, null) ); ! topComponents.Add( new FooComponent("bar", 22, new DateTime[] { new DateTime(2007,2,3), new DateTime(1945,6,1) }, null) ); ! topComponents.Add( null ); ! bag = new ArrayList(); ! bag.Add("duplicate"); ! bag.Add("duplicate"); ! bag.Add("duplicate"); ! bag.Add("unique"); ! cached = new SortedList(); CompositeElement ce = new CompositeElement(); --- 567,612 ---- #endregion ! public void SetDefaults() { ! StringSet = new Hashtable(); ! StringSet.Add("foo", new object()); ! StringSet.Add("bar", new object()); ! StringSet.Add("baz", new object()); ! StringDateMap = new SortedList(); ! StringDateMap.Add( "now", DateTime.Now ); ! StringDateMap.Add( "never", null ); ! StringDateMap.Add( "big bang", new DateTime(0) ); ArrayList list = new ArrayList(); ! list.AddRange(StringSet.Keys); ! StringList = list; ! IntArray = new int[] { 1,3,3,7 }; ! FooArray =new Foo[0]; ! StringArray = (String[]) list.ToArray(typeof(string) ); ! Customs = new ArrayList(); ! Customs.Add( new String[] { "foo", "bar" } ); ! Customs.Add( new String[] { "A", "B" } ); ! Customs.Add( new String[] { "1", "2" } ); ! FooSet = new Hashtable(); ! Components = new FooComponent[] { new FooComponent("foo", 42, null, null), new FooComponent("bar", 88, null, new FooComponent("sub", 69, null, null) ) }; ! TimeArray = new DateTime[] { new DateTime(), new DateTime(), DateTime.MinValue, new DateTime(0) }; ! Count = 667; ! Name="Bazza"; ! TopComponents = new ArrayList(); ! TopComponents.Add( new FooComponent("foo", 11, new DateTime[] { new DateTime(), new DateTime(2123,1,1) }, null) ); ! TopComponents.Add( new FooComponent("bar", 22, new DateTime[] { new DateTime(2007,2,3), new DateTime(1945,6,1) }, null) ); ! TopComponents.Add( null ); ! Bag = new ArrayList(); ! Bag.Add("duplicate"); ! Bag.Add("duplicate"); ! Bag.Add("duplicate"); ! Bag.Add("unique"); ! Cached = new SortedList(); CompositeElement ce = new CompositeElement(); *************** *** 740,747 **** ce2.foo = "fooxxx"; ce2.bar = "barxxx"; ! cached.Add(ce, new object()); ! cached.Add(ce2, new object()); ! cachedMap = new SortedList(); ! cachedMap.Add(this, ce); } #region IComparable Members --- 616,623 ---- ce2.foo = "fooxxx"; ce2.bar = "barxxx"; ! Cached.Add(ce, new object()); ! Cached.Add(ce2, new object()); ! CachedMap = new SortedList(); ! CachedMap.Add(this, ce); } #region IComparable Members *************** *** 749,753 **** public int CompareTo(object obj) { ! return ( (Baz) obj ).code.CompareTo(code); } --- 625,629 ---- public int CompareTo(object obj) { ! return ( (Baz) obj ).Code.CompareTo(Code); } Index: Baz.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Baz.hbm.xml 3 Jun 2004 13:31:52 -0000 1.9 --- Baz.hbm.xml 4 Jun 2004 12:02:44 -0000 1.10 *************** *** 1,46 **** <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! ! <class name="NHibernate.DomainModel.Baz, NHibernate.DomainModel" table="`baz baz baz`"> ! <id name="code" type="String"> ! <column name="baz_id" length="32"/> <generator class="uuid.hex"/> </id> ! <property name="count" column="count_count" type="Int32"/> ! <property name="name" column="name_b"/> ! <many-to-one name="foo" outer-join="true" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/> ! <list name="stringList" table="string_list"> <key> ! <column name="id" length="16"/> </key> <index column="`i`"/> ! <element column="element" type="String"/> </list> ! <primitive-array name="intArray" table="int_array"> <key> ! <column name="id" length="16"/> </key> <index column="i"/> ! <element column="j" type="Int32"/> </primitive-array> ! <set name="fooSet" lazy="true" order-by="string_"> <key> ! <column name="baz_id" length="16"/> </key> ! <one-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/> </set> ! <array name="components" table="bazcomponents"> <key> ! <column name="baz_id" length="16"/> </key> <index column="i"/> ! <composite-element class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> <parent name="baz"/> <property name="name"> ! <column name="name" length="56"/> </property> ! <property name="count" column="count_" type="Int32"/> ! <nested-composite-element name="subcomponent" class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> <property name="name" column="x_"/> <property name="count" column="y_" type="Int32"/> --- 1,110 ---- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.Baz, NHibernate.DomainModel" ! table="`baz baz baz`" ! > ! <id ! name="Code" ! type="String" ! > ! <column ! name="baz_id" ! length="32" ! /> <generator class="uuid.hex"/> </id> ! <property ! name="Count" ! column="count_count" ! type="Int32" ! /> ! <property ! name="Name" ! column="name_b" ! /> ! <many-to-one ! name="Foo" ! outer-join="true" ! class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! /> ! <list ! name="StringList" ! table="string_list" ! > <key> ! <column ! name="id" ! length="16" ! /> </key> <index column="`i`"/> ! <element ! column="element" ! type="String" ! /> </list> ! <primitive-array ! name="IntArray" ! table="int_array" ! > <key> ! <column ! name="id" ! length="16" ! /> </key> <index column="i"/> ! <element ! column="j" ! type="Int32" ! /> </primitive-array> ! <set ! name="FooSet" ! lazy="true" ! order-by="string_" ! > <key> ! <column ! name="baz_id" ! length="16" ! /> </key> ! <one-to-many ! class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! /> </set> ! <array ! name="Components" ! table="bazcomponents" ! > <key> ! <column ! name="baz_id" ! length="16" ! /> </key> <index column="i"/> ! <composite-element ! class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel" ! > <parent name="baz"/> <property name="name"> ! <column ! name="name" ! length="56" ! /> </property> ! <property ! name="count" ! column="count_" ! type="Int32" ! /> ! <nested-composite-element ! name="subcomponent" ! class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel" ! > <property name="name" column="x_"/> <property name="count" column="y_" type="Int32"/> *************** *** 48,83 **** </composite-element> </array> ! <array name="timeArray"> <key> ! <column name="baz_id" length="16"/> </key> <index column="j"/> ! <element column="the_time" type="Time"/> </array> ! <bag name="bag" order-by="`name!`" table="`$%^^b'a'g`"> <key> ! <column name="`baz_id@#$`" length="16"/> </key> ! <element column="`name!`" type="String"/> </bag> ! <map name="fooToGlarch"> <key> ! <column name="baz_id" length="16"/> </key> ! <index-many-to-many column="foo_id" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/> ! <many-to-many column="glarch_id" class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel"/> </map> ! <map name="fooComponentToFoo"> <jcs-cache usage="read-write"/> <key> ! <column name="baz_id" length="16"/> </key> ! <composite-index class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> ! <key-property name="name" length="32"/> ! <key-property name="count" column="count_" type="Int32"/> </composite-index> ! <many-to-many column="foo_id" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" outer-join="true"/> </map> ! <map name="glarchToFoo"> <key> <column name="gtf_baz_id" length="16"/> --- 112,188 ---- </composite-element> </array> ! <array name="TimeArray"> <key> ! <column ! name="baz_id" ! length="16" ! /> </key> <index column="j"/> ! <element ! column="the_time" ! type="Time" ! /> </array> ! <bag ! name="Bag" ! order-by="`name!`" ! table="`$%^^b'a'g`" ! > <key> ! <column ! name="`baz_id@#$`" ! length="16" ! /> </key> ! <element ! column="`name!`" ! type="String" ! /> </bag> ! <map name="FooToGlarch"> <key> ! <column ! name="baz_id" ! length="16" ! /> </key> ! <index-many-to-many ! column="foo_id" ! class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! /> ! <many-to-many ! column="glarch_id" ! class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" ! /> </map> ! <map name="FooComponentToFoo"> <jcs-cache usage="read-write"/> <key> ! <column ! name="baz_id" ! length="16" ! /> </key> ! <composite-index ! class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel" ! > ! <key-property ! name="name" ! length="32" ! /> ! <key-property ! name="count" ! column="count_" ! type="Int32" ! /> </composite-index> ! <many-to-many ! column="foo_id" ! class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! outer-join="true" ! /> </map> ! <map name="GlarchToFoo"> <key> <column name="gtf_baz_id" length="16"/> *************** *** 87,91 **** </map> ! <set name="stringSet" lazy="true" sort="NHibernate.DomainModel.StringComparator, NHibernate.DomainModel"> <!--<jcs-cache usage="read-write"/>--> <key column="id_"/> --- 192,196 ---- </map> ! <set name="StringSet" lazy="true" sort="NHibernate.DomainModel.StringComparator, NHibernate.DomainModel"> <!--<jcs-cache usage="read-write"/>--> <key column="id_"/> *************** *** 93,97 **** </set> ! <map name="stringDateMap" lazy="true" sort="NHibernate.DomainModel.ReverseComparator, NHibernate.DomainModel"> <key column="id_"/> <index column="map_key" type="String" length="32"/> --- 198,202 ---- </set> ! <map name="StringDateMap" lazy="true" sort="NHibernate.DomainModel.ReverseComparator, NHibernate.DomainModel"> <key column="id_"/> <index column="map_key" type="String" length="32"/> *************** *** 99,103 **** </map> ! <array name="fooArray" element-class="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" where="i<8"> <jcs-cache usage="read-write"/> <key column="id_"/> --- 204,208 ---- </map> ! <array name="FooArray" element-class="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" where="i<8"> <jcs-cache usage="read-write"/> <key column="id_"/> *************** *** 108,117 **** </array> ! <bag name="fooBag" lazy="true" table="baz_foo" cascade="all" inverse="false"> <key column="baz"/> <many-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" column="foo" outer-join="true"/> </bag> ! <idbag name="idFooBag" lazy="true" table="baz_id_foo" cascade="all"> <collection-id column="pkid" type="Int64"> <generator class="hilo"/> --- 213,222 ---- </array> ! <bag name="FooBag" lazy="true" table="baz_foo" cascade="all" inverse="false"> <key column="baz"/> <many-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" column="foo" outer-join="true"/> </bag> ! <idbag name="IdFooBag" lazy="true" table="baz_id_foo" cascade="all"> <collection-id column="pkid" type="Int64"> <generator class="hilo"/> *************** *** 121,125 **** </idbag> ! <idbag name="byteBag" lazy="true" table="baz_byte_bag" cascade="all"> <collection-id column="pkid" type="Int64"> <generator class="hilo"/> --- 226,230 ---- </idbag> ! <idbag name="ByteBag" lazy="true" table="baz_byte_bag" cascade="all"> <collection-id column="pkid" type="Int64"> <generator class="hilo"/> *************** *** 129,133 **** </idbag> ! <array name="stringArray"> <key column="id_"/> <index column="i"/> --- 234,238 ---- </idbag> ! <array name="StringArray"> <key column="id_"/> <index column="i"/> *************** *** 135,139 **** </array> ! <list name="fees" lazy="true" cascade="all"> <key column="bazid"/> <index column="bazind"/> --- 240,244 ---- </array> ! <list name="Fees" lazy="true" cascade="all"> <key column="bazid"/> <index column="bazind"/> *************** *** 141,145 **** </list> ! <list name="customs"> <key column="id_"/> <index column="indx"/> --- 246,250 ---- </list> ! <list name="Customs"> <key column="id_"/> <index column="indx"/> *************** *** 150,154 **** </list> ! <list name="topComponents" table="topcomponents"> <jcs-cache usage="read-write"/> <key column="id_"/> --- 255,259 ---- </list> ! <list name="TopComponents" table="topcomponents"> <jcs-cache usage="read-write"/> <key column="id_"/> *************** *** 160,174 **** </list> ! <set name="topFoos"> <key column="idtopbar" /> <one-to-many class = "NHibernate.DomainModel.Bar, NHibernate.DomainModel"/> </set> ! <set name="cascadingBars" cascade="all"> <key column="idtopbar" /> <one-to-many class = "NHibernate.DomainModel.Bar, NHibernate.DomainModel"/> </set> ! <map name="topGlarchez"> <key column="idtopglarch" /> <index column="mapkey" type="Char"/> --- 265,279 ---- </list> ! <set name="TopFoos"> <key column="idtopbar" /> <one-to-many class = "NHibernate.DomainModel.Bar, NHibernate.DomainModel"/> </set> ! <set name="CascadingBars" cascade="all"> <key column="idtopbar" /> <one-to-many class = "NHibernate.DomainModel.Bar, NHibernate.DomainModel"/> </set> ! <map name="TopGlarchez"> <key column="idtopglarch" /> <index column="mapkey" type="Char"/> *************** *** 176,180 **** </map> ! <set name="cached" sort="natural" table="cached_set"> <jcs-cache usage="read-write"/> <key column="baz"/> --- 281,285 ---- </map> ! <set name="Cached" sort="natural" table="cached_set"> <jcs-cache usage="read-write"/> <key column="baz"/> *************** *** 185,189 **** </set> ! <map name="cachedMap" sort="natural" table="cached_map"> <jcs-cache usage="read-write"/> <key column="baz"/> --- 290,294 ---- </set> ! <map name="CachedMap" sort="natural" table="cached_map"> <jcs-cache usage="read-write"/> <key column="baz"/> *************** *** 195,199 **** </map> ! <map name="stringGlarchMap" where="baz_map_index > 'a' and tha_key is not null" cascade="all"> <key column="baz_map_id"/> <index column="baz_map_index" type="String"/> --- 300,304 ---- </map> ! <map name="StringGlarchMap" where="baz_map_index > 'a' and tha_key is not null" cascade="all"> <key column="baz_map_id"/> <index column="baz_map_index" type="String"/> *************** *** 201,205 **** </map> ! <map name="anyToAny" lazy="true"> <key column="baz"/> <index-many-to-any id-type="Int64"> --- 306,310 ---- </map> ! <map name="AnyToAny" lazy="true"> <key column="baz"/> <index-many-to-any id-type="Int64"> *************** *** 213,227 **** </map> ! <bag name="bazez" lazy="true" order-by="name_b desc" cascade="all"> <key column="`baz id`"/> <one-to-many class="NHibernate.DomainModel.Baz, NHibernate.DomainModel"/> </bag> ! <set name="sortablez" sort="natural" cascade="all"> <key column="baz"/> <one-to-many class="NHibernate.DomainModel.Sortable, NHibernate.DomainModel"/> </set> ! <component name="collectionComponent"> <component name="Nested"> <property name="Str"/> --- 318,332 ---- </map> ! <bag name="Bazez" lazy="true" order-by="name_b desc" cascade="all"> <key column="`baz id`"/> <one-to-many class="NHibernate.DomainModel.Baz, NHibernate.DomainModel"/> </bag> ! <set name="Sortablez" sort="natural" cascade="all"> <key column="baz"/> <one-to-many class="NHibernate.DomainModel.Sortable, NHibernate.DomainModel"/> </set> ! <component name="CollectionComponent"> <component name="Nested"> <property name="Str"/> Index: B.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/B.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** B.cs 3 Jun 2004 18:01:24 -0000 1.2 --- B.cs 4 Jun 2004 12:02:43 -0000 1.3 *************** *** 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; --- 1,2 ---- |
