nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/src/NHibernate/Type SerializableType.cs,1.3,1.4 TypeFactory.cs,1.33,1.34

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8373/NHibernate/Type

Modified Files:
	SerializableType.cs TypeFactory.cs 
Log Message:
Fixed up SerializableType so its parameter length doesn't default to 255

Index: SerializableType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/SerializableType.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SerializableType.cs	10 Feb 2004 18:41:42 -0000	1.3
--- SerializableType.cs	31 Jul 2004 19:16:44 -0000	1.4
***************
*** 30,34 ****
  		private BinaryType binaryType;
  
! 		public SerializableType(System.Type serializableClass) : this(serializableClass, SqlTypeFactory.GetBinary(255)) {
  			
  		}
--- 30,37 ----
  		private BinaryType binaryType;
  
! 		public SerializableType(System.Type serializableClass) 
! 			//: this(serializableClass, SqlTypeFactory.GetBinary()) 
! 			: this( serializableClass, new BinarySqlType() )
! 		{
  			
  		}

Index: TypeFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TypeFactory.cs,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** TypeFactory.cs	28 Jul 2004 15:14:07 -0000	1.33
--- TypeFactory.cs	31 Jul 2004 19:16:44 -0000	1.34
***************
*** 725,729 ****
  			if(returnType==null) 
  			{
! 				returnType = GetSerializableType(255);
  				AddToTypeOfName(key, returnType);
  			}
--- 725,729 ----
  			if(returnType==null) 
  			{
! 				returnType = new SerializableType( typeof(object) ); //GetSerializableType(255);
  				AddToTypeOfName(key, returnType);
  			}
***************
*** 759,763 ****
  			if(returnType==null) 
  			{
! 				returnType = GetSerializableType(serializableType, 255);
  				AddToTypeOfName(key, returnType);
  			}
--- 759,763 ----
  			if(returnType==null) 
  			{
! 				returnType = new SerializableType(serializableType); //GetSerializableType(serializableType, 255);
  				AddToTypeOfName(key, returnType);
  			}

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Fo.hbm.xml,1.4,1.5

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8049/NHibernate.DomainModel

Modified Files:
	Fo.hbm.xml 
Log Message:
added a type and length for some properties.

Index: Fo.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fo.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Fo.hbm.xml	3 Jun 2004 18:55:57 -0000	1.4
--- Fo.hbm.xml	31 Jul 2004 19:14:52 -0000	1.5
***************
*** 28,39 ****
  			type="Int64" 
  		/>
! 		<!--
! 		TODO: commented out because couldn't find a Type
  		<property 
  			name="Serial" 
  			column="serial_" 
  		/>
! 		-->
! 		<property name="Buf" />
  		<property name="X" />
  	</class>
--- 28,40 ----
  			type="Int64" 
  		/>
! 		<!-- TODO: need to specify System.Object - nh can't guess this one http://jira.nhibernate.org:8080/browse/NH-82-->
  		<property 
  			name="Serial" 
  			column="serial_" 
+ 			type="System.Object"
+ 			length="4000"
  		/>
! 		
! 		<property name="Buf" length="500"/>
  		<property name="X" />
  	</class>

[Nhibernate-commit] nhibernate/src/NHibernate.Test MasterDetailTest.cs,1.5,1.6

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1915/NHibernate.Test

Modified Files:
	MasterDetailTest.cs 
Log Message:
Implemented more tests.

Index: MasterDetailTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MasterDetailTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MasterDetailTest.cs	29 Jul 2004 15:00:58 -0000	1.5
--- MasterDetailTest.cs	31 Jul 2004 14:51:01 -0000	1.6
***************
*** 115,125 ****
  
  		[Test]
! 		[Ignore("Test not yet written")]
  		public void MasterDetail() 
  		{
  		}
  
  		[Test]
! 		[Ignore("FilterKeyFactory is null so code for test is not complete.  Test not yet written")]
  		public void IncomingOutgoing() 
  		{
--- 115,214 ----
  
  		[Test]
! 		[Ignore("HQL bugs - http://jira.nhibernate.org:8080/browse/NH-79, http://jira.nhibernate.org:8080/browse/NH-80")]
  		public void MasterDetail() 
  		{
+ 			//if( dialect is Dialect.HSQLDialect ) return;
+ 
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 			Master master = new Master();
+ 			Assert.IsNotNull( s.Save(master), "save returned native id" );
+ 			object mid = s.GetIdentifier(master);
+ 			Detail d1 = new Detail();
+ 			d1.Master = master;
+ 			object did = s.Save(d1);
+ 			Detail d2 = new Detail();
+ 			d2.I = 12;
+ 			d2.Master = master;
+ 			Assert.IsNotNull( s.Save(d2), "generated id returned" );
+ 			master.AddDetail(d1);
+ 			master.AddDetail(d2);
+ 
+ 			// add checks for SAPDBDialect and MckoiDialect
+ 			if( !(dialect is Dialect.MySQLDialect) ) 
+ 			{
+ 				string hql = "from d in class NHibernate.DomainModel.Detail, m in class NHibernate.DomainModel.Master " + 
+ 					"where m = d.Master and m.Outgoing.size = 0 and m.Incoming.size = 0";
+ 				
+ 				Assert.AreEqual( 2, s.Find(hql).Count, "query" );
+ 
+ 			}
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			master = (Master)s.Load( typeof(Master), mid );
+ 			IEnumerator enumer = master.Details.Keys.GetEnumerator();
+ 			int i = 0;
+ 			while( enumer.MoveNext() ) 
+ 			{
+ 				Detail d = (Detail)enumer.Current;
+ 				Assert.AreSame( master, d.Master, "master-detail" );
+ 				i++;
+ 			}
+ 			Assert.AreEqual( 2, i, "master-detail count" );
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			Assert.AreEqual( 2, s.Find("select elements(master.Details) from Master master").Count );
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			IList list = s.Find("from Master m left join fetch m.Details");
+ 			Master m = (Master)list[0];
+ 			Assert.IsTrue( NHibernate.IsInitialized( m.Details ), "joined fetch should initialize collection" );
+ 			Assert.AreEqual( 2, m.Details.Count );
+ 			list = s.Find("from Detail d inner join fetch d.Master");
+ 			Detail dt = (Detail)list[0];
+ 			object dtid = s.GetIdentifier(dt);
+ 			Assert.AreSame( m, dt.Master );
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			list = s.Find("select m from Master m1, Master m left join fetch m.Details where m.Name=m1.Name");
+ 			Assert.IsTrue( NHibernate.IsInitialized( ((Master)list[0]).Details ) );
+ 			dt = (Detail)s.Load( typeof(Detail), dtid );
+ 			Assert.IsTrue( ((Master)list[0]).Details.Contains(dt) );
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			//http://jira.nhibernate.org:8080/browse/NH-79
+ 			/*
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			list = s.Find("select m, m1.Name from Master m1, Master m left join fetch m.Details where m.Name=m1.Name");
+ 			Master masterFromHql = (Master)((object[])list[0])[0];
+ 			Assert.IsTrue( NHibernate.IsInitialized( masterFromHql.Details ) );
+ 			dt = (Detail)s.Load( typeof(Detail), dtid );
+ 			Assert.IsTrue( masterFromHql.Details.Contains(dt) );
+ 			list = s.Find("select m.id from Master m inner join fetch m.Details");
+ 			t.Commit();
+ 			s.Close();
+ 			*/
+ 
+ 
+ 			// rest of the test depends on ISession.Filter() working
+ 
  		}
  
  		[Test]
! 		[Ignore("FilterKeyFactory is null so code for test is not complete.  http://jira.nhibernate.org:8080/browse/NH-80")]
  		public void IncomingOutgoing() 
  		{
***************
*** 199,211 ****
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void UpdateLazyCollections() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void MultiLevelCascade() 
  		{
  		}
  
--- 288,371 ----
  
  		[Test]
  		public void UpdateLazyCollections() 
  		{
+ 			// if (dialect is HSQLDialect) return;
+ 			ISession s = sessions.OpenSession();
+ 			Master m = new Master();
+ 			Detail d1 = new Detail();
+ 			Detail d2 = new Detail();
+ 			d2.X = 14;
+ 			object mid = s.Save(m);
+ 			// s.Flush();  commented out in h2.0.3 also
+ 			d1.Master = m;
+ 			d2.Master = m;
+ 			m.AddDetail(d1);
+ 			m.AddDetail(d2);
+ 			if( (dialect is Dialect.SybaseDialect) || (dialect is Dialect.MsSql2000Dialect) ) 
+ 			{
+ 				s.Save(d1);
+ 				s.Save(d2);
+ 			}
+ 			else 
+ 			{
+ 				s.Save( d1, 666L );
+ 				s.Save( d2, 667L );
+ 			}
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			m = (Master)s.Load( typeof(Master), mid );
+ 			s.Close();
+ 			m.Name = "New Name";
+ 			s = sessions.OpenSession();
+ 			s.Update(m, mid);
+ 			IEnumerator enumer = m.Details.Keys.GetEnumerator();
+ 			int i = 0;
+ 			while( enumer.MoveNext() ) 
+ 			{
+ 				Assert.IsNotNull( enumer.Current );
+ 				i++;
+ 			}
+ 			Assert.AreEqual( 2, i );
+ 
+ 			enumer = m.Details.Keys.GetEnumerator();
+ 			while( enumer.MoveNext() ) 
+ 			{
+ 				s.Delete( enumer.Current );
+ 			}
+ 			s.Delete(m);
+ 			s.Flush();
+ 			s.Close();
  		}
  
  		[Test]
  		public void MultiLevelCascade() 
  		{
+ 			//if( dialect is Dialect.HSQLDialect ) return;
+ 
+ 			ISession s = sessions.OpenSession();
+ 			Detail detail = new Detail();
+ 			SubDetail subdetail = new SubDetail();
+ 			Master m = new Master();
+ 			Master m0 = new Master();
+ 			object m0id = s.Save(m0);
+ 			m0.AddDetail(detail);
+ 			detail.Master = m0;
+ 			m.MoreDetails.Add( detail, new object() );
+ 			detail.SubDetails = new Hashtable();
+ 			detail.SubDetails.Add( subdetail, new object() );
+ 			object mid = s.Save(m);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			m = (Master)s.Load( typeof(Master), mid);
+ 			IEnumerator enumer = m.MoreDetails.Keys.GetEnumerator();
+ 			enumer.MoveNext();
+ 			Assert.IsTrue( ((Detail)enumer.Current).SubDetails.Count!=0 );
+ 			s.Delete(m);
+ 			s.Flush();
+ 			s.Close();
  		}
  
***************
*** 234,258 ****
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void CollectionReplace2() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void CollectionReplace() 
  		{
  		}
  
  		[Test]
! 		[Ignore("Test not yet written")]
  		public void Categories() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void CollectionRefresh() 
  		{
  		}
  
--- 394,538 ----
  
  		[Test]
  		public void CollectionReplace2() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 			Category c = new Category();
+ 			IList list = new ArrayList();
+ 			c.Subcategories = list;
+ 			list.Add( new Category() );
+ 			Category c2 = new Category();
+ 			s.Save(c2);
+ 			s.Save(c);
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			c = (Category)s.Load( typeof(Category), c.Id, LockMode.Upgrade );
+ 			IList list2 = c.Subcategories;
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			c2 = (Category)s.Load( typeof(Category), c2.Id, LockMode.Upgrade );
+ 			c2.Subcategories = list2;
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			c2 = (Category)s.Load( typeof(Category), c2.Id, LockMode.Upgrade );
+ 			Assert.AreEqual( 1, c2.Subcategories.Count );
+ 			s.Delete(c2);
+ 			s.Delete( s.Load( typeof(Category), c.Id ) );
+ 			t.Commit();
+ 			s.Close();
  		}
  
  		[Test]
  		public void CollectionReplace() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 			Category c = new Category();
+ 			IList list = new ArrayList();
+ 			c.Subcategories = list;
+ 			list.Add( new Category() );
+ 			s.Save(c);
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			c = (Category)s.Load( typeof(Category), c.Id, LockMode.Upgrade );
+ 			c.Subcategories = list;
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			c = (Category)s.Load( typeof(Category), c.Id, LockMode.Upgrade );
+ 			IList list2 = c.Subcategories;
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			Assert.IsFalse( NHibernate.IsInitialized( c.Subcategories ) );
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			c = (Category)s.Load( typeof(Category), c.Id, LockMode.Upgrade );
+ 			c.Subcategories = list2;
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			c = (Category)s.Load( typeof(Category), c.Id, LockMode.Upgrade );
+ 			Assert.AreEqual( 1, c.Subcategories.Count );
+ 			s.Delete(c);
+ 			t.Commit();
+ 			s.Close();
  		}
  
  		[Test]
