From: Peter S. <sz...@us...> - 2004-04-08 16:50:53
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19618/NHibernate.DomainModel Modified Files: Foo.cs FooBar.hbm.xml FooComponent.cs Log Message: Test is evolving... Index: FooBar.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FooBar.hbm.xml 8 Apr 2004 15:55:47 -0000 1.3 --- FooBar.hbm.xml 8 Apr 2004 16:37:39 -0000 1.4 *************** *** 55,66 **** <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" type="yes_no"/> ! <property name="blob" type="NHibernate.DomainModel.Foo$Struct, NHibernate.DomainModel" column="blobb_"/> ! <property name="nullBlob" type="serializable"/> ! <property name="status" column="`status_@###`"/> <property name="binary" column="bin_"/> <property name="locale" column="`localeayzabc123!@#$`"/> --- 55,66 ---- <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!@#$`"/> *************** *** 74,78 **** <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="int" not-null="true"/> <property name="name"> <column name="name_" length="32" not-null="true"/> --- 74,78 ---- <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"/> *************** *** 86,90 **** <key column="foo_id"/> <index column="i"/> ! <element column="date_" type="DateTime"/> </array> <many-to-one name="fee" column="fee_sub" cascade="all" class="NHibernate.DomainModel.Fee, NHibernate.DomainModel" outer-join="false"/> --- 86,90 ---- <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"/> Index: FooComponent.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooComponent.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FooComponent.cs 8 Apr 2004 14:59:32 -0000 1.1 --- FooComponent.cs 8 Apr 2004 16:37:39 -0000 1.2 *************** *** 35,45 **** private Int32 _count; ! private DateTime[] importantDates; ! private FooComponent subcomponent; ! private Fee fee = new Fee(); ! private GlarchProxy glarch; ! private FooProxy parent; ! private Baz baz; #endregion --- 35,45 ---- private Int32 _count; ! private DateTime[] _importantDates; ! private FooComponent _subcomponent; ! private Fee _fee = new Fee(); ! private GlarchProxy _glarch; ! private FooProxy _parent; ! private Baz _baz; #endregion *************** *** 112,138 **** } } ! public DateTime[] ImportantDates { get { ! return importantDates; } set { ! this.importantDates = value; } } ! public FooComponent Subcomponent { get { ! return subcomponent; } set { ! this.subcomponent = value; } } ! private String Null { get --- 112,138 ---- } } ! public DateTime[] importantDates { get { ! return _importantDates; } set { ! this._importantDates = value; } } ! public FooComponent subcomponent { get { ! return _subcomponent; } set { ! this._subcomponent = value; } } ! private String @null { get *************** *** 146,196 **** } } ! 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 (parent==null) throw new ArgumentNullException("null parent set"); ! this.parent = value; } } ! public Baz Baz { get { ! return baz; } set { ! this.baz = value; } } --- 146,196 ---- } } ! 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; } } *************** *** 213,221 **** String result = "FooComponent: " + name + "=" + count; result+="; dates=["; ! if ( importantDates!=null) { ! for ( int i=0; i<importantDates.Length; i++ ) { ! result+=(i==0 ?"":", ") + importantDates[i]; } } --- 213,221 ---- String result = "FooComponent: " + name + "=" + count; result+="; dates=["; ! if ( _importantDates!=null) { ! for ( int i=0; i<_importantDates.Length; i++ ) { ! result+=(i==0 ?"":", ") + _importantDates[i]; } } Index: Foo.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Foo.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Foo.cs 8 Apr 2004 15:04:30 -0000 1.2 --- Foo.cs 8 Apr 2004 16:37:39 -0000 1.3 *************** *** 686,690 **** }; component = new FooComponent("foo", 12, new DateTime[] { _date, _timestamp, DateTime.MinValue, new DateTime() }, new FooComponent("bar", 666, new DateTime[] { new DateTime(123456L), 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(123456L), DateTime.MinValue }, null ) ); ! component.glarch = new Glarch(); dependent = new Fee(); dependent.Fi = "belongs to foo # " + key; |