Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Fo.cs,1.1,1.2 Fo.hbm.xml,1.7,1.8 Foo.cs,1.11,1.12 FooBar.hbm.xml,1.14,1.15 FooProxy.cs,1.5,1.6 NHibernate.DomainModel-1.1.csproj,1.22,1.23 Parent.cs,1.3,1.4 ParentChild.hbm.xml,1.4,1.5
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7041/src/NHibernate.DomainModel Modified Files: Fo.cs Fo.hbm.xml Foo.cs FooBar.hbm.xml FooProxy.cs NHibernate.DomainModel-1.1.csproj Parent.cs ParentChild.hbm.xml Log Message: Beginning to isolate the Types so I can figure out what is ADO.NET driver problems and which are NHibernate problems. NH works great with Ms Sql 2000, but not so great with MySql & Oracle. Index: FooBar.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** FooBar.hbm.xml 23 Aug 2004 02:11:53 -0000 1.14 --- FooBar.hbm.xml 31 Aug 2004 20:24:23 -0000 1.15 *************** *** 69,74 **** <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_@###`" type="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel"/> <property name="Binary" column="bin_"/> --- 69,73 ---- <property name="Byte" column="byte_"/> <property name="YesNo" type="yes_no"/> ! <property name="Status" column="`status_@###`" type="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel"/> <property name="Binary" column="bin_"/> Index: Fo.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fo.hbm.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Fo.hbm.xml 21 Aug 2004 16:40:42 -0000 1.7 --- Fo.hbm.xml 31 Aug 2004 20:24:23 -0000 1.8 *************** *** 24,42 **** /> </composite-id> <version name="Version" type="Int64" /> - <!-- - todo: what property matches to a java version of Serializable?? - This is kind of a hack because NHibernate doesn't match System.Object to - ObjectType. - --> - <property - name="Serial" - column="serial_" - type="Serializable" - length="4000" - /> <property name="Buf" length="500"/> --- 24,32 ---- /> </composite-id> + <version name="Version" type="Int64" /> <property name="Buf" length="500"/> Index: NHibernate.DomainModel-1.1.csproj =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** NHibernate.DomainModel-1.1.csproj 25 Aug 2004 04:06:20 -0000 1.22 --- NHibernate.DomainModel-1.1.csproj 31 Aug 2004 20:24:23 -0000 1.23 *************** *** 631,634 **** --- 631,652 ---- /> <File + RelPath = "NHSpecific\BasicObject.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "NHSpecific\BasicObject.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File + RelPath = "NHSpecific\BasicSerializable.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "NHSpecific\BasicSerializable.hbm.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "NHSpecific\BlobberInMemory.cs" SubType = "Code" Index: Foo.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Foo.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Foo.cs 23 Aug 2004 02:11:53 -0000 1.11 --- Foo.cs 31 Aug 2004 20:24:23 -0000 1.12 *************** *** 23,43 **** public class Foo : FooProxy, ILifecycle { ! [Serializable] ! public class Struct ! { ! public string name; ! public int count; ! ! public override bool Equals(object obj) ! { ! Struct s = (Struct) obj; ! return ( s.name==name || s.name.Equals(name) ) && s.count==count; ! } ! ! public override int GetHashCode() ! { ! return count; ! } ! } #region Fields --- 23,43 ---- public class Foo : FooProxy, ILifecycle { ! // [Serializable] ! // public class Struct ! // { ! // public string name; ! // public int count; ! // ! // public override bool Equals(object obj) ! // { ! // Struct s = (Struct) obj; ! // return ( s.name==name || s.name.Equals(name) ) && s.count==count; ! // } ! // ! // public override int GetHashCode() ! // { ! // return count; ! // } ! // } #region Fields *************** *** 63,68 **** private byte _byte; private bool _yesno; - private Foo.Struct _blob; - private object _nullBlob; private FooStatus _status; private byte[] _binary; --- 63,66 ---- *************** *** 251,272 **** /// <summary> - /// Get/set for blob - /// </summary> - public Foo.Struct Blob - { - get { return _blob; } - set { _blob = value; } - } - - /// <summary> - /// Get/set for nullBlob - /// </summary> - public object NullBlob - { - get { return _nullBlob; } - set { _nullBlob = value; } - } - - /// <summary> /// Get/set for status /// </summary> --- 249,252 ---- *************** *** 390,397 **** _char = '@'; _bytes = System.Text.Encoding.ASCII.GetBytes(_string); - Struct ss = new Struct(); - ss.name="name"; - ss.count = 69; - _blob = ss; _status=FooStatus.ON; _binary = System.Text.Encoding.ASCII.GetBytes( _string + "yada yada yada" ); --- 370,373 ---- *************** *** 459,463 **** && ( _zero == other.Zero ) && ( ( _foo == other.TheFoo ) || ( _foo.Key.Equals( other.TheFoo.Key ) ) ) ! && ( ( _blob == other.Blob ) || ( _blob.Equals(other.Blob) ) ) && ( _yesno == other.YesNo ) && ( _status == other.Status ) --- 435,439 ---- && ( _zero == other.Zero ) && ( ( _foo == other.TheFoo ) || ( _foo.Key.Equals( other.TheFoo.Key ) ) ) ! // && ( ( _blob == other.Blob ) || ( _blob.Equals(other.Blob) ) ) && ( _yesno == other.YesNo ) && ( _status == other.Status ) Index: Parent.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Parent.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Parent.cs 9 Jun 2004 01:03:59 -0000 1.3 --- Parent.cs 31 Aug 2004 20:24:23 -0000 1.4 *************** *** 11,15 **** private int _count; private Child _child; - private object _any; private int _x; --- 11,14 ---- *************** *** 32,43 **** } - - public object Any - { - get { return _any; } - set { _any = value; } - } - - public int X { --- 31,34 ---- Index: ParentChild.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ParentChild.hbm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ParentChild.hbm.xml 13 Aug 2004 13:26:35 -0000 1.4 --- ParentChild.hbm.xml 31 Aug 2004 20:24:23 -0000 1.5 *************** *** 14,21 **** <property name="Count" column="count_"/> <one-to-one name="Child"/> ! <property name="Any" type="Object"> ! <column name="any_id"/> ! <column name="any_class"/> ! </property> </class> --- 14,18 ---- <property name="Count" column="count_"/> <one-to-one name="Child"/> ! </class> Index: FooProxy.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooProxy.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FooProxy.cs 6 Jul 2004 04:26:32 -0000 1.5 --- FooProxy.cs 31 Aug 2004 20:24:23 -0000 1.6 *************** *** 35,50 **** } - object NullBlob - { - get; - set; - } - - Foo.Struct Blob - { - get; - set; - } - bool YesNo { --- 35,38 ---- Index: Fo.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fo.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Fo.cs 3 Jun 2004 03:23:33 -0000 1.1 --- Fo.cs 31 Aug 2004 20:24:17 -0000 1.2 *************** *** 13,17 **** private byte[] _buf; - private object _serial; private long _version; private int _x; --- 13,16 ---- *************** *** 23,33 **** } - public object Serial - { - get { return _serial; } - set { _serial = value; } - } - - public long Version { --- 22,25 ---- |