! 		[Ignore("HQL can't reference static property for const.  http://jira.nhibernate.org:8080/browse/NH-78")]
  		public void Categories() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			Category c = new Category();
+ 			c.Name = Category.RootCategory;
+ 			Category c1 = new Category();
+ 			Category c2 = new Category();
+ 			Category c3 = new Category();
+ 			c.Subcategories.Add(c1);
+ 			c.Subcategories.Add(c2);
+ 			c2.Subcategories.Add(null);
+ 			c2.Subcategories.Add(c3);
+ 			s.Save(c);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			c = (Category)s.Load( typeof(Category), c.Id );
+ 			Assert.IsNotNull( c.Subcategories[0] );
+ 			Assert.IsNotNull( c.Subcategories[1] );
+ 			IList list = ((Category)c.Subcategories[1]).Subcategories;
+ 			Assert.IsNull(list[0]);
+ 			Assert.IsNotNull(list[1]);
+ 
+ 			IEnumerator enumer = s.Enumerable("from c in class Category where c.Name = NHibernate.DomainModel.Category.RootCategory").GetEnumerator();
+ 			Assert.IsTrue( enumer.MoveNext() );
+ 			s.Close();
+ 
+ 
  		}
  
  		[Test]
  		public void CollectionRefresh() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			Category c = new Category();
+ 			IList list = new ArrayList();
+ 			c.Subcategories = list;
+ 			list.Add( new Category() );
+ 			c.Name = "root";
+ 			object id = s.Save(c);
+ 			s.Flush();
+ 			
+ 			s = sessions.OpenSession();
+ 			c = (Category)s.Load( typeof(Category), id );
+ 			s.Refresh(c);
+ 			s.Flush();
+ 
+ 			Assert.AreEqual( 1, c.Subcategories.Count );
+ 			s.Flush();
+ 			s = sessions.OpenSession();
+ 			c = (Category) s.Load( typeof(Category), id );
+ 			Assert.AreEqual( 1, c.Subcategories.Count );
+ 			s.Delete(c);
+ 			s.Flush();
+ 			s.Close();
  		}
  
***************
*** 264,276 ****
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void Interface() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void NoUpdatedManyToOne() 
  		{
  		}
  	}
--- 544,579 ----
  
  		[Test]
  		public void Interface() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			object id = s.Save( new BasicNameable() );
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			INameable n = (INameable)s.Load( typeof(INameable), id );
+ 			s.Delete(n);
+ 			s.Flush();
+ 			s.Close();
  		}
  
  		[Test]
  		public void NoUpdatedManyToOne() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			W w1 = new W();
+ 			W w2 = new W();
+ 			Z z = new Z();
+ 			z.W = w1;
+ 			s.Save(z);
+ 			s.Flush();
+ 			z.W = w2;
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			s.Update(z);
+ 			s.Flush();
+ 			s.Close();
  		}
  	}

[Nhibernate-commit] nhibernate/src/NHibernate/Type DecimalType.cs,1.3,1.4

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1840/NHibernate/Type

Modified Files:
	DecimalType.cs 
Log Message:
Removed IVersionType interface from DecimalType.

Index: DecimalType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/DecimalType.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DecimalType.cs	18 May 2004 05:04:12 -0000	1.3
--- DecimalType.cs	31 Jul 2004 14:50:32 -0000	1.4
***************
*** 4,55 ****
  using NHibernate.SqlTypes;
  
