From: Sergey K. <jus...@us...> - 2005-05-05 13:47:55
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30238/src/NHibernate.DomainModel Modified Files: Baz.cs Baz.hbm.xml Glarch.cs Glarch.hbm.xml GlarchProxy.cs Log Message: Ported all FooBarTests (except those for unimplemented features). Index: Glarch.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Glarch.cs 24 Apr 2005 19:37:56 -0000 1.10 --- Glarch.cs 5 May 2005 13:47:41 -0000 1.11 *************** *** 18,22 **** private string _immutable; private int _derivedVersion; ! // private object _any; private int _x; private Multiplicity _multiple; --- 18,22 ---- private string _immutable; private int _derivedVersion; ! private object _any; private int _x; private Multiplicity _multiple; *************** *** 150,153 **** --- 150,162 ---- /// <summary> + /// Gets or sets the _any + /// </summary> + public object Any + { + get { return _any; } + set { _any = value; } + } + + /// <summary> /// Gets or sets the _multiple /// </summary> Index: Glarch.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.hbm.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Glarch.hbm.xml 16 Dec 2004 21:57:39 -0000 1.10 --- Glarch.hbm.xml 5 May 2005 13:47:41 -0000 1.11 *************** *** 107,111 **** column="version" /> ! <property name="Multiple" --- 107,116 ---- column="version" /> ! ! <property name="Any" type="object"> ! <column name="`any_id of object`"/> ! <column name="`any_class of object`"/> ! </property> ! <property name="Multiple" Index: Baz.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Baz.hbm.xml 24 Apr 2005 19:37:56 -0000 1.18 --- Baz.hbm.xml 5 May 2005 13:47:41 -0000 1.19 *************** *** 112,116 **** </composite-element> </array> ! <bag name="Bag" --- 112,122 ---- </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" Index: Baz.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Baz.cs 24 Apr 2005 19:37:56 -0000 1.15 --- Baz.cs 5 May 2005 13:47:41 -0000 1.16 *************** *** 21,24 **** --- 21,25 ---- private String _code; private FooComponent[] _components; + private DateTime[] _timeArray; private string[] _stringArray; private int[] _intArray; *************** *** 362,365 **** --- 363,381 ---- /// <summary> + /// Gets or sets the timeArray + /// </summary> + public DateTime[] TimeArray + { + get + { + return _timeArray; + } + set + { + _timeArray = value; + } + } + + /// <summary> /// Gets or sets the stringArray /// </summary> *************** *** 591,594 **** --- 607,617 ---- new FooComponent("bar", 88, null, new FooComponent("sub", 69, null, null) ) }; + TimeArray = new DateTime[] { + new DateTime(), + new DateTime(), + new DateTime(), // H2.1 has null here, but it's illegal on .NET + new DateTime(0) + }; + Count = 667; Name="Bazza"; Index: GlarchProxy.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/GlarchProxy.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GlarchProxy.cs 18 Nov 2004 02:45:43 -0000 1.5 --- GlarchProxy.cs 5 May 2005 13:47:41 -0000 1.6 *************** *** 64,68 **** get; set; ! } } } \ No newline at end of file --- 64,73 ---- get; set; ! } ! object Any ! { ! get; ! set; ! } } } \ No newline at end of file |