Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15158/NHibernate.DomainModel
Modified Files:
Fum.cs Fumm.hbm.xml NHibernate.DomainModel-1.1.csproj
Added Files:
Fumm.cs
Log Message:
Added test FumTest to NHibernate.Test and required classes to
NHibernate.DomainModel
--- NEW FILE: Fumm.cs ---
using System;
using System.Globalization;
namespace NHibernate.DomainModel
{
/// <summary>
/// Summary description for Fumm.
/// </summary>
public class Fumm
{
private CultureInfo locale;
private Fum fum;
public Fumm()
{
}
public FumCompositeID Id
{
get { return fum.id; }
set { }
}
public Fum Fum
{
get { return fum;}
set { fum = value; }
}
public CultureInfo Locale
{
get { return locale; }
set { locale = value; }
}
}
}
Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NHibernate.DomainModel-1.1.csproj 9 Apr 2004 13:14:53 -0000 1.9
--- NHibernate.DomainModel-1.1.csproj 29 Apr 2004 15:16:00 -0000 1.10
***************
*** 264,267 ****
--- 264,272 ----
/>
<File
+ RelPath = "Fumm.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "Fumm.hbm.xml"
BuildAction = "EmbeddedResource"
Index: Fumm.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fumm.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Fumm.hbm.xml 9 Apr 2004 13:14:53 -0000 1.3
--- Fumm.hbm.xml 29 Apr 2004 15:16:00 -0000 1.4
***************
*** 1,6 ****
<?xml version="1.0" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! <class name="net.sf.hibernate.test.Fumm">
! <composite-id name="id">
<key-property name="string">
<column name="string_" length="10" />
--- 1,6 ----
<?xml version="1.0" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! <class name="NHibernate.DomainModel.Fumm, NHibernate.DomainModel">
! <composite-id name="Id">
<key-property name="string">
<column name="string_" length="10" />
***************
*** 9,14 ****
<key-property name="date" column="date_" type="DateTime" />
</composite-id>
! <property name="locale" />
! <one-to-one name="fum" cascade="all" constrained="true" />
</class>
</hibernate-mapping>
\ No newline at end of file
--- 9,15 ----
<key-property name="date" column="date_" type="DateTime" />
</composite-id>
!
! <property name="Locale" />
! <one-to-one name="Fum" cascade="all" constrained="true" />
</class>
</hibernate-mapping>
\ No newline at end of file
Index: Fum.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fum.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Fum.cs 9 Apr 2004 13:14:53 -0000 1.1
--- Fum.cs 29 Apr 2004 15:15:59 -0000 1.2
***************
*** 10,14 ****
private Fum _fo;
private Qux[] _quxArray;
! private IList _friends;
private DateTime _lastUpdated;
--- 10,14 ----
private Fum _fo;
private Qux[] _quxArray;
! private IDictionary _friends;
private DateTime _lastUpdated;
***************
*** 17,29 ****
{
this.id = id;
! friends = new ArrayList();
FumCompositeID fid = new FumCompositeID();
! fid.date= new DateTime();
fid.@short= (short) ( id.@short + 33 );
fid.@string= id.@string + "dd";
Fum f = new Fum();
f.id = fid;
f.fum="FRIEND";
! friends.Add(f);
}
public string fum
--- 17,40 ----
{
this.id = id;
! friends = new Hashtable();
! //TODO: H2.0.3 - this is diff from H2.0.3 because I am getting a null exception
! // when executing the Sql. H203 uses the CalendarType which we don't have so
! // I am using DateTime instead...
! _lastUpdated = DateTime.Now;
!
FumCompositeID fid = new FumCompositeID();
! fid.date= new DateTime(2004, 4, 29, 9, 50, 0, 0);
fid.@short= (short) ( id.@short + 33 );
fid.@string= id.@string + "dd";
+
Fum f = new Fum();
f.id = fid;
f.fum="FRIEND";
! //TODO: H2.0.3 - this is diff from H2.0.3 because I am getting a null exception
! // when executing the Sql. H203 uses the CalendarType which we don't have so
! // I am using DateTime instead...
! f.lastUpdated = DateTime.Now;
!
! friends.Add(f, new object());
}
public string fum
***************
*** 74,78 ****
}
! public IList friends
{
get
--- 85,89 ----
}
! public IDictionary friends
{
get
***************
*** 92,100 ****
try
{
! IEnumerator iter = friends.GetEnumerator();
! while ( iter.MoveNext() )
{
! s.Delete( iter.Current );
}
}
catch (Exception e)
--- 103,116 ----
try
{
! foreach(DictionaryEntry de in friends)
{
! s.Delete(de.Key);
}
+
+ // IEnumerator iter = friends.GetEnumerator();
+ // while ( iter.MoveNext() )
+ // {
+ // s.Delete( iter.Current );
+ // }
}
catch (Exception e)
***************
*** 116,124 ****
try
{
! IEnumerator iter = friends.GetEnumerator();
! while ( iter.MoveNext() )
{
! s.Save( iter.Current );
}
}
catch (Exception e)
--- 132,145 ----
try
{
! foreach(DictionaryEntry de in friends)
{
! s.Save(de.Key);
}
+
+ // IEnumerator iter = friends.GetEnumerator();
+ // while ( iter.MoveNext() )
+ // {
+ // s.Save( iter.Current );
+ // }
}
catch (Exception e)
|
