Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Baz.hbm.xml,1.11,1.12 Fee.hbm.xml,1.3,1.4 Foo.cs,1.7,1.8 FooBar.hbm.xml,1.6,1.7 FooComponent.cs,1.2,1.3 FooProxy.cs,1.2,1.3 Glarch.cs,1.4,1.5 Glarch.hbm.xml,1.3,1.4 GlarchProxy.cs,1.1,1.2
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4847/NHibernate.DomainModel Modified Files: Baz.hbm.xml Fee.hbm.xml Foo.cs FooBar.hbm.xml FooComponent.cs FooProxy.cs Glarch.cs Glarch.hbm.xml GlarchProxy.cs Log Message: Modified properties and mappings to follow .net standard Index: FooBar.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FooBar.hbm.xml 2 Jun 2004 04:53:24 -0000 1.6 --- FooBar.hbm.xml 24 Jun 2004 15:22:07 -0000 1.7 *************** *** 2,140 **** <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <import class="NHibernate.DomainModel.Result, NHibernate.DomainModel"/> ! <import class="NHibernate.DomainModel.Named, NHibernate.DomainModel"/> ! <class ! name="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! table="`foos`" ! proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" ! discriminator-value="F" ! dynamic-update="true" ! dynamic-insert="true"> ! <jcs-cache usage="nonstrict-read-write"/> ! <id name="key" type="String"> ! <column name="`foo_id`" length="36"/> ! <generator class="uuid.hex"> ! <param name="seperator">:</param> ! </generator> ! </id> ! <discriminator column="`$foo_subclass^`" type="Char"/> ! <version name="version"/> ! <!--<version name="versionCalendar" type="calendar"/>--> ! <!--<timestamp name="versionTimestamp"/>--> ! <many-to-one name="foo" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"> ! <column name="foo" length="36" index="fbmtoidx"/> ! </many-to-one> ! <property name="long"> ! <column name="long_" index="fbmtoidx" unique-key="abc" not-null="true"/> ! </property> ! <property name="integer"> ! <column name="`@@##integer_ *`" unique-key="abc" not-null="true"/> ! </property> ! <property name="float"> ! <column name="float_" unique-key="abc" not-null="true"/> ! </property> ! <property name="x"/> ! <property name="double" column="double_"/> ! <primitive-array name="bytes" table="foobytes"> ! <key column="id"/> ! <index column="i"/> ! <element column="byte_" type="Byte"/> ! </primitive-array> ! <property name="date" type="DateTime" column="date_"/> ! <property name="timestamp" type="Timestamp" column="timestamp_"/> ! <property name="boolean" column="boolean_"/> ! <property name="bool" column="bool_"/> ! <property name="null" column="null_"/> ! <property name="short" column="short_"/> ! <property name="char" column="char_"/> ! <property name="zero" column="zero_"/> ! <property name="int" column="int_"/> ! <property name="string"> ! <column name="string_" length="48" index="fbstridx"/> ! </property> ! <property name="byte" column="byte_"/> ! <property name="yesno" /> ! <property name="blob" type="NHibernate.DomainModel.Foo+Struct, NHibernate.DomainModel" column="blobb_"/> ! <property name="nullBlob" type="System.Object"/> ! <property name="status" column="`status_@###`" type="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel"/> ! <property name="binary" column="bin_"/> ! <property name="locale" column="`localeayzabc123!@#$`"/> ! ! <property name="formula" formula="1/2 * int_"/> ! ! <property name="custom" type="NHibernate.DomainModel.DoubleStringType, NHibernate.DomainModel"> ! <column name="first_name" length="66"/> ! <column name="surname" length="66"/> ! </property> ! <many-to-one name="dependent" class="NHibernate.DomainModel.Fee, NHibernate.DomainModel" cascade="all" not-null="true"/> ! <component name="component"> ! <property name="count" column="count_" type="Int32" not-null="true"/> ! <property name="name"> ! <column name="name_" length="32" not-null="true"/> ! </property> ! <many-to-one name="glarch" column="g__" cascade="all" class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" outer-join="true"/> ! <property name="null" column="cmpnt_null_"/> ! <component name="subcomponent"> ! <property name="count" column="subcount"/> ! <property name="name" column="subname"/> ! <array name="importantDates" table="foo_times"> ! <key column="foo_id"/> ! <index column="i"/> ! <element column="date_" type="Time"/> ! </array> ! <many-to-one name="fee" column="fee_sub" cascade="all" class="NHibernate.DomainModel.Fee, NHibernate.DomainModel" outer-join="false"/> ! </component> ! <array name="importantDates" table="foo_dates"> ! <key column="foo_id"/> ! <index column="i"/> ! <element column="date_" type="DateTime"/> ! </array> ! </component> ! <component name="nullComponent"> ! <property name="name" column="null_cmpnt_"/> ! </component> ! <subclass ! name="NHibernate.DomainModel.Trivial, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" ! discriminator-value="T"/> ! <subclass ! name="NHibernate.DomainModel.Abstract, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel" ! discriminator-value="null"> ! <set name="Abstracts"> ! <key column="abstract_id"/> ! <one-to-many class="NHibernate.DomainModel.Abstract, NHibernate.DomainModel"/> ! </set> ! <property name="Time" column="the_time"/> ! <subclass ! name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel" ! discriminator-value="B"> ! <many-to-one name="Baz"/> ! <property name="BarString"> ! <column name="bar_String" length="24"/> ! </property> ! <property name="Name" column="name_name"/> ! <component name="BarComponent" class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> ! <parent name="parent"/> ! <property name="count" column="bar_count"/> ! <property name="name" length="64"/> ! <array name ="importantDates"> ! <key column="id" /> ! <index column="i"/> ! <element column="date_" type="DateTime"/> ! </array> ! </component> ! <any name="Object" id-type="Int64" cascade="all"> ! <column name="clazz" length="100"/> ! <column name="gen_id"/> ! </any> ! </subclass> ! </subclass> </class> --- 2,188 ---- <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <import class="NHibernate.DomainModel.Result, NHibernate.DomainModel"/> ! <import class="NHibernate.DomainModel.Named, NHibernate.DomainModel"/> ! <class ! name="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! table="`foos`" ! proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" ! discriminator-value="F" ! dynamic-update="true" ! dynamic-insert="true" ! > ! <jcs-cache usage="nonstrict-read-write"/> ! <id name="key" type="String"> ! <column name="`foo_id`" length="36"/> ! <generator class="uuid.hex"> ! <param name="seperator">:</param> ! </generator> ! </id> ! <discriminator column="`$foo_subclass^`" type="Char"/> ! <version name="version"/> ! <!--<version name="versionCalendar" type="calendar"/>--> ! <!--<timestamp name="versionTimestamp"/>--> ! <many-to-one name="foo" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"> ! <column name="foo" length="36" index="fbmtoidx"/> ! </many-to-one> ! <property name="long"> ! <column name="long_" index="fbmtoidx" unique-key="abc" not-null="true"/> ! </property> ! <property name="integer"> ! <column name="`@@##integer_ *`" unique-key="abc" not-null="true"/> ! </property> ! <property name="float"> ! <column name="float_" unique-key="abc" not-null="true"/> ! </property> ! <property name="x"/> ! <property name="double" column="double_"/> ! <primitive-array name="bytes" table="foobytes"> ! <key column="id"/> ! <index column="i"/> ! <element column="byte_" type="Byte"/> ! </primitive-array> ! <property name="date" type="DateTime" column="date_"/> ! <property name="timestamp" type="Timestamp" column="timestamp_"/> ! <property name="boolean" column="boolean_"/> ! <property name="bool" column="bool_"/> ! <property name="NullInt32" column="null_"/> ! <property name="short" column="short_"/> ! <property name="char" column="char_"/> ! <property name="zero" column="zero_"/> ! <property name="int" column="int_"/> ! <property name="string"> ! <column name="string_" length="48" index="fbstridx"/> ! </property> ! <property name="byte" column="byte_"/> ! <property name="yesno" /> ! <property name="blob" type="NHibernate.DomainModel.Foo+Struct, NHibernate.DomainModel" column="blobb_"/> ! <property name="nullBlob" type="System.Object"/> ! <property name="status" column="`status_@###`" type="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel"/> ! <property name="binary" column="bin_"/> ! <property name="locale" column="`localeayzabc123!@#$`"/> ! ! <property name="formula" formula="1/2 * int_"/> ! ! <property name="custom" type="NHibernate.DomainModel.DoubleStringType, NHibernate.DomainModel"> ! <column name="first_name" length="66"/> ! <column name="surname" length="66"/> ! </property> ! <many-to-one name="dependent" class="NHibernate.DomainModel.Fee, NHibernate.DomainModel" cascade="all" not-null="true"/> ! ! <component name="component"> ! <property ! name="Count" ! column="count_" ! type="Int32" ! not-null="true" ! /> ! <property ! name="Name" ! > ! <column ! name="name_" ! length="32" ! not-null="true" ! /> ! </property> ! <many-to-one ! name="Glarch" ! column="g__" ! cascade="all" ! class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" ! outer-join="true" ! /> ! ! <property ! name="NullString" ! column="cmpnt_null_" ! /> ! ! <component ! name="Subcomponent" ! > ! <property ! name="Count" ! column="subcount" ! /> ! <property ! name="Name" ! column="subname" ! /> ! <array name="ImportantDates" table="foo_times"> ! <key column="foo_id"/> ! <index column="i"/> ! <element column="date_" type="Time"/> ! </array> ! ! <many-to-one ! name="Fee" ! column="fee_sub" ! cascade="all" ! class="NHibernate.DomainModel.Fee, NHibernate.DomainModel" ! outer-join="false" ! /> ! </component> ! ! <array ! name="ImportantDates" ! table="foo_dates" ! > ! <key column="foo_id"/> ! <index column="i"/> ! <element column="date_" type="DateTime"/> ! </array> ! ! </component> ! ! <component name="nullComponent"> ! <property name="Name" column="null_cmpnt_"/> ! </component> ! ! <subclass ! name="NHibernate.DomainModel.Trivial, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" ! discriminator-value="T" ! /> ! <subclass ! name="NHibernate.DomainModel.Abstract, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel" ! discriminator-value="null" ! > ! <set name="Abstracts"> ! <key column="abstract_id"/> ! <one-to-many class="NHibernate.DomainModel.Abstract, NHibernate.DomainModel"/> ! </set> ! <property name="Time" column="the_time"/> ! <subclass ! name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel" ! discriminator-value="B"> ! <many-to-one name="Baz"/> ! <property name="BarString"> ! <column name="bar_String" length="24"/> ! </property> ! <property name="Name" column="name_name"/> ! <component name="BarComponent" class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> ! <parent name="Parent"/> ! <property name="Count" column="bar_count"/> ! <property name="Name" length="64"/> ! <array name="ImportantDates"> ! <key column="id" /> ! <index column="i"/> ! <element column="date_" type="DateTime"/> ! </array> ! </component> ! <any name="Object" id-type="Int64" cascade="all"> ! <column name="clazz" length="100"/> ! <column name="gen_id"/> ! </any> ! </subclass> ! </subclass> </class> Index: Glarch.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Glarch.cs 3 Jun 2004 14:54:39 -0000 1.4 --- Glarch.cs 24 Jun 2004 15:22:07 -0000 1.5 *************** *** 15,19 **** private IList _fooComponents; private GlarchProxy[] _proxyArray; ! private IList _proxySet; private object _dynaBean; private string _immutable; --- 15,19 ---- private IList _fooComponents; private GlarchProxy[] _proxyArray; ! private IDictionary _proxySet; private object _dynaBean; private string _immutable; *************** *** 23,33 **** private Multiplicity _multiple; ! public int x { get { return _x; } ! set { this._x = value; } } ! public int version { get { return _version; } --- 23,33 ---- private Multiplicity _multiple; ! public int X { get { return _x; } ! set { _x = value; } } ! public int Version { get { return _version; } *************** *** 40,44 **** /// Gets or sets the _next /// </summary> ! public GlarchProxy next { get { return _next; } --- 40,44 ---- /// Gets or sets the _next /// </summary> ! public GlarchProxy Next { get { return _next; } *************** *** 50,54 **** /// Gets or sets the _order /// </summary> ! public short order { get { return _order; } --- 50,54 ---- /// Gets or sets the _order /// </summary> ! public short Order { get { return _order; } *************** *** 60,64 **** /// Gets or sets the _strings /// </summary> ! public IList strings { get { return _strings; } --- 60,64 ---- /// Gets or sets the _strings /// </summary> ! public IList Strings { get { return _strings; } *************** *** 70,74 **** /// Gets or sets the _stringSets /// </summary> ! public IDictionary stringSets { get { return _stringSets; } --- 70,75 ---- /// Gets or sets the _stringSets /// </summary> ! //TODO: figure out why this is not in the mapping??? ! public IDictionary StringSets { get { return _stringSets; } *************** *** 80,84 **** /// Gets or sets the _fooComponents /// </summary> ! public IList fooComponents { get { return _fooComponents; } --- 81,85 ---- /// Gets or sets the _fooComponents /// </summary> ! public IList FooComponents { get { return _fooComponents; } *************** *** 90,94 **** /// Gets or sets the _proxyArray /// </summary> ! public GlarchProxy[] proxyArray { get { return _proxyArray; } --- 91,95 ---- /// Gets or sets the _proxyArray /// </summary> ! public GlarchProxy[] ProxyArray { get { return _proxyArray; } *************** *** 100,104 **** /// Gets or sets the _proxySet /// </summary> ! public IList proxySet { get { return _proxySet; } --- 101,105 ---- /// Gets or sets the _proxySet /// </summary> ! public IDictionary ProxySet { get { return _proxySet; } *************** *** 161,165 **** /// Gets or sets the _immutable /// </summary> ! public string immutable { get { return _immutable; } --- 162,166 ---- /// Gets or sets the _immutable /// </summary> ! public string Immutable { get { return _immutable; } *************** *** 170,174 **** /// Gets or sets the _derivedVersion /// </summary> ! public int derivedVersion { get { return _derivedVersion; } --- 171,175 ---- /// Gets or sets the _derivedVersion /// </summary> ! public int DerivedVersion { get { return _derivedVersion; } *************** *** 179,183 **** /// Gets or sets the _any /// </summary> ! public object any { get { return _any; } --- 180,184 ---- /// Gets or sets the _any /// </summary> ! public object Any { get { return _any; } *************** *** 190,194 **** /// Gets or sets the _multiple /// </summary> ! public Multiplicity multiple { get { return _multiple; } --- 191,195 ---- /// Gets or sets the _multiple /// </summary> ! public Multiplicity Multiple { get { return _multiple; } *************** *** 196,203 **** } ! public new string name { get { return base._name; } ! set { this._name = value; } } --- 197,204 ---- } ! public new string Name { get { return base._name; } ! set { _name = value; } } Index: FooComponent.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooComponent.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FooComponent.cs 8 Apr 2004 16:37:39 -0000 1.2 --- FooComponent.cs 24 Jun 2004 15:22:07 -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 ---- *************** *** 60,81 **** public FooComponent(String name, Int32 count) { ! this._name = name; ! this._count = count; } public FooComponent(String name, int count, DateTime[] dates, FooComponent subcomponent) { ! this.name = name; ! this.count = count; ! this.importantDates = dates; ! this.subcomponent = subcomponent; } public FooComponent(String name, int count, DateTime[] dates, FooComponent subcomponent, Fee fee) { ! this.name = name; ! this.count = count; ! this.importantDates = dates; ! this.subcomponent = subcomponent; ! this.fee = fee; } --- 50,71 ---- public FooComponent(String name, Int32 count) { ! _name = name; ! _count = count; } public FooComponent(String name, int count, DateTime[] dates, FooComponent subcomponent) { ! _name = name; ! _count = count; ! _importantDates = dates; ! _subcomponent = subcomponent; } public FooComponent(String name, int count, DateTime[] dates, FooComponent subcomponent, Fee fee) { ! _name = name; ! _count = count; ! _importantDates = dates; ! _subcomponent = subcomponent; ! _fee = fee; } *************** *** 83,99 **** #region Properties /// <summary> /// Get/set for name /// </summary> ! public String name { ! get ! { ! return this._name; ! } ! set ! { ! this._name = value; ! } } --- 73,84 ---- #region Properties + /// <summary> /// Get/set for name /// </summary> ! public String Name { ! get { return _name; } ! set { _name = value; } } *************** *** 101,144 **** /// Get/set for count /// </summary> ! public Int32 count { ! get ! { ! return this._count; ! } ! set ! { ! this._count = value; ! } } ! public DateTime[] importantDates { ! get ! { ! return _importantDates; ! } ! set ! { ! this._importantDates = value; ! } } ! public FooComponent subcomponent { ! get ! { ! return _subcomponent; ! } ! set ! { ! this._subcomponent = value; ! } } ! private String @null { ! get ! { ! return null; ! } ! set { if (value!=null) --- 86,111 ---- /// Get/set for count /// </summary> ! public Int32 Count { ! get { return _count; } ! set { _count = value; } } ! ! public DateTime[] ImportantDates { ! get { return _importantDates; } ! set { _importantDates = value; } } ! ! public FooComponent Subcomponent { ! get { return _subcomponent; } ! set { _subcomponent = value; } } ! ! private String NullString { ! get { return null; } ! set { if (value!=null) *************** *** 146,215 **** } } ! public Fee fee { ! get ! { ! return _fee; ! } ! set ! { ! this._fee = value; ! } } ! public GlarchProxy glarch { ! get ! { ! return _glarch; ! } ! set ! { ! this._glarch = value; ! } } ! public FooProxy parent { ! get ! { ! return _parent; ! } set { if (value==null) throw new ArgumentNullException("null parent set"); ! this._parent = value; } } ! public Baz baz { ! get ! { ! return _baz; ! } ! set ! { ! this._baz = value; ! } } #endregion public override bool Equals(object obj) { FooComponent fc = (FooComponent) obj; ! return count==fc.count; } public override int GetHashCode() { ! return count; } public override string ToString() { ! String result = "FooComponent: " + name + "=" + count; result+="; dates=["; if ( _importantDates!=null) --- 113,164 ---- } } ! ! public Fee Fee { ! get { return _fee; } ! set { this._fee = value; } } ! public GlarchProxy Glarch { ! get { return _glarch; } ! set { _glarch = value; } } ! public FooProxy Parent { ! get { return _parent; } set { if (value==null) throw new ArgumentNullException("null parent set"); ! _parent = value; } } ! public Baz Baz { ! get { return _baz; } ! set { _baz = value; } } #endregion + #region System.Object Members + public override bool Equals(object obj) { FooComponent fc = (FooComponent) obj; ! return Count==fc.Count; } public override int GetHashCode() { ! return Count; } public override string ToString() { ! String result = "FooComponent: " + Name + "=" + Count; result+="; dates=["; if ( _importantDates!=null) *************** *** 221,230 **** } result+="]"; ! if ( subcomponent!=null ) { ! result+= " (" + subcomponent + ")"; } return result; } } } \ No newline at end of file --- 170,181 ---- } result+="]"; ! if ( Subcomponent!=null ) { ! result+= " (" + Subcomponent + ")"; } return result; } + #endregion + } } \ No newline at end of file Index: Foo.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Foo.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Foo.cs 26 Apr 2004 03:47:32 -0000 1.7 --- Foo.cs 24 Jun 2004 15:22:07 -0000 1.8 *************** *** 368,372 **** /// Get/set for null /// </summary> ! public int @null { get --- 368,372 ---- /// Get/set for null /// </summary> ! public int NullInt32 { get *************** *** 686,690 **** }; component = new FooComponent("foo", 12, new DateTime[] { _date, _timestamp, DateTime.MinValue, new DateTime() }, new FooComponent("bar", 666, new DateTime[] { new DateTime(1999,12,3), DateTime.MinValue }, null ) ); ! component.glarch = new Glarch(); dependent = new Fee(); dependent.fi = "belongs to foo # " + key; --- 686,690 ---- }; component = new FooComponent("foo", 12, new DateTime[] { _date, _timestamp, DateTime.MinValue, new DateTime() }, new FooComponent("bar", 666, new DateTime[] { new DateTime(1999,12,3), DateTime.MinValue }, null ) ); ! component.Glarch = new Glarch(); dependent = new Fee(); dependent.fi = "belongs to foo # " + key; Index: GlarchProxy.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/GlarchProxy.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GlarchProxy.cs 8 Apr 2004 14:59:32 -0000 1.1 --- GlarchProxy.cs 24 Jun 2004 15:22:07 -0000 1.2 *************** *** 6,20 **** public interface GlarchProxy { ! int version { get; set; } ! int derivedVersion { get; } ! string name { get; --- 6,20 ---- public interface GlarchProxy { ! int Version { get; set; } ! int DerivedVersion { get; } ! string Name { get; *************** *** 22,26 **** } ! GlarchProxy next { get; --- 22,26 ---- } ! GlarchProxy Next { get; *************** *** 28,32 **** } ! short order { get; --- 28,32 ---- } ! short Order { get; *************** *** 34,38 **** } ! IList strings { get; --- 34,38 ---- } ! IList Strings { get; *************** *** 44,73 **** set; } ! IDictionary stringSets { get; set; } ! IList fooComponents { get; set; } ! GlarchProxy[] proxyArray { get; set; } ! IList proxySet { get; set; } ! Multiplicity multiple { get; set; } ! object any { get; --- 44,73 ---- set; } ! IDictionary StringSets { get; set; } ! IList FooComponents { get; set; } ! GlarchProxy[] ProxyArray { get; set; } ! IDictionary ProxySet { get; set; } ! Multiplicity Multiple { get; set; } ! object Any { get; Index: Baz.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Baz.hbm.xml 8 Jun 2004 11:46:06 -0000 1.11 --- Baz.hbm.xml 24 Jun 2004 15:22:06 -0000 1.12 *************** *** 91,96 **** class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel" > ! <parent name="baz"/> ! <property name="name"> <column name="name" --- 91,96 ---- class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel" > ! <parent name="Baz"/> ! <property name="Name"> <column name="name" *************** *** 99,112 **** </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"/> </nested-composite-element> </composite-element> --- 99,112 ---- </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"/> </nested-composite-element> </composite-element> *************** *** 169,177 **** > <key-property ! name="name" length="32" /> <key-property ! name="count" column="count_" type="Int32" --- 169,177 ---- > <key-property ! name="Name" length="32" /> <key-property ! name="Count" column="count_" type="Int32" *************** *** 260,265 **** <index column="i"/> <composite-element class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> ! <property name="name"/> ! <property name="count" column="count_" type="Int32"/> </composite-element> </list> --- 260,265 ---- <index column="i"/> <composite-element class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> ! <property name="Name"/> ! <property name="Count" column="count_" type="Int32"/> </composite-element> </list> Index: FooProxy.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooProxy.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FooProxy.cs 3 Jun 2004 03:23:33 -0000 1.2 --- FooProxy.cs 24 Jun 2004 15:22:07 -0000 1.3 *************** *** 61,65 **** } ! int @null { get; --- 61,65 ---- } ! int NullInt32 { get; Index: Fee.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fee.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Fee.hbm.xml 9 Apr 2004 13:14:53 -0000 1.3 --- Fee.hbm.xml 24 Jun 2004 15:22:07 -0000 1.4 *************** *** 15,20 **** </set> <component name="compon" update="false"> ! <property name="name" /> ! <property name="null" column="null_prop" /> </component> </class> --- 15,20 ---- </set> <component name="compon" update="false"> ! <property name="Name" /> ! <property name="NullString" column="null_prop" /> </component> </class> Index: Glarch.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Glarch.hbm.xml 9 Apr 2004 13:14:53 -0000 1.3 --- Glarch.hbm.xml 24 Jun 2004 15:22:07 -0000 1.4 *************** *** 1,54 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" table="`glarchez`" ! proxy="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel" dynamic-update="true"> <!--<jcs-cache usage="read-write"/>--> ! <id type="String" column="tha_key" length="32"> <generator class="uuid.hex" /> </id> ! <version name="version" /> ! <property name="name" column="namecvbnmasdf" /> <!-- <property name="currency"/> --> ! <many-to-one name="next" column="next_" class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" /> ! <property name="order" column="order_" /> <dynabean name="dynaBean" dynaclass="foo"> <property name="foo" type="String" /> <property name="bar" type="Int32" /> </dynabean> ! <property name="x" /> ! <list name="strings"> <key column="glarch_key" /> <index column="`!@# i`" /> <element type="String" column="`tha_stryng`" /> </list> ! <list name="fooComponents" lazy="true" cascade="all"> <key column="glarch_key" /> <index column="tha_indecks" /> ! <composite-element class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> ! <property name="name" column="name_" /> ! <property name="count" column="count_" /> ! <nested-composite-element name="subcomponent" class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> ! <property name="name" column="x_" /> ! <property name="count" column="y_" /> </nested-composite-element> ! <many-to-one name="fee" cascade="all" outer-join="true" /> </composite-element> </list> ! <array name="proxyArray" element-class="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel"> <key column="array_key" /> <index column="array_indecks" /> <one-to-many class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" /> </array> ! <set name="proxySet"> <key column="set_key" /> <one-to-many class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" /> </set> ! <property name="immutable" update="false" /> ! <property name="derivedVersion" insert="false" update="false" column="version" /> ! <any name="any" id-type="System.Object"> <column name="`any_id of object`" /> <column name="`any_class of object`" /> </any> ! <property name="multiple" type="NHibernate.DomainModel.MultiplicityType, NHibernate.DomainModel"> <column name="count_" /> <column name="glarch_" /> --- 1,125 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" ! table="`glarchez`" ! proxy="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel" ! dynamic-update="true" ! > ! <!--<jcs-cache usage="read-write"/>--> ! <id ! type="String" ! column="tha_key" ! length="32" ! > <generator class="uuid.hex" /> </id> ! ! <version ! name="Version" ! column="version" ! /> ! <!-- ! MikeD added column="version" because it was defaulting to "Version" and was ! creating a "Version" and "version" column - sql server is not case insensitive ! so it was making duplicate columns ! --> ! ! <property ! name="Name" ! column="namecvbnmasdf" ! /> ! <!-- <property name="currency"/> --> ! <many-to-one ! name="Next" ! column="next_" ! class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" ! /> ! ! <property ! name="Order" ! column="order_" ! /> ! <dynabean name="dynaBean" dynaclass="foo"> <property name="foo" type="String" /> <property name="bar" type="Int32" /> </dynabean> ! ! <property name="X" /> ! ! <list name="Strings"> <key column="glarch_key" /> <index column="`!@# i`" /> <element type="String" column="`tha_stryng`" /> </list> ! ! <list ! name="FooComponents" ! lazy="true" ! cascade="all" ! > <key column="glarch_key" /> <index column="tha_indecks" /> ! <composite-element ! class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel" ! > ! <property ! name="Name" ! column="name_" ! /> ! <property name="Count" column="count_" /> ! <nested-composite-element ! name="Subcomponent" ! class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel" ! > ! <property ! name="Name" ! column="x_" ! /> ! <property ! name="Count" ! column="y_" ! /> </nested-composite-element> ! <many-to-one name="Fee" cascade="all" outer-join="true" /> </composite-element> </list> ! <array ! name="ProxyArray" ! element-class="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel" ! > <key column="array_key" /> <index column="array_indecks" /> <one-to-many class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" /> </array> ! <set name="ProxySet"> <key column="set_key" /> <one-to-many class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" /> </set> ! ! <property ! name="Immutable" ! update="false" ! /> ! ! <property ! name="DerivedVersion" ! insert="false" ! update="false" ! column="version" ! /> ! ! <any name="Any" id-type="System.Object"> <column name="`any_id of object`" /> <column name="`any_class of object`" /> </any> ! ! <property ! name="Multiple" ! type="NHibernate.DomainModel.MultiplicityType, NHibernate.DomainModel" ! > <column name="count_" /> <column name="glarch_" /> |