! namespace NHibernate.Type {
  
  	/// <summary>
  	/// DecimalType
  	/// </summary>
! 	public class DecimalType : PrimitiveType, IIdentifierType, IVersionType {
  	
! 		internal DecimalType(DecimalSqlType sqlType) : base(sqlType) {
  		}
  
! 		public override object Get(IDataReader rs, int index) {
  			return Convert.ToDecimal(rs[index]);
  		}
  
! 		public override object Get(IDataReader rs, string name) {
  			return Convert.ToDecimal(rs[name]);
  		}
  
! 		public override System.Type PrimitiveClass {
  			get { return typeof(Decimal); }
  		}
  
! 		public override System.Type ReturnedClass {
  			get { return typeof(Decimal); }
  		}
  
! 		public override void Set(IDbCommand st, object value, int index) {
  			IDataParameter parm = st.Parameters[index] as IDataParameter;
  			parm.Value = value;
  		}
  
! 		public override string Name {
  			get { return "Decimal"; }
  		}
  
! 		public object StringToObject(string xml) {
  			return long.Parse(xml);
  		}
  
! 		public object Next(object current) {
! 			return ((Decimal)current) + 1;
! 		}
! 
! 		public object Seed {
! 			get { return 0; }
! 		}
! 
! 		public override string ObjectToSQLString(object value) {
  			return value.ToString();
  		}
--- 4,58 ----
  using NHibernate.SqlTypes;
  
! namespace NHibernate.Type 
! {
  
  	/// <summary>
  	/// DecimalType
  	/// </summary>
! 	public class DecimalType : PrimitiveType, IIdentifierType
! 	{
  	
! 		internal DecimalType(DecimalSqlType sqlType) : base(sqlType) 
! 		{
  		}
  
! 		public override object Get(IDataReader rs, int index) 
! 		{
  			return Convert.ToDecimal(rs[index]);
  		}
  
! 		public override object Get(IDataReader rs, string name) 
! 		{
  			return Convert.ToDecimal(rs[name]);
  		}
  
! 		public override System.Type PrimitiveClass 
! 		{
  			get { return typeof(Decimal); }
  		}
  
! 		public override System.Type ReturnedClass 
! 		{
  			get { return typeof(Decimal); }
  		}
  
! 		public override void Set(IDbCommand st, object value, int index) 
! 		{
  			IDataParameter parm = st.Parameters[index] as IDataParameter;
  			parm.Value = value;
  		}
  
! 		public override string Name 
! 		{
  			get { return "Decimal"; }
  		}
  
! 		public object StringToObject(string xml) 
! 		{
  			return long.Parse(xml);
  		}
  
! 		public override string ObjectToSQLString(object value) 
! 		{
  			return value.ToString();
  		}

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel BasicNameable.cs,1.1,1.2 Category.cs,1.1,1.2

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1643/NHibernate.DomainModel

Modified Files:
	BasicNameable.cs Category.cs 
Log Message:
minor mods for tests.

Index: Category.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Category.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Category.cs	2 Jun 2004 04:53:24 -0000	1.1
--- Category.cs	31 Jul 2004 14:49:48 -0000	1.2
***************
*** 9,13 ****
  	public class Category
  	{
! 		private static readonly string RootCategory = "/";
  
  		private long _id;
--- 9,13 ----
  	public class Category
  	{
! 		public static readonly string RootCategory = "/";
  
  		private long _id;

Index: BasicNameable.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/BasicNameable.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BasicNameable.cs	2 Jun 2004 04:53:24 -0000	1.1
--- BasicNameable.cs	31 Jul 2004 14:49:48 -0000	1.2
***************
*** 6,14 ****
  	/// Summary description for BasicNameable.
  	/// </summary>
! 	public class BasicNameable
  	{
  		private string _name;
  		private long _id;
  
  		public string Name 
  		{
--- 6,16 ----
  	/// Summary description for BasicNameable.
  	/// </summary>
! 	public class BasicNameable : INameable
  	{
  		private string _name;
  		private long _id;
  
+ 		#region INameable Members
+ 		
  		public string Name 
  		{
***************
*** 23,26 ****
--- 25,29 ----
  		}
  
+ 		#endregion
  	}
  }

[Nhibernate-commit] nhibernate/src/NHibernate.Tasks .cvsignore,NONE,1.1

[Peter S. <sz...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Tasks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11552

Added Files:
	.cvsignore 
Log Message:
Added cvsignore for tasks.


--- NEW FILE: .cvsignore ---
bin
obj
.#*
*.user
*.xsx

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect FirebirdDialect.cs,1.6,1.7

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9624

Modified Files:
	FirebirdDialect.cs 
Log Message:
included fixes from Carlos

Index: FirebirdDialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/FirebirdDialect.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FirebirdDialect.cs	19 Jul 2004 03:24:02 -0000	1.6
--- FirebirdDialect.cs	29 Jul 2004 16:45:05 -0000	1.7
***************
*** 17,22 ****
  			Register( DbType.AnsiString, 8000, "VARCHAR($1)" );
  			Register( DbType.AnsiString, 2147483647, "BLOB"); // should use the IType.ClobType
- 			Register( DbType.Binary, "BLOB(8000) SUB_TYPE 0");
- 			Register( DbType.Binary, 8000, "BLOB($1) SUB_TYPE 0");
  			Register( DbType.Binary, 2147483647, "BLOB SUB_TYPE 0" );// should use the IType.BlobType
  			Register( DbType.Boolean, "SMALLINT" ); 
--- 17,20 ----
***************
*** 25,30 ****
  			Register( DbType.Date, "DATE");
  			Register( DbType.DateTime, "TIMESTAMP" );
! 			Register( DbType.Decimal, "DECIMAL(19,0)" ); // NUMERIC(19,0) is equivalent to DECIMAL(19,0)
! 			Register( DbType.Decimal, 19, "DECIMAL(19, $1)");
  			Register( DbType.Double, "DOUBLE PRECISION" ); 
  			Register( DbType.Int16, "SMALLINT" );
--- 23,28 ----
  			Register( DbType.Date, "DATE");
  			Register( DbType.DateTime, "TIMESTAMP" );
! 			Register( DbType.Decimal, "DECIMAL(18,0)" ); // NUMERIC(18,0) is equivalent to DECIMAL(18,0)
! 			Register( DbType.Decimal, 18, "DECIMAL(18, $1)");
  			Register( DbType.Double, "DOUBLE PRECISION" ); 
  			Register( DbType.Int16, "SMALLINT" );

[Nhibernate-commit] nhibernate/src/NHibernate.Test MasterDetailTest.cs,1.4,1.5

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22268

Modified Files:
	MasterDetailTest.cs 
Log Message:
modification to kick off cruisecontrol build

Index: MasterDetailTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MasterDetailTest.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MasterDetailTest.cs	29 Jul 2004 13:59:07 -0000	1.4
--- MasterDetailTest.cs	29 Jul 2004 15:00:58 -0000	1.5
***************
*** 195,199 ****
  		public void Serialization() 
  		{
! 			//blah
  		}
  
--- 195,199 ----
  		public void Serialization() 
  		{
! 			
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test MasterDetailTest.cs,1.3,1.4

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9970

Modified Files:
	MasterDetailTest.cs 
Log Message:
modification to kick off cruisecontrol build

Index: MasterDetailTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MasterDetailTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MasterDetailTest.cs	29 Jul 2004 13:05:55 -0000	1.3
--- MasterDetailTest.cs	29 Jul 2004 13:59:07 -0000	1.4
***************
*** 195,198 ****
--- 195,199 ----
  		public void Serialization() 
  		{
+ 			//blah
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test PerformanceTest.cs,1.5,1.6

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2233

Modified Files:
	PerformanceTest.cs 
Log Message:
Modified PerformanceTest to be more like hibernates

Index: PerformanceTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/PerformanceTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PerformanceTest.cs	18 Jun 2004 14:14:27 -0000	1.5
--- PerformanceTest.cs	29 Jul 2004 13:16:39 -0000	1.6
***************
*** 162,167 ****
  				s.Save(simples[i], ids[i]);
  			}
! 			s.Flush();
! 
  			for(int i = 0; i < N; i++) 
  			{
--- 162,166 ----
  				s.Save(simples[i], ids[i]);
  			}
! 			
  			for(int i = 0; i < N; i++) 
  			{
***************
*** 169,185 ****
  			}
  
! 			s.Flush();
  			// the results of this test are highly dependent upon
  			// how many times we flush!
  
! 			// hql is throwing perf way off...
! 			//Assert.IsTrue( s.Delete("from s in class NHibernate.DomainModel.Simple") == n);
! 
! 			IList simpleList = s.CreateCriteria(typeof(Simple)).List();
  
- 			for(int i = 0; i < simpleList.Count; i++) 
- 			{
- 				s.Delete((Simple)simpleList[i]);
- 			}
  			s.Flush();
  			t.Commit();
--- 168,177 ----
  			}
  
! 			//s.Flush();
  			// the results of this test are highly dependent upon
  			// how many times we flush!
  
! 			Assert.IsTrue( s.Delete("from s in class NHibernate.DomainModel.Simple") == N);
  
  			s.Flush();
  			t.Commit();

[Nhibernate-commit] nhibernate/src/NHibernate.Test MasterDetailTest.cs,1.2,1.3

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv371

Modified Files:
	MasterDetailTest.cs 
Log Message:
Implemented more tests.

Index: MasterDetailTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MasterDetailTest.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MasterDetailTest.cs	28 Jul 2004 03:55:08 -0000	1.2
--- MasterDetailTest.cs	29 Jul 2004 13:05:55 -0000	1.3
***************
*** 29,47 ****
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void SelfManyToOne() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void NonLazyBidrectional() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void CollectionQuery() 
  		{
  		}
  
--- 29,115 ----
  
  		[Test]
  		public void SelfManyToOne() 
  		{
+ 			// add a check to not run if HSQLDialect
+ 
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 			Master m = new Master();
+ 			m.OtherMaster = m;
+ 			s.Save(m);
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			IEnumerator enumer = s.Enumerable("from m in class Master").GetEnumerator();
+ 			enumer.MoveNext();
+ 			m = (Master)enumer.Current;
+ 			Assert.AreSame(m, m.OtherMaster);
+ 			s.Delete(m);
+ 			t.Commit();
+ 			s.Close();
  		}
  
  		[Test]
  		public void NonLazyBidrectional() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 			DomainModel.Single sin = new DomainModel.Single();
+ 			sin.Id = "asfdfds";
+ 			sin.String = "adsa asdfasd";
+ 			Several sev = new Several();
+ 			sev.Id = "asdfasdfasd";
+ 			sev.String = "asd ddd";
+ 			sin.Several.Add(sev);
+ 			sev.Single = sin;
+ 			s.Save(sin);
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			sin = (DomainModel.Single)s.Load( typeof(DomainModel.Single), sin );
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			sev = (Several)s.Load( typeof(Several), sev );
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			s.Find("from s in class Several");
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			s.Find("from s in class Single");
+ 			t.Commit();
+ 			s.Close();
  		}
  
  		[Test]
  		public void CollectionQuery() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 
+ 			// add checks for SAPDBDialect & MckoiDialect
+ 			if( !(dialect is Dialect.MySQLDialect) ) 
+ 			{
+ 				s.Enumerable("FROM m IN CLASS Master WHERE NOT EXISTS ( FROM d in m.Details.elements WHERE NOT d.I=5 )");
+ 				s.Enumerable("FROM m IN CLASS Master WHERE NOT 5 IN ( SELECT d.I FROM d IN m.Details.elements )");
+ 			}
+ 
+ 			s.Enumerable("SELECT m FROM m in CLASS NHibernate.DomainModel.Master, d IN m.Details.elements WHERE d.I=5");
+ 			s.Find("SELECT m FROM m in CLASS NHibernate.DomainModel.Master, d IN m.Details.elements WHERE d.I=5");
+ 			s.Find("SELECT m.id FROM m IN CLASS NHibernate.DomainModel.Master, d IN m.Details.elements WHERE d.I=5");
+ 			t.Commit();
+ 			s.Close();
  		}
  
***************
*** 53,71 ****
  
  		[Test]
! 		[Ignore("Test not yet written")]
  		public void IncomingOutgoing() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void Cascading() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void NamedQuery() 
  		{
  		}
  
--- 121,192 ----
  
  		[Test]
! 		[Ignore("FilterKeyFactory is null so code for test is not complete.  Test not yet written")]
  		public void IncomingOutgoing() 
  		{
+ 			//if HSQLDialect skip test
+ 
+ 			ISession s = sessions.OpenSession();
+ 			Master master1 = new Master();
+ 			Master master2 = new Master();
+ 			Master master3 = new Master();
+ 			s.Save(master1);
+ 			s.Save(master2);
+ 			s.Save(master3);
+ 			master1.AddIncoming(master2);
+ 			master2.AddOutgoing(master1);
+ 			master1.AddIncoming(master3);
+ 			master3.AddOutgoing(master1);
+ 			object m1id = s.GetIdentifier(master1);
+ 
+ 			//TODO: Filter's are not working because FilterKeyFactory is null.
+ 			Assert.AreEqual( 2, s.Filter(master1.Incoming, "where this.id > 0 and this.Name is not null").Count );
+ 			s.Flush();
+ 			s.Close();
+ 
  		}
  
  		[Test]
  		public void Cascading() 
  		{
+ 			//HSQLDialect return;
+ 
+ 			ISession s = sessions.OpenSession();
+ 			Detail d1 = new Detail();
+ 			Detail d2 = new Detail();
+ 			d2.I = 22;
+ 			Master m = new Master();
+ 			Master m0 = new Master();
+ 			object m0id = s.Save(m0);
+ 			m0.AddDetail(d1);
+ 			m0.AddDetail(d2);
+ 			d1.Master = m0;
+ 			d2.Master = m0;
+ 			m.MoreDetails.Add( d1, new object() );
+ 			m.MoreDetails.Add( d2, new object() );
+ 			object mid = s.Save(m);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			m = (Master)s.Load( typeof(Master), mid );
+ 			Assert.AreEqual( 2, m.MoreDetails.Count, "cascade save" );
+ 			IEnumerator enumer = m.MoreDetails.Keys.GetEnumerator();
+ 			enumer.MoveNext();
+ 			Assert.AreEqual( 2, ((Detail)enumer.Current).Master.Details.Count , "cascade save" );
+ 
+ 			s.Delete(m);
+ 			s.Delete( s.Load( typeof(Master), m0id ) );
+ 			s.Flush();
+ 			s.Close();
+ 
  		}
  
  		[Test]
  		public void NamedQuery() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			IQuery q = s.GetNamedQuery("all_details");
+ 			q.List();
+ 			s.Close();
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Master.cs,1.2,1.3 Single.cs,1.2,1.3

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32762

Modified Files:
	Master.cs Single.cs 
Log Message:
Initialized variables for tests.

Index: Master.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Master.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Master.cs	3 Jun 2004 14:29:00 -0000	1.2
--- Master.cs	29 Jul 2004 13:05:28 -0000	1.3
***************
*** 18,22 ****
  		private IDictionary _outgoing = new Hashtable();
  		private string _name = "master";
! 		private DateTime _stamp;
  		// private BigDecimal bigDecimal = new BigDecimal("1234.123"); TODO: how to do in .net
  		private int _x;
--- 18,25 ----
  		private IDictionary _outgoing = new Hashtable();
  		private string _name = "master";
! 		// since this is a version column a value should be set.  NHibernate is unable
! 		// to set it right now because it checks to see if value==null -> since this 
! 		// is a struct it is not null...
! 		private DateTime _stamp = DateTime.Now;
  		// private BigDecimal bigDecimal = new BigDecimal("1234.123"); TODO: how to do in .net
  		private int _x;

Index: Single.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Single.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Single.cs	28 Jul 2004 03:53:19 -0000	1.2
--- Single.cs	29 Jul 2004 13:05:28 -0000	1.3
***************
*** 14,18 ****
  		private string _string;
  		//<bag>
! 		private IList _several;
  
  		public string Id
--- 14,18 ----
  		private string _string;
  		//<bag>
! 		private IList _several = new ArrayList();
  
  		public string Id

[Nhibernate-commit] nhibernate/src/NHibernate/Type TimestampType.cs,1.5,1.6

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32597

Modified Files:
	TimestampType.cs 
Log Message:
Changed TimestampType.Set to behaive like hibernate.

Index: TimestampType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TimestampType.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TimestampType.cs	18 May 2004 05:04:12 -0000	1.5
--- TimestampType.cs	29 Jul 2004 13:04:24 -0000	1.6
***************
*** 9,13 ****
  	/// <summary>
  	/// This is almost the exact same type as the DateTime except it can be used
! 	/// in the version column and stores it to the accuracy the Database supports.
  	/// </summary>
  	/// <remarks>
--- 9,14 ----
  	/// <summary>
  	/// This is almost the exact same type as the DateTime except it can be used
! 	/// in the version column, stores it to the accuracy the Database supports, 
! 	/// and will default to the value of DateTime.Now if the value is null.
  	/// </summary>
  	/// <remarks>
***************
*** 50,59 ****
  		}
  
  		public override void Set(IDbCommand st, object value, int index) 
  		{
  			IDataParameter parm = st.Parameters[index] as IDataParameter;
! 			if((DateTime)value<new DateTime(1753,1,1))
  			{
! 				parm.Value = DBNull.Value;
  			}
  			else 
--- 51,70 ----
  		}
  
+ 		/// <summary>
+ 		/// Sets the value of this Type in the IDbCommand.
+ 		/// </summary>
+ 		/// <param name="st">The IDbCommand to add the Type's value to.</param>
+ 		/// <param name="value">The value of the Type.</param>
+ 		/// <param name="index">The index of the IDataParameter in the IDbCommand.</param>
+ 		/// <remarks>
+ 		/// No null values will be written to the IDbCommand for this Type. 
+ 		/// </remarks>
  		public override void Set(IDbCommand st, object value, int index) 
  		{
  			IDataParameter parm = st.Parameters[index] as IDataParameter;
! 
! 			if( !(value is DateTime) ) 
  			{
! 				parm.Value = DateTime.Now;
  			}
  			else 

[Nhibernate-commit] nhibernate/src/NHibernate.Test FooBarTest.cs,1.48,1.49

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28630/NHibernate.Test

Modified Files:
	FooBarTest.cs 
Log Message:
Implemented more tests.

Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** FooBarTest.cs	28 Jul 2004 03:29:21 -0000	1.48
--- FooBarTest.cs	28 Jul 2004 15:14:51 -0000	1.49
***************
*** 2811,2841 ****
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void Any() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void EmbeddedCompositeID() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void AutosaveChildren() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void OrphanDelete() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void TransientOrphanDelete() 
  		{
  		}
  
--- 2811,3015 ----
  
  		[Test]
  		public void Any() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			One one = new One();
+ 			BarProxy foo = new Bar();
+ 			foo.Object = one;
+ 			object fid = s.Save(foo);
+ 			object oid = one.Key;
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			IList list = s.Find(
+ 				"from Bar bar where bar.Object.id = ? and bar.Object.class = ?",
+ 				new object[] { oid, typeof(One) },
+ 				new Type.IType[] { NHibernate.Int64, NHibernate.Class } );
+ 			Assert.AreEqual(1, list.Count);
+ 
+ 			// this is a little different from h2.0.3 because the full type is stored, not
+ 			// just the class name.
+ 			list = s.Find("select one from One one, Bar bar where bar.Object.id = one.id and bar.Object.class LIKE 'NHibernate.DomainModel.One%'");
+ 			Assert.AreEqual(1, list.Count);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			foo = (BarProxy)s.Load( typeof(Foo), fid );
+ 			Assert.IsNotNull(foo);
+ 			Assert.IsTrue( foo.Object is One );
+ 			Assert.AreEqual( oid, s.GetIdentifier( foo.Object ) );
+ 			s.Delete(foo);
+ 			s.Flush();
+ 			s.Close();
+ 
  		}
  
  		[Test]
  		public void EmbeddedCompositeID() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			Location l = new Location();
+ 			l.CountryCode = "AU";
+ 			l.Description = "foo bar";
+ 			l.Locale = System.Globalization.CultureInfo.CreateSpecificCulture("en-AU");
+ 			l.StreetName = "Brunswick Rd";
+ 			l.StreetNumber = 300;
+ 			l.City = "Melbourne";
+ 			s.Save(l);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			s.FlushMode = FlushMode.Never;
+ 			l = (Location)s.Find("from l in class Location where l.CountryCode = 'AU' and l.Description='foo bar'")[0];
+ 			Assert.AreEqual( "AU", l.CountryCode );
+ 			Assert.AreEqual( "Melbourne", l.City );
+ 			Assert.AreEqual( System.Globalization.CultureInfo.CreateSpecificCulture("en-AU"), l.Locale );
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			l.Description = "sick're";
+ 			s.Update(l);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			l = new Location();
+ 			l.CountryCode = "AU";
+ 			l.Description = "foo bar";
+ 			l.Locale = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
+ 			l.StreetName = "Brunswick Rd";
+ 			l.StreetNumber = 300;
+ 			l.City = "Melbourne";
+ 			Assert.AreSame( l, s.Load( typeof(Location), l ) );
+ 			Assert.AreEqual( System.Globalization.CultureInfo.CreateSpecificCulture("en-AU"), l.Locale );
+ 			s.Delete(l);
+ 			s.Flush();
+ 			s.Close();
+ 
  		}
  
  		[Test]
  		public void AutosaveChildren() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 			Baz baz = new Baz();
+ 			IDictionary bars = new Hashtable();
+ 			object emptyObject = new object();
+ 			baz.CascadingBars = bars;
+ 			s.Save(baz);
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			baz = (Baz) s.Load( typeof(Baz), baz.Code );
+ 			baz.CascadingBars.Add( new Bar(), emptyObject );
+ 			baz.CascadingBars.Add( new Bar(), emptyObject );
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			baz = (Baz)s.Load( typeof(Baz), baz.Code );
+ 			Assert.AreEqual( 2, baz.CascadingBars.Count );
+ 			IEnumerator enumer = baz.CascadingBars.GetEnumerator();
+ 			Assert.IsTrue( enumer.MoveNext() );
+ 			Assert.IsNotNull( enumer.Current );
+ 			baz.CascadingBars.Clear(); // test all-delete-orphan
+ 			s.Flush();
+ 
+ 			Assert.AreEqual( 0, s.Find("from Bar bar").Count );
+ 			s.Delete(baz);
+ 			t.Commit();
+ 			s.Close();
+ 
  		}
  
  		[Test]
  		public void OrphanDelete() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 			Baz baz = new Baz();
+ 			IDictionary bars = new Hashtable();
+ 			bars.Add( new Bar(), new object() );
+ 			bars.Add( new Bar(), new object() );
+ 			bars.Add( new Bar(), new object() );
+ 			s.Save(baz);
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			baz = (Baz) s.Load( typeof(Baz), baz.Code );
+ 			IEnumerator enumer = bars.GetEnumerator();
+ 			enumer.MoveNext();
+ 			bars.Remove( enumer.Current );
+ 			s.Delete(baz);
+ 			enumer.MoveNext();
+ 			bars.Remove( enumer.Current );
+ 			s.Flush();
+ 
+ 			Assert.AreEqual( 0, s.Find("from Bar bar").Count );
+ 			t.Commit();
+ 			s.Close();
  		}
  
  		[Test]
  		public void TransientOrphanDelete() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
+ 			Baz baz = new Baz();
+ 			IDictionary bars = new Hashtable();
+ 			baz.CascadingBars = bars;
+ 			bars.Add( new Bar(), new object() );
+ 			bars.Add( new Bar(), new object() );
+ 			bars.Add( new Bar(), new object() );
+ 			IList foos = new ArrayList();
+ 			foos.Add( new Foo() );
+ 			foos.Add( new Foo() );
+ 			baz.FooBag = foos;
+ 			s.Save(baz);
+ 
+ 			IEnumerator enumer = new Util.JoinedEnumerable( new IEnumerable[] { foos , bars.Keys } ).GetEnumerator();
+ 			while( enumer.MoveNext() ) 
+ 			{
+ 				FooComponent cmp = ((Foo)enumer.Current).Component;
+ 				s.Delete( cmp.Glarch );
+ 				cmp.Glarch = null;
+ 			}
+ 
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			enumer = bars.Keys.GetEnumerator();
+ 			enumer.MoveNext();
+ 			bars.Remove( enumer.Current );
+ 			foos.RemoveAt(1);
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			s.Update(baz);
+ 			Assert.AreEqual( 2, s.Find("from Bar bar").Count );
+ 			Assert.AreEqual( 3, s.Find("from Foo foo").Count );
+ 			t.Commit();
+ 			s.Close();
+ 
+ 			foos.RemoveAt(0);
+ 			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
+ 			s.Update(baz);
+ 			enumer = bars.Keys.GetEnumerator();
+ 			enumer.MoveNext();
+ 			bars.Remove( enumer.Current );
+ 			s.Delete(baz);
+ 			s.Flush();
+ 			Assert.AreEqual( 0, s.Find("from Foo foo").Count );
+ 			t.Commit();
+ 			s.Close();
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Type TypeFactory.cs,1.32,1.33

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28535/NHibernate/Type

Modified Files:
	TypeFactory.cs 
Log Message:
modified length of string for CultureInfoType

Index: TypeFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TypeFactory.cs,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** TypeFactory.cs	19 Jul 2004 03:09:32 -0000	1.32
--- TypeFactory.cs	28 Jul 2004 15:14:07 -0000	1.33
***************
*** 524,528 ****
  			if(returnType==null) 
  			{
! 				returnType = new CultureInfoType( SqlTypeFactory.GetString(10) );
  				AddToTypeOfName(key, returnType);
  			}
--- 524,528 ----
  			if(returnType==null) 
  			{
! 				returnType = new CultureInfoType( SqlTypeFactory.GetString(5) );
  				AddToTypeOfName(key, returnType);
  			}

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel FooBar.hbm.xml,1.11,1.12

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27678

Modified Files:
	FooBar.hbm.xml 
Log Message:
added length to the "clazz" column because all the type info is being stored
there also, not just the class name.

Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FooBar.hbm.xml	19 Jul 2004 03:02:33 -0000	1.11
--- FooBar.hbm.xml	28 Jul 2004 15:09:03 -0000	1.12
***************
*** 197,201 ****
  				</component>
  				<any name="Object" id-type="Int64" cascade="all">
! 					<column name="clazz" length="100"/>
  					<column name="gen_id"/>
  				</any>
--- 197,205 ----
  				</component>
  				<any name="Object" id-type="Int64" cascade="all">
! 					<!-- 
! 					made clazz 200 instead of 100 because of all the extra info stored
! 					such as assembly, key, culture
! 					-->
! 					<column name="clazz" length="200"/>
  					<column name="gen_id"/>
  				</any>

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Baz.hbm.xml,1.15,1.16

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27561

Modified Files:
	Baz.hbm.xml 
Log Message:
modified two cascades to be "all-delete-orphan" just like h2.0.3 maps.

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Baz.hbm.xml	19 Jul 2004 03:02:33 -0000	1.15
--- Baz.hbm.xml	28 Jul 2004 15:08:18 -0000	1.16
***************
*** 218,222 ****
  		</array>
  	
! 		<bag name="FooBag" lazy="true" table="baz_foo" cascade="all" inverse="false">
  			<key column="baz"/>
  			<many-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" column="foo" outer-join="true"/>
--- 218,222 ----
  		</array>
  	
! 		<bag name="FooBag" lazy="true" table="baz_foo" cascade="all-delete-orphan" inverse="false">
  			<key column="baz"/>
  			<many-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" column="foo" outer-join="true"/>
***************
*** 275,279 ****
  		</set>
  	
! 		<set name="CascadingBars" cascade="all">
  			<key column="idtopbar" />
  			<one-to-many class = "NHibernate.DomainModel.Bar, NHibernate.DomainModel"/>
--- 275,279 ----
  		</set>
  	
! 		<set name="CascadingBars" cascade="all-delete-orphan">
  			<key column="idtopbar" />
  			<one-to-many class = "NHibernate.DomainModel.Bar, NHibernate.DomainModel"/>

[Nhibernate-commit] nhibernate/src/NHibernate/Persister EntityPersister.cs,1.20,1.21 NormalizedEntityPersister.cs,1.20,1.21

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26271/NHibernate/Persister

Modified Files:
	EntityPersister.cs NormalizedEntityPersister.cs 
Log Message:
Fixed bug with dynamic-insert and dynamic-update causing 
IndexOutOfRangeExceptions.

Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** NormalizedEntityPersister.cs	14 Jul 2004 21:22:17 -0000	1.20
--- NormalizedEntityPersister.cs	28 Jul 2004 03:56:49 -0000	1.21
***************
*** 1049,1053 ****
  				// write the value of fields onto the prepared statements - we MUST use the state at the time
  				// the insert was issued (cos of foreign key constraints).
! 				Dehydrate(id, fields, PropertyInsertability, insertCmds, session);
  
  				for (int i = 0; i < tableNames.Length; i++) 
--- 1049,1053 ----
  				// write the value of fields onto the prepared statements - we MUST use the state at the time
  				// the insert was issued (cos of foreign key constraints).
! 				Dehydrate(id, fields, notNull, insertCmds, session);
  
  				for (int i = 0; i < tableNames.Length; i++) 

Index: EntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** EntityPersister.cs	15 Jul 2004 19:05:14 -0000	1.20
--- EntityPersister.cs	28 Jul 2004 03:56:49 -0000	1.21
***************
*** 649,654 ****
  		/// </summary>
  		/// <param name="id"></param>
! 		/// <param name="fields"></param>
! 		/// <param name="includeProperty"></param>
  		/// <param name="st"></param>
  		/// <param name="session"></param>
--- 649,654 ----
  		/// </summary>
  		/// <param name="id"></param>
! 		/// <param name="fields">The fields to write to the command.</param>
! 		/// <param name="includeProperty">A bool indicating if the Property should be written to the Command</param>
  		/// <param name="st"></param>
  		/// <param name="session"></param>
***************
*** 824,827 ****
--- 824,829 ----
  		/// </summary>
  		/// <param name="fields"></param>
+ 		/// <param name="notNull"></param>
+ 		/// <param name="sql"></param>
  		/// <param name="obj"></param>
  		/// <param name="session"></param>
***************
*** 851,855 ****
  			try 
  			{
! 				Dehydrate(null, fields, PropertyInsertability, statement, session);
  			} 
  			catch (Exception e) 
--- 853,857 ----
  			try 
  			{
! 				Dehydrate(null, fields, notNull, statement, session);
  			} 
  			catch (Exception e) 

[Nhibernate-commit] nhibernate/src/NHibernate.Test MasterDetailTest.cs,1.1,1.2

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26108/NHibernate.Test

Modified Files:
	MasterDetailTest.cs 
Log Message:
Test fixture for dynamic-insert/dynamic-update problem.  Not a complete test 
suite yet, but I believe I found the code problems.

Index: MasterDetailTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MasterDetailTest.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MasterDetailTest.cs	9 Jun 2004 01:05:46 -0000	1.1
--- MasterDetailTest.cs	28 Jul 2004 03:55:08 -0000	1.2
***************
*** 1,3 ****
--- 1,6 ----
  using System;
+ using System.Collections;
+ 
+ using NHibernate.DomainModel;
  
  using NUnit.Framework;
***************
*** 17,21 ****
  		 	ExportSchema(new string[] {  
  										  "MasterDetail.hbm.xml",
! 										  "Custom.hbm.xml",
  										  "Category.hbm.xml",
  										  "INameable.hbm.xml",
--- 20,24 ----
  		 	ExportSchema(new string[] {  
  										  "MasterDetail.hbm.xml",
! 										  //"Custom.hbm.xml",
  										  "Category.hbm.xml",
  										  "INameable.hbm.xml",
***************
*** 86,92 ****
  
  		[Test]
- 		[Ignore("Test not yet written")]
  		public void MixNativeAssigned() 
  		{
  		}
  
--- 89,112 ----
  
  		[Test]
  		public void MixNativeAssigned() 
  		{
+ 			// if HSQLDialect then skip test
+ 			ISession s = sessions.OpenSession();
+ 			Category c = new Category();
+ 			c.Name = "NAME";
+ 			Assignable assn = new Assignable();
+ 			assn.Id = "i.d.";
+ 			IList l = new ArrayList();
+ 			l.Add(c);
+ 			assn.Categories = l;
+ 			c.Assignable = assn;
+ 			s.Save(assn);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			s.Delete(assn);
+ 			s.Flush();
+ 			s.Close();
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel MasterDetail.hbm.xml,1.2,1.3 Several.cs,1.1,1.2 Single.cs,1.1,1.2 SingleSeveral.hbm.xml,1.1,1.2

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25848/NHibernate.DomainModel

Modified Files:
	MasterDetail.hbm.xml Several.cs Single.cs 
	SingleSeveral.hbm.xml 
Log Message:
Fixed up maps and Properties so Configure() would work.

Index: SingleSeveral.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/SingleSeveral.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SingleSeveral.hbm.xml	3 Jun 2004 18:01:24 -0000	1.1
--- SingleSeveral.hbm.xml	28 Jul 2004 03:53:19 -0000	1.2
***************
*** 61,65 ****
  		
  		<many-to-one 
! 			name="single"
  		>
  			<column 
--- 61,65 ----
  		
  		<many-to-one 
! 			name="Single"
  		>
  			<column 

Index: Single.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Single.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Single.cs	3 Jun 2004 13:31:52 -0000	1.1
--- Single.cs	28 Jul 2004 03:53:19 -0000	1.2
***************
*** 13,17 ****
  		private string _prop;
  		private string _string;
! 		private IDictionary _several;
  
  		public string Id
--- 13,18 ----
  		private string _prop;
  		private string _string;
! 		//<bag>
! 		private IList _several;
  
  		public string Id
***************
*** 33,37 ****
  		}
  
! 		public IDictionary Several
  		{
  			get { return _several; }
--- 34,38 ----
  		}
  
! 		public IList Several
  		{
  			get { return _several; }

Index: Several.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Several.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Several.cs	3 Jun 2004 13:31:52 -0000	1.1
--- Several.cs	28 Jul 2004 03:53:19 -0000	1.2
***************
*** 12,16 ****
  		private string _id;
  		private string _prop;
! 		private float _single;
  		private string _string;
  		
--- 12,16 ----
  		private string _id;
  		private string _prop;
! 		private Single _single;
  		private string _string;
  		
***************
*** 27,31 ****
  		}
  
! 		public float Single
  		{
  			get { return _single; }
--- 27,31 ----
  		}
  
! 		public Single Single
  		{
  			get { return _single; }

Index: MasterDetail.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/MasterDetail.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MasterDetail.hbm.xml	9 Jul 2004 19:22:11 -0000	1.2
--- MasterDetail.hbm.xml	28 Jul 2004 03:53:19 -0000	1.3
***************
*** 16,28 ****
  		<!--TODO: make sure this type has an equiv .net type-->
  		<version 
! 			type="Timestamp" name="stamp" column="ts_"
  		/>
  		
! 		<property name="name"/>
! 		<property name="x"/>
  		<!--
  			length="5" 
  			<column name="big_dec" sql-type="DECIMAL(5,3)"/>
  		-->
  		<property 
  			name="BigDecimal" 
--- 16,32 ----
  		<!--TODO: make sure this type has an equiv .net type-->
  		<version 
! 			name="Stamp" 
! 			type="Timestamp" 
! 			column="ts_"
  		/>
  		
! 		<property name="Name"/>
! 		<property name="X"/>
  		<!--
  			length="5" 
  			<column name="big_dec" sql-type="DECIMAL(5,3)"/>
  		-->
+ 		<!--
+ 		TODO: Find .net equiv
  		<property 
  			name="BigDecimal" 
***************
*** 30,33 ****
--- 34,38 ----
  			column="big_dec"
  		/>
+ 		-->
  		
  		<set 

[Nhibernate-commit] nhibernate/src/NHibernate.Test FooBarTest.cs,1.47,1.48 FumTest.cs,1.8,1.9

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22669/NHibernate.Test

Modified Files:
	FooBarTest.cs FumTest.cs 
Log Message:
Implemented more tests.

Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** FooBarTest.cs	16 Jul 2004 03:58:10 -0000	1.47
--- FooBarTest.cs	28 Jul 2004 03:29:21 -0000	1.48
***************
*** 2667,2671 ****
  
  		[Test]
- 		//[Ignore("Test not written yet.")]
  		public void UserProvidedConnection() 
  		{
--- 2667,2670 ----
***************
*** 2688,2712 ****
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void CachedCollection() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void ComplicatedQuery() 
  		{
  		}
  
  		[Test]
! 		[Ignore("Test not written yet.")]
  		public void LoadAfterDelete() 
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void ObjectType() 
  		{
  		}
  
--- 2687,2811 ----
  
  		[Test]
  		public void CachedCollection() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			Baz baz = new Baz();
+ 			baz.SetDefaults();
+ 			s.Save(baz);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			baz = (Baz)s.Load( typeof(Baz), baz.Code );
+ 			( (FooComponent)baz.TopComponents[0]).Count = 99;
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			baz = (Baz)s.Load( typeof(Baz), baz.Code );
+ 			Assert.AreEqual( 99,  ( (FooComponent)baz.TopComponents[0]).Count );
+ 			s.Delete(baz);
+ 			s.Flush();
+ 			s.Close();
+ 
  		}
  
  		[Test]
  		public void ComplicatedQuery() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			Foo foo = new Foo();
+ 			object id = s.Save(foo);
+ 			Assert.IsNotNull(id);
+ 			Qux q = new Qux("q");
+ 			foo.Dependent.Qux = q;
+ 			s.Save(q);
+ 			q.Foo.String = "foo2";
+ 
+ 			IEnumerator enumer = s.Enumerable("from foo in class Foo where foo.Dependent.Qux.Foo.String = 'foo2'").GetEnumerator();
+ 			Assert.IsTrue( enumer.MoveNext() );
+ 			s.Delete(foo);
+ 			s.Flush();
+ 			s.Close();
  		}
  
  		[Test]
! 		[Ignore("Test depends on Proxies being implemented.")]
  		public void LoadAfterDelete() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			Foo foo = new Foo();
+ 			object id = s.Save(foo);
+ 			s.Flush();
+ 			s.Delete(foo);
+ 
+ 			bool err = false;
+ 			try 
+ 			{
+ 				s.Load( typeof(Foo), id );
+ 			}
+ 			catch(ObjectDeletedException ode) 
+ 			{
+ 				err = true;
+ 			}
+ 			Assert.IsTrue(err);
+ 			s.Flush();
+ 			err = false;
+ 
+ 			try 
+ 			{
+ 				bool somevalue = ( (FooProxy)s.Load( typeof(Foo), id )).Boolean;
+ 			}
+ 			// this won't work until Proxies are implemented because now it throws an 
+ 			// ObjectNotFoundException
+ 			catch(LazyInitializationException lie) 
+ 			{
+ 				err = true;
+ 			}
+ 			Assert.IsTrue(err);
+ 
+ 			Fo fo = Fo.NewFo();
+ 			id = FumTest.FumKey("abc"); //yuck!
+ 			s.Save(fo, id);
+ 			s.Flush();
+ 			s.Delete(fo);
+ 			err = false;
+ 
+ 			try 
+ 			{
+ 				s.Load( typeof(Fo), id );
+ 			}
+ 			catch(ObjectDeletedException ode) 
+ 			{
+ 				err = true;
+ 			}
+ 
+ 			Assert.IsTrue(err);
+ 			s.Close();
+ 
  		}
  
  		[Test]
  		public void ObjectType() 
  		{
+ 			ISession s = sessions.OpenSession();
+ 			GlarchProxy g = new Glarch();
+ 			Foo foo = new Foo();
+ 			g.Any = foo;
+ 			object gid = s.Save(g);
+ 			object fid = s.Save(foo);
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			g = (GlarchProxy)s.Load( typeof(Glarch), gid );
+ 			Assert.IsNotNull( g.Any );
+ 			Assert.IsTrue( g.Any is FooProxy );
+ 			Assert.AreEqual( fid, ((FooProxy)g.Any).Key );
+ 			s.Delete(g.Any);
+ 			s.Delete(g);
+ 			s.Flush();
+ 			s.Close();
+ 
  		}
  

Index: FumTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FumTest.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FumTest.cs	20 Jul 2004 13:58:55 -0000	1.8
--- FumTest.cs	28 Jul 2004 03:29:21 -0000	1.9
***************
*** 43,47 ****
  		}
  
! 		static FumCompositeID FumKey(String str) 
  		{
  		
--- 43,47 ----
  		}
  
! 		public static FumCompositeID FumKey(String str) 
  		{
  		
***************
*** 49,53 ****
  		}
  	
! 		static FumCompositeID FumKey(String str, bool aCompositeQueryTest) 
  		{
  			FumCompositeID id = new FumCompositeID();
--- 49,53 ----
  		}
  	
! 		public static FumCompositeID FumKey(String str, bool aCompositeQueryTest) 
  		{
  			FumCompositeID id = new FumCompositeID();

[Nhibernate-commit] nhibernate/src/NHibernate.Test/CfgTest ConfigurationFixture.cs,1.5,1.6

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24706/CfgTest

Modified Files:
	ConfigurationFixture.cs 
Log Message:
Added fixture for manual configuration.

Index: ConfigurationFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConfigurationFixture.cs	23 Jul 2004 14:51:14 -0000	1.5
--- ConfigurationFixture.cs	27 Jul 2004 03:23:58 -0000	1.6
***************
*** 1,5 ****
--- 1,9 ----
  using System;
+ using System.Collections;
  
  using NHibernate.Cfg;
+ using NHibernate.Tool.hbm2ddl;
+ 
+ using NHibernate.DomainModel;
  
  using NUnit.Framework;
***************
*** 27,30 ****
--- 31,64 ----
  			Assert.AreEqual( "Server=localhost;initial catalog=nhibernate;Integrated Security=SSPI", cfg.Properties[Cfg.Environment.ConnectionString]);
  		}
+ 
+ 		/// <summary>
+ 		/// Recieved sample code that Configuration could not be configured manually.  It can be configured
+ 		/// manually just need to set all of the properties before adding classes
+ 		/// </summary>
+ 		[Test]
+ 		public void ManualConfiguration() 
+ 		{
+ 			//log4net.Config.DOMConfigurator.ConfigureAndWatch( new FileInfo("log4net.cfg.xml") ); //use xml file instead of config
+ 			Configuration cfg = new Configuration();
+ 			IDictionary props = new Hashtable();
+ 
+ 			props["hibernate.connection.provider"] = "NHibernate.Connection.DriverConnectionProvider"; 
+ 			props["hibernate.dialect" ] = "NHibernate.Dialect.MsSql2000Dialect"; 
+ 			props["hibernate.connection.driver_class" ] = "NHibernate.Driver.SqlClientDriver" ;
+ 			props["hibernate.connection.connection_string"] = "Server=localhost;initial catalog=nhibernate;Integrated Security=SSPI" ;
+ 		
+ 			foreach( DictionaryEntry de in props ) 
+ 			{
+ 				cfg.SetProperty( de.Key.ToString(), de.Value.ToString() );
+ 			}
+ 
+ 			cfg.AddClass( typeof(Simple) );
+ 
+ 			new SchemaExport( cfg ).Create( true, true );
+ 
+ 			ISessionFactory factory = cfg.BuildSessionFactory();
+ 
+ 		}
+ 
  	}
  }

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Configuration.cs,1.18,1.19

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30699/NHibernate/Cfg

Modified Files:
	Configuration.cs 
Log Message:
Added mapping for resource & assembly combination

Index: Configuration.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Configuration.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Configuration.cs	20 Jul 2004 13:52:52 -0000	1.18
--- Configuration.cs	26 Jul 2004 12:48:40 -0000	1.19
***************
*** 7,18 ****
  using System.Xml.Schema;
  
- using NHibernate.Id;
- using NHibernate.Impl;
- using NHibernate.Util;
- using NHibernate.Type;
- using NHibernate.Mapping;
  using NHibernate.Cache;
  using NHibernate.Dialect;
  using NHibernate.Engine;
  
  namespace NHibernate.Cfg 
--- 7,18 ----
  using System.Xml.Schema;
  
  using NHibernate.Cache;
  using NHibernate.Dialect;
  using NHibernate.Engine;
+ using NHibernate.Id;
+ using NHibernate.Impl;
+ using NHibernate.Mapping;
+ using NHibernate.Type;
+ using NHibernate.Util;
  
  namespace NHibernate.Cfg 
***************
*** 31,35 ****
  	/// </para>
  	/// </remarks>
! 	public class Configuration : IMapping {
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Configuration));
  
--- 31,36 ----
  	/// </para>
  	/// </remarks>
! 	public class Configuration : IMapping 
! 	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Configuration));
  
***************
*** 293,297 ****
  		/// <remarks>
  		/// The Assembly must be in the local bin, probing path, or GAC so that the
! 		/// Assembly can be loaded by name.
  		/// </remarks>
  		public Configuration AddAssembly(string assemblyName) 
--- 294,300 ----
  		/// <remarks>
  		/// The Assembly must be in the local bin, probing path, or GAC so that the
! 		/// Assembly can be loaded by name.  If these conditions are not satisfied
! 		/// then your code should load the Assembly and call the override <see cref="AddAssembly(Assembly)"/>
! 		/// instead.
  		/// </remarks>
  		public Configuration AddAssembly(string assemblyName) 
***************
*** 309,312 ****
--- 312,326 ----
  				throw new MappingException(e);
  			}
+ 			
+ 			return this.AddAssembly(assembly);
+ 		}
+ 
+ 		/// <summary>
+ 		/// Adds all of the Assembly's Resource files that end with "hbm.xml" 
+ 		/// </summary>
+ 		/// <param name="assembly">The loaded Assembly.</param>
+ 		/// <returns>This Configuration object.</returns>
+ 		public Configuration AddAssembly(Assembly assembly) 
+ 		{
  			foreach(string fileName in assembly.GetManifestResourceNames() ) 
  			{
***************
*** 329,335 ****
--- 343,351 ----
  				}
  			}
+ 
  			return this;
  		}
  
+ 
  		private ICollection CollectionGenerators(Dialect.Dialect dialect) 
  		{
***************
*** 719,728 ****
  					if (rsrc!=null) 
  					{
! 						log.Debug(name + "<-" + rsrc);
! 						AddResource( rsrc.Value, Assembly.GetExecutingAssembly() );
  					} 
  					else if ( assembly!=null) 
  					{
! 						log.Debug(name + "<-" + assembly);
  						AddAssembly(assembly.Value);
  					} 
--- 735,744 ----
  					if (rsrc!=null) 
  					{
! 						log.Debug( name.Value + "<-" + rsrc.Value + " in " + assembly.Value );
! 						AddResource( rsrc.Value, Assembly.Load( assembly.Value ) );
  					} 
  					else if ( assembly!=null) 
  					{
! 						log.Debug( name.Value + "<-" + assembly.Value );
  						AddAssembly(assembly.Value);
  					} 
***************
*** 730,734 ****
  					{
  						if (file==null) throw new MappingException("<mapping> element in configuration specifies no attributes");
! 						log.Debug(name + "<-" + file);
  						AddXmlFile( file.Value );
  					}
--- 746,750 ----
  					{
  						if (file==null) throw new MappingException("<mapping> element in configuration specifies no attributes");
! 						log.Debug( name.Value + "<-" + file.Value );
  						AddXmlFile( file.Value );
  					}
***************
*** 736,740 ****
  			}
  
! 			log.Info("Configured SessionFactory: " + name);
  			log.Debug("properties: " + properties);
  
--- 752,756 ----
  			}
  
! 			log.Info("Configured SessionFactory: " + name.Value);
  			log.Debug("properties: " + properties);
  

[Nhibernate-commit] nhibernate/src/NHibernate nhibernate-configuration-2.0.xsd,1.3,1.4

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30004/NHibernate

Modified Files:
	nhibernate-configuration-2.0.xsd 
Log Message:
replaced "&" with "&" in the documentation.

Index: nhibernate-configuration-2.0.xsd
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/nhibernate-configuration-2.0.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nhibernate-configuration-2.0.xsd	26 Jul 2004 12:38:09 -0000	1.3
--- nhibernate-configuration-2.0.xsd	26 Jul 2004 12:45:18 -0000	1.4
***************
*** 49,53 ****
  			<xs:documentation>
  			There are 3 possible combinations of mapping attributes
! 			1 - resource & assembly:  NHibernate will read the mapping resource from the specified assembly
  			2 - file only: NHibernate will read the mapping from the file.
  			3 - assembly only: NHibernate will find all the resources ending in hbm.xml from the assembly.
--- 49,53 ----
  			<xs:documentation>
  			There are 3 possible combinations of mapping attributes
! 			1 - resource &amp; assembly:  NHibernate will read the mapping resource from the specified assembly
  			2 - file only: NHibernate will read the mapping from the file.
  			3 - assembly only: NHibernate will find all the resources ending in hbm.xml from the assembly.

[Nhibernate-commit] nhibernate/src/NHibernate.Test hibernate.cfg.xml,1.3,1.4

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28875/NHibernate.Test

Modified Files:
	hibernate.cfg.xml 
Log Message:
Added mapping for resource & assembly for testing.

Index: hibernate.cfg.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/hibernate.cfg.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hibernate.cfg.xml	23 Jul 2004 15:46:31 -0000	1.3
--- hibernate.cfg.xml	26 Jul 2004 12:38:47 -0000	1.4
***************
*** 12,15 ****
--- 12,16 ----
  		<!-- mapping files -->
  		<mapping file="ABC.hbm.xml" />
+ 		<mapping resource="NHibernate.DomainModel.Simple.hbm.xml" assembly="NHibernate.DomainModel" />
  	</session-factory>