nhibernate-commit — CVS Commits

[Nhibernate-commit] NHibernateContrib/src .cvsignore,1.2,1.3

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

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

Modified Files:
	.cvsignore 
Log Message:
playing around with ReSharper.  Did some formatting changes.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** .cvsignore	6 Dec 2004 02:07:25 -0000	1.2
--- .cvsignore	16 Dec 2004 15:26:12 -0000	1.3
***************
*** 2,3 ****
--- 2,6 ----
  *.snk
  CloverSrc
+ _ReSharper*
+ *.resharperoptions
+ 

[Nhibernate-commit] NHibernateContrib/src/Nullables.NHibernate AssemblyInfo.cs,1.4,1.5

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
playing around with ReSharper.  Did some formatting changes.

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/AssemblyInfo.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AssemblyInfo.cs	16 Dec 2004 14:28:53 -0000	1.4
--- AssemblyInfo.cs	16 Dec 2004 15:26:13 -0000	1.5
***************
*** 20,23 ****
  [assembly: AssemblyInformationalVersionAttribute("0.5")]
  [assembly: AssemblyFileVersionAttribute("0.5.0.0")]
- //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  
--- 20,22 ----

[Nhibernate-commit] NHibernateContrib/src/BantamTech.SysCache AssemblyInfo.cs,1.2,1.3

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

Update of /cvsroot/nhibernate/NHibernateContrib/src/BantamTech.SysCache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23953/src/BantamTech.SysCache

Modified Files:
	AssemblyInfo.cs 
Log Message:
playing around with ReSharper.  Did some formatting changes.

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/BantamTech.SysCache/AssemblyInfo.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AssemblyInfo.cs	16 Dec 2004 14:28:51 -0000	1.2
--- AssemblyInfo.cs	16 Dec 2004 15:26:12 -0000	1.3
***************
*** 22,25 ****
  [assembly: AssemblyVersionAttribute("0.5.0.0")]
  [assembly: AssemblyInformationalVersionAttribute("0.5")]
- //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  
--- 22,24 ----

[Nhibernate-commit] NHibernateContrib NHibernateContribSolution.build,1.5,1.6

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

Update of /cvsroot/nhibernate/NHibernateContrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23953

Modified Files:
	NHibernateContribSolution.build 
Log Message:
playing around with ReSharper.  Did some formatting changes.

Index: NHibernateContribSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/NHibernateContribSolution.build,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NHibernateContribSolution.build	8 Dec 2004 08:02:40 -0000	1.5
--- NHibernateContribSolution.build	16 Dec 2004 15:26:11 -0000	1.6
***************
*** 292,295 ****
--- 292,299 ----
  				<excludes name="**/obj/**" />
  				
+ 				<!-- exclude ReSharper stuff -->
+ 				<excludes name="**/_ReSharper*" />
+ 				<excludes name="**/*.resharperoptions" />
+ 				
  				<!-- exclude any keys that exist on the build machine -->
  				<excludes name="**/*.snk" />

[Nhibernate-commit] NHibernateContrib releasenotes.txt,1.1,1.2

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

Update of /cvsroot/nhibernate/NHibernateContrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11537

Modified Files:
	releasenotes.txt 
Log Message:
Initial release of NHibernateContrib with 0.5 release of NH

Index: releasenotes.txt
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/releasenotes.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** releasenotes.txt	12 Nov 2004 22:08:23 -0000	1.1
--- releasenotes.txt	16 Dec 2004 14:31:39 -0000	1.2
***************
*** 1,3 ****
  Build 0.5.0.0
  ======================== 
! - Initial release of Nullables and Nullables.NHibernate
\ No newline at end of file
--- 1,4 ----
  Build 0.5.0.0
  ======================== 
! - Initial release of Nullables and Nullables.NHibernate - contributed by Donald Mull
! - Initial relase of BantamTech.SysCache in NHibernateContrib - contributed by Kevin Williams
\ No newline at end of file

[Nhibernate-commit] NHibernateContrib/lib/net/1.1 NHibernate.dll,1.3,1.4

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

Update of /cvsroot/nhibernate/NHibernateContrib/lib/net/1.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11338/lib/net/1.1

Modified Files:
	NHibernate.dll 
Log Message:
Initial release of NHibernateContrib with 0.5 release of NH

Index: NHibernate.dll
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/lib/net/1.1/NHibernate.dll,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsedsGIc and /tmp/cvsN0L8of differ

[Nhibernate-commit] NHibernateContrib/src/BantamTech.SysCache AssemblyInfo.cs,1.1,1.2

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

Update of /cvsroot/nhibernate/NHibernateContrib/src/BantamTech.SysCache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10964/src/BantamTech.SysCache

Modified Files:
	AssemblyInfo.cs 
Log Message:
Initial release of NHibernateContrib with 0.5 release of NH

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/BantamTech.SysCache/AssemblyInfo.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AssemblyInfo.cs	7 Dec 2004 19:59:16 -0000	1.1
--- AssemblyInfo.cs	16 Dec 2004 14:28:51 -0000	1.2
***************
*** 8,12 ****
  // <autogenerated>
  //     This code was generated by a tool.
! //     Runtime Version: 1.1.4322.2032
  //
  //     Changes to this file may cause incorrect behavior and will be lost if 
--- 8,12 ----
  // <autogenerated>
  //     This code was generated by a tool.
! //     Runtime Version: 1.1.4322.573
  //
  //     Changes to this file may cause incorrect behavior and will be lost if 
***************
*** 22,24 ****
--- 22,25 ----
  [assembly: AssemblyVersionAttribute("0.5.0.0")]
  [assembly: AssemblyInformationalVersionAttribute("0.5")]
+ //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  

[Nhibernate-commit] NHibernateContrib/src/Nullables AssemblyInfo.cs,1.3,1.4

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

Update of /cvsroot/nhibernate/NHibernateContrib/src/Nullables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10964/src/Nullables

Modified Files:
	AssemblyInfo.cs 
Log Message:
Initial release of NHibernateContrib with 0.5 release of NH

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables/AssemblyInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssemblyInfo.cs	7 Dec 2004 19:59:16 -0000	1.3
--- AssemblyInfo.cs	16 Dec 2004 14:28:52 -0000	1.4
***************
*** 5,9 ****
  // <autogenerated>
  //     This code was generated by a tool.
! //     Runtime Version: 1.1.4322.2032
  //
  //     Changes to this file may cause incorrect behavior and will be lost if 
--- 5,9 ----
  // <autogenerated>
  //     This code was generated by a tool.
! //     Runtime Version: 1.1.4322.573
  //
  //     Changes to this file may cause incorrect behavior and will be lost if 
***************
*** 20,22 ****
--- 20,23 ----
  [assembly: AssemblyInformationalVersionAttribute("0.5")]
  [assembly: AssemblyFileVersionAttribute("0.5.0.0")]
+ //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  

[Nhibernate-commit] NHibernateContrib/src/Nullables.Tests AssemblyInfo.cs,1.3,1.4

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

Update of /cvsroot/nhibernate/NHibernateContrib/src/Nullables.Tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10964/src/Nullables.Tests

Modified Files:
	AssemblyInfo.cs 
Log Message:
Initial release of NHibernateContrib with 0.5 release of NH

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.Tests/AssemblyInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssemblyInfo.cs	7 Dec 2004 19:59:17 -0000	1.3
--- AssemblyInfo.cs	16 Dec 2004 14:29:09 -0000	1.4
***************
*** 5,9 ****
  // <autogenerated>
  //     This code was generated by a tool.
! //     Runtime Version: 1.1.4322.2032
  //
  //     Changes to this file may cause incorrect behavior and will be lost if 
--- 5,9 ----
  // <autogenerated>
  //     This code was generated by a tool.
! //     Runtime Version: 1.1.4322.573
  //
  //     Changes to this file may cause incorrect behavior and will be lost if 

[Nhibernate-commit] NHibernateContrib/src/Nullables.NHibernate AssemblyInfo.cs,1.3,1.4

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
Initial release of NHibernateContrib with 0.5 release of NH

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/AssemblyInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssemblyInfo.cs	7 Dec 2004 19:59:16 -0000	1.3
--- AssemblyInfo.cs	16 Dec 2004 14:28:53 -0000	1.4
***************
*** 5,9 ****
  // <autogenerated>
  //     This code was generated by a tool.
! //     Runtime Version: 1.1.4322.2032
  //
  //     Changes to this file may cause incorrect behavior and will be lost if 
--- 5,9 ----
  // <autogenerated>
  //     This code was generated by a tool.
! //     Runtime Version: 1.1.4322.573
  //
  //     Changes to this file may cause incorrect behavior and will be lost if 
***************
*** 20,22 ****
--- 20,23 ----
  [assembly: AssemblyInformationalVersionAttribute("0.5")]
  [assembly: AssemblyFileVersionAttribute("0.5.0.0")]
+ //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test NHibernate.Test-1.1.csproj,1.54,1.55

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

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

Modified Files:
	NHibernate.Test-1.1.csproj 
Log Message:
Some test to verify exceptions being thrown correctly with a message.

Index: NHibernate.Test-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** NHibernate.Test-1.1.csproj	12 Dec 2004 07:18:22 -0000	1.54
--- NHibernate.Test-1.1.csproj	16 Dec 2004 04:55:42 -0000	1.55
***************
*** 376,379 ****
--- 376,407 ----
                  />
                  <File
+                     RelPath = "MappingExceptions\A.ClassNotFound.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "MappingExceptions\A.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "MappingExceptions\A.Valid.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "MappingExceptions\AddClassFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "MappingExceptions\AddResourceFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "MappingExceptions\AddXmlFileFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "MappingTest\TableFixture.cs"
                      SubType = "Code"

[Nhibernate-commit] nhibernate/src/NHibernate.Test/MappingExceptions A.ClassNotFound.hbm.xml,NONE,1.1 A.cs,NONE,1.1 A.Valid.hbm.xml,NONE,1.1 AddClassFixture.cs,NONE,1.1 AddResourceFixture.cs,NONE,1.1 AddXmlFileFixture.cs,NONE,1.1

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

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

Added Files:
	A.ClassNotFound.hbm.xml A.cs A.Valid.hbm.xml 
	AddClassFixture.cs AddResourceFixture.cs AddXmlFileFixture.cs 
Log Message:
Some test to verify exceptions being thrown correctly with a message.

--- NEW FILE: A.Valid.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 
<!--
	This is a valid mapping for A.
-->
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
	<class name="NHibernate.Test.MappingExceptions.A, NHibernate.Test">
		<id name="Id">
			<generator class="native" />
		</id>
		<property name="Name" />
	</class>

</hibernate-mapping>

--- NEW FILE: AddXmlFileFixture.cs ---
using System;

namespace NHibernate.Test.MappingExceptions
{
	/// <summary>
	/// Summary description for AddXmlFileFixture.
	/// </summary>
	public class AddXmlFileFixture
	{
		public AddXmlFileFixture()
		{
			//
			// TODO: Add constructor logic here
			//
		}
	}
}

--- NEW FILE: AddClassFixture.cs ---
using System;

using NHibernate.Cfg;

using NUnit.Framework;

namespace NHibernate.Test.MappingExceptions
{
	/// <summary>
	/// Summary description for AddClassFixture.
	/// </summary>
	[TestFixture]
	public class AddClassFixture
	{
		[Test]
		public void ClassMissingMappingFile() 
		{
			Configuration cfg = new Configuration();
			try 
			{
				cfg.AddClass( typeof(A) );
			}
			catch( MappingException me ) 
			{
				Assert.AreEqual( "Resource: " + typeof(A).FullName + ".hbm.xml not found", me.Message );
			}
		}

		[Test]
		public void AddClassNotFound() 
		{
			Configuration cfg = new Configuration();
			try 
			{
				cfg.AddResource( "NHibernate.Test.MappingExceptions.A.ClassNotFound.hbm.xml", this.GetType().Assembly );
			}
			catch( MappingException me ) 
			{
				Assert.AreEqual( "persistent class not found", me.Message );
			}
		}

		

		
	}
}

--- NEW FILE: AddResourceFixture.cs ---
using System;

using NHibernate.Cfg;

using NUnit.Framework;

namespace NHibernate.Test.MappingExceptions
{
	/// <summary>
	/// Summary description for AddResourceFixture.
	/// </summary>
	[TestFixture]
	public class AddResourceFixture
	{
		[Test]
		public void ResourceNotFound() 
		{
			// add a resource that doesn't exist
			string resource = "NHibernate.Test.MappingExceptions.A.DoesNotExists.hbm.xml";
			Configuration cfg = new Configuration();
			try 
			{
				cfg.AddResource( resource, this.GetType().Assembly );
			}
			catch( MappingException me ) 
			{
				Assert.AreEqual( "Resource: " + resource + " not found", me.Message );
			}
		}

		[Test]
		public void AddDuplicateImport() 
		{
			string resource = "NHibernate.Test.MappingExceptions.A.Valid.hbm.xml";
			Configuration cfg = new Configuration();
			try 
			{
				// adding an import of "A" and then adding a class that has a 
				// name of "A" will cause a duplicate import problem.  This can
				// occur if two classes are in different namespaces but named the
				// same and the auto-import attribute is not set to "false" for one
				// of them.
				cfg.Imports["A"] = "Some other class";
				cfg.AddResource( resource, this.GetType().Assembly );
			}
			catch( MappingException me ) 
			{
				Assert.AreEqual( "duplicate import: A", me.Message );
			}
		}
	}
}

--- NEW FILE: A.ClassNotFound.hbm.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: A.cs ---
using System;

namespace NHibernate.Test.MappingExceptions
{
	/// <summary>
	/// Summary description for A.
	/// </summary>
	public class A
	{
		private int _id;
		private string _name;

		private A()
		{
			
		}

		public int Id 
		{
			get { return _id; }
			set { _id = value; }
		}

		public string Name 
		{
			get { return _name; }
			set { _name = value; }
		}
	}
}

[Nhibernate-commit] nhibernate/src/NHibernate.Test/MappingExceptions - New directory

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

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

Log Message:
Directory /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MappingExceptions added to the repository

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Binder.cs,1.34,1.35 Configuration.cs,1.24,1.25 Mappings.cs,1.9,1.10

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

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

Modified Files:
	Binder.cs Configuration.cs Mappings.cs 
Log Message:
Some exception handling clean up.

Index: Mappings.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Mappings.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Mappings.cs	29 Oct 2004 05:58:06 -0000	1.9
--- Mappings.cs	16 Dec 2004 04:54:07 -0000	1.10
***************
*** 84,94 ****
  		/// <param name="className">The name of the class that is being renamed.</param>
  		/// <param name="rename">The new name to use in Hql for the class.</param>
  		public void AddImport(string className, string rename) 
  		{
! 			if ( imports.Contains(rename) && (string)imports[rename] != className) 
  			{
  				throw new MappingException("duplicate import: " + rename);
  			}
! 			imports.Add(rename, className); 
  		}
  
--- 84,99 ----
  		/// <param name="className">The name of the class that is being renamed.</param>
  		/// <param name="rename">The new name to use in Hql for the class.</param>
+ 		/// <exception cref="MappingException">Thrown when the rename already identifies another Class.</exception>
  		public void AddImport(string className, string rename) 
  		{
! 			// if the imports dictionary already contains the rename, then make sure 
! 			// the rename is not for a different className.  If it is a different className
! 			// then we probably have 2 classes with the same name in a different namespace.  To 
! 			// prevent this error one of the classes needs to have the attribute "
! 			if( imports.Contains(rename) && (string)imports[rename]!=className ) 
  			{
  				throw new MappingException("duplicate import: " + rename);
  			}
! 			imports[rename] = className; 
  		}
  
***************
*** 148,161 ****
  		}
  
  		public bool IsAutoImport 
  		{
! 			get 
! 			{ 
! 				return autoImport; 
! 			}
! 			set 
! 			{ 
! 				autoImport = value; 
! 			}
  		}
  	}
--- 153,172 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets or sets a boolean indicating if the Fully Qualified Type name should
+ 		/// automattically have an import added as the class name.
+ 		/// </summary>
+ 		/// <value><c>true</c> if the class name should be used as an import.</value>
+ 		/// <remarks>
+ 		/// AutoImport is used to shorten the string used to refer to Types to just their
+ 		/// class.  So if the type <c>MyAssembly.MyNamespace.MyClass, MyAssembly</c> has an <c>auto-import="false"</c>
+ 		/// then all use of in HQL would need to be the fully qualified version <c>MyAssembly.MyNamespace.MyClass</c>.
+ 		/// If <c>auto-import="true"</c> the the Type could be referred to in hql by just the class
+ 		/// name of <c>MyClass</c>.
+ 		/// </remarks>
  		public bool IsAutoImport 
  		{
! 			get { return autoImport;  }
! 			set { autoImport = value; }
  		}
  	}

Index: Binder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Binder.cs,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Binder.cs	10 Dec 2004 16:40:04 -0000	1.34
--- Binder.cs	16 Dec 2004 04:54:06 -0000	1.35
***************
*** 34,38 ****
  			catch ( Exception cnfe ) 
  			{
! 				throw new MappingException( "persistent class not found", cnfe);
  			}
  
--- 34,38 ----
  			catch ( Exception cnfe ) 
  			{
! 				throw new MappingException( "persistent class not found", cnfe );
  			}
  
***************
*** 47,51 ****
  				catch (Exception cnfe) 
  				{
! 					throw new MappingException(cnfe);
  				}
  			}
--- 47,51 ----
  				catch (Exception cnfe) 
  				{
! 					throw new MappingException( "proxy class not found", cnfe );
  				}
  			}
***************
*** 1106,1111 ****
  					BindValue(subnode, key, model.IsOneToMany, Mapping.Collection.DefaultKeyColumnName);
  					key.Type = model.Owner.Identifier.Type;
! 					if ( key.Type.ReturnedClass.IsArray ) throw new MappingException(
! 															  "illegal use of an array as an identifier (arrays don't reimplement equals)");
  					model.Key = key;
  				} 
--- 1106,1113 ----
  					BindValue(subnode, key, model.IsOneToMany, Mapping.Collection.DefaultKeyColumnName);
  					key.Type = model.Owner.Identifier.Type;
! 					if ( key.Type.ReturnedClass.IsArray ) 
! 					{
! 						throw new MappingException("illegal use of an array as an identifier (arrays don't reimplement equals)");
! 					}
  					model.Key = key;
  				} 
***************
*** 1242,1247 ****
  		{
  			XmlAttribute extendsAttr = subnode.Attributes["extends"];
! 			if( extendsAttr == null )
  				throw new MappingException( "'extends' attribute is not found." );
  			String extendsValue = extendsAttr.Value;
  			System.Type superclass;
--- 1244,1251 ----
  		{
  			XmlAttribute extendsAttr = subnode.Attributes["extends"];
! 			if( extendsAttr==null ) 
! 			{
  				throw new MappingException( "'extends' attribute is not found." );
+ 			}
  			String extendsValue = extendsAttr.Value;
  			System.Type superclass;

Index: Configuration.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Configuration.cs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Configuration.cs	4 Dec 2004 22:41:18 -0000	1.24
--- Configuration.cs	16 Dec 2004 04:54:07 -0000	1.25
***************
*** 310,314 ****
  			{
  				log.Error("Could not configure datastore from assembly", e);
! 				throw new MappingException(e);
  			}
  			
--- 310,314 ----
  			{
  				log.Error("Could not configure datastore from assembly", e);
! 				throw new MappingException( "Could not add assembly named: " + assemblyName, e );
  			}
  			

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

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

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

Modified Files:
	DialectFixture.cs 
Log Message:
Moved classes out of NHSpecific and into appropriate folder in Test
project.


Index: DialectFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/DialectTest/DialectFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DialectFixture.cs	20 Sep 2004 17:45:59 -0000	1.2
--- DialectFixture.cs	12 Dec 2004 07:18:23 -0000	1.3
***************
*** 119,123 ****
  			actualUnquoted = d.UnQuote(new string[] {tableThatNeedsToBeQuoted[BeforeQuoteIndex], tableAlreadyQuoted[BeforeQuoteIndex] } );
  
! 			ObjectAssert.AssertEquals(expectedUnquoted, actualUnquoted, true);
  
  		}
--- 119,123 ----
  			actualUnquoted = d.UnQuote(new string[] {tableThatNeedsToBeQuoted[BeforeQuoteIndex], tableAlreadyQuoted[BeforeQuoteIndex] } );
  
! 			ObjectAssert.AreEqual(expectedUnquoted, actualUnquoted, true);
  
  		}

[Nhibernate-commit] nhibernate/src/NHibernate.Test NHibernate.Test-1.1.csproj,1.53,1.54 ObjectAssertion.cs,1.7,1.8

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

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

Modified Files:
	NHibernate.Test-1.1.csproj ObjectAssertion.cs 
Log Message:
Moved classes out of NHSpecific and into appropriate folder in Test
project.


Index: ObjectAssertion.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ObjectAssertion.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ObjectAssertion.cs	10 Dec 2004 16:40:02 -0000	1.7
--- ObjectAssertion.cs	12 Dec 2004 07:18:23 -0000	1.8
***************
*** 19,23 ****
  		}
  
! 		internal static void AssertEquals(Iesi.Collections.ISet expected, Iesi.Collections.ISet actual) 
  		{
  			Assert.AreEqual( expected.Count, actual.Count, "two sets are diff size" );
--- 19,23 ----
  		}
  
! 		internal static void AreEqual(Iesi.Collections.ISet expected, Iesi.Collections.ISet actual) 
  		{
  			Assert.AreEqual( expected.Count, actual.Count, "two sets are diff size" );
***************
*** 34,41 ****
  		/// <param name="actual"></param>
  		/// <remarks>The objects contained in the arrays must implement Equals correctly.</remarks>
! 		internal static void AssertEquals(IList expected, IList actual) 
  		{
  
! 			AssertEquals(expected, actual, true);
  		}
  
--- 34,41 ----
  		/// <param name="actual"></param>
  		/// <remarks>The objects contained in the arrays must implement Equals correctly.</remarks>
! 		internal static void AreEqual(IList expected, IList actual) 
  		{
  
! 			AreEqual(expected, actual, true);
  		}
  
***************
*** 46,50 ****
  		/// <param name="actual"></param>
  		/// <param name="indexMatters">A boolean indicating if the List are compared at Index or by Contains.</param>
! 		internal static void AssertEquals(IList expected, IList actual, bool indexMatters) 
  		{
  			Assert.AreEqual(expected.Count, actual.Count);
--- 46,50 ----
  		/// <param name="actual"></param>
  		/// <param name="indexMatters">A boolean indicating if the List are compared at Index or by Contains.</param>
! 		internal static void AreEqual(IList expected, IList actual, bool indexMatters) 
  		{
  			Assert.AreEqual(expected.Count, actual.Count);
***************
*** 68,72 ****
  		/// <param name="actual"></param>
  		/// <param name="compareValues">Set it to false when you only care about the keys, specifically with Sets.</param>
! 		internal static void AssertEquals(IDictionary expected, IDictionary actual, bool compareValues) 
  		{
  			Assert.AreEqual(expected.Count, actual.Count);
--- 68,72 ----
  		/// <param name="actual"></param>
  		/// <param name="compareValues">Set it to false when you only care about the keys, specifically with Sets.</param>
! 		internal static void AreEqual(IDictionary expected, IDictionary actual, bool compareValues) 
  		{
  			Assert.AreEqual(expected.Count, actual.Count);
***************
*** 92,100 ****
  			actualWithEqualValues["ONE"] = "one";
  
! 			ObjectAssert.AssertEquals(expected, actualWithEqualValues, true);
  
  		}
  
! 		public static void AssertEquals(DateTime expected, DateTime actual, bool useMilliseconds) 
  		{
  			Assert.AreEqual(expected.Year, actual.Year, "Year");
--- 92,100 ----
  			actualWithEqualValues["ONE"] = "one";
  
! 			ObjectAssert.AreEqual(expected, actualWithEqualValues, true);
  
  		}
  
! 		public static void AreEqual(DateTime expected, DateTime actual, bool useMilliseconds) 
  		{
  			Assert.AreEqual(expected.Year, actual.Year, "Year");

Index: NHibernate.Test-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** NHibernate.Test-1.1.csproj	11 Dec 2004 20:08:18 -0000	1.53
--- NHibernate.Test-1.1.csproj	12 Dec 2004 07:18:22 -0000	1.54
***************
*** 381,389 ****
                  />
                  <File
-                     RelPath = "NHSpecificTest\BasicBinaryFixture.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "NHSpecificTest\BasicClassFixture.cs"
                      SubType = "Code"
--- 381,384 ----
***************
*** 391,399 ****
                  />
                  <File
-                     RelPath = "NHSpecificTest\BasicDoubleFixture.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "NHSpecificTest\BasicObjectFixture.cs"
                      SubType = "Code"
--- 386,389 ----
***************
*** 411,419 ****
                  />
                  <File
-                     RelPath = "NHSpecificTest\BlobberInMemoryFixture.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "NHSpecificTest\MapFixture.cs"
                      SubType = "Code"
--- 401,404 ----
***************
*** 593,596 ****
--- 578,609 ----
                  />
                  <File
+                     RelPath = "TypesTest\BinaryBlobClass.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TypesTest\BinaryBlobClass.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "TypesTest\BinaryBlobTypeFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TypesTest\BinaryClass.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TypesTest\BinaryClass.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "TypesTest\BinaryTypeFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "TypesTest\BooleanTypeFixture.cs"
                      SubType = "Code"
***************
*** 613,616 ****
--- 626,643 ----
                  />
                  <File
+                     RelPath = "TypesTest\DoubleClass.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TypesTest\DoubleClass.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "TypesTest\DoubleTypeFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "TypesTest\GuidTypeFixture.cs"
                      SubType = "Code"
***************
*** 643,646 ****
--- 670,687 ----
                  />
                  <File
+                     RelPath = "TypesTest\StringClobClass.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TypesTest\StringClobClass.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "TypesTest\StringClobTypeFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "TypesTest\TicksTypeFixture.cs"
                      SubType = "Code"

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel NHibernate.DomainModel-1.1.csproj,1.28,1.29

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

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

Modified Files:
	NHibernate.DomainModel-1.1.csproj 
Log Message:
Moved classes out of NHSpecific and into appropriate folder in Test
project.


Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** NHibernate.DomainModel-1.1.csproj	11 Dec 2004 20:08:16 -0000	1.28
--- NHibernate.DomainModel-1.1.csproj	12 Dec 2004 07:18:19 -0000	1.29
***************
*** 618,630 ****
                  />
                  <File
-                     RelPath = "NHSpecific\BasicBinary.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "NHSpecific\BasicBinary.hbm.xml"
-                     BuildAction = "EmbeddedResource"
-                 />
-                 <File
                      RelPath = "NHSpecific\BasicClass.cs"
                      SubType = "Code"
--- 618,621 ----
***************
*** 636,648 ****
                  />
                  <File
-                     RelPath = "NHSpecific\BasicDouble.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "NHSpecific\BasicDouble.hbm.xml"
-                     BuildAction = "EmbeddedResource"
-                 />
-                 <File
                      RelPath = "NHSpecific\BasicObject.cs"
                      SubType = "Code"
--- 627,630 ----
***************
*** 672,684 ****
                  />
                  <File
-                     RelPath = "NHSpecific\BlobberInMemory.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "NHSpecific\BlobberInMemory.hbm.xml"
-                     BuildAction = "EmbeddedResource"
-                 />
-                 <File
                      RelPath = "NHSpecific\Child.cs"
                      SubType = "Code"
--- 654,657 ----

[Nhibernate-commit] nhibernate/src/NHibernate.Test/TypesTest BinaryBlobClass.cs,NONE,1.1 BinaryBlobClass.hbm.xml,NONE,1.1 BinaryBlobTypeFixture.cs,NONE,1.1 BinaryClass.cs,NONE,1.1 BinaryClass.hbm.xml,NONE,1.1 BinaryTypeFixture.cs,NONE,1.1 DoubleClass.cs,NONE,1.1 DoubleClass.hbm.xml,NONE,1.1 DoubleTypeFixture.cs,NONE,1.1 StringClobClass.cs,NONE,1.1 StringClobClass.hbm.xml,NONE,1.1 StringClobTypeFixture.cs,NONE,1.1 BooleanTypeFixture.cs,1.1,1.2 ByteTypeFixture.cs,1.1,1.2 GuidTypeFixture.cs,1.2,1.3

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

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

Modified Files:
	BooleanTypeFixture.cs ByteTypeFixture.cs GuidTypeFixture.cs 
Added Files:
	BinaryBlobClass.cs BinaryBlobClass.hbm.xml 
	BinaryBlobTypeFixture.cs BinaryClass.cs BinaryClass.hbm.xml 
	BinaryTypeFixture.cs DoubleClass.cs DoubleClass.hbm.xml 
	DoubleTypeFixture.cs StringClobClass.cs 
	StringClobClass.hbm.xml StringClobTypeFixture.cs 
Log Message:
Moved classes out of NHSpecific and into appropriate folder in Test
project.


Index: GuidTypeFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/TypesTest/GuidTypeFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GuidTypeFixture.cs	19 May 2004 03:31:11 -0000	1.2
--- GuidTypeFixture.cs	12 Dec 2004 07:18:27 -0000	1.3
***************
*** 13,20 ****
  	public class GuidTypeFixture : BaseTypeFixture
  	{
- 		public GuidTypeFixture()
- 		{
- 		}
- 
  		/// <summary>
  		/// Test that Get(IDataReader, index) returns a boxed Guid value that is what
--- 13,16 ----

Index: BooleanTypeFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/TypesTest/BooleanTypeFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BooleanTypeFixture.cs	22 Mar 2004 04:34:47 -0000	1.1
--- BooleanTypeFixture.cs	12 Dec 2004 07:18:27 -0000	1.2
***************
*** 13,20 ****
  	public class BooleanTypeFixture : BaseTypeFixture
  	{
- 		public BooleanTypeFixture()
- 		{
- 		}
- 
  		/// <summary>
  		/// Test that Get(IDataReader, index) returns a boxed Boolean value that is what
--- 13,16 ----

--- NEW FILE: BinaryBlobClass.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
	<class 
		name="NHibernate.Test.TypesTest.BinaryBlobClass, NHibernate.Test"
		table="bim"
	>
		<id name="Id" type="Int32">
			<generator class="hilo" />
		</id>
		
		<!-- 
			setting it to 100000 to get past the length that most dialects
			can hold in just a plain var binary column
		-->
		<property name="BinaryBlob" column="blob_" type="BinaryBlob" length="100000"/>
	</class>
</hibernate-mapping>

--- NEW FILE: BinaryTypeFixture.cs ---
using System;
using System.Collections;
using System.IO;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;

using NHibernate;
using NHibernate.Type;

using NUnit.Framework;

namespace NHibernate.Test.TypesTest
{
	/// <summary>
	/// Tests for mapping a byte[] Property to a BinaryType.
	/// </summary>
	[TestFixture]
	public class BinaryTypeFixture : TestCase 
	{

		#region NUnit.Framework.TestFixture Members

		[TestFixtureSetUp]
		public void TestFixtureSetUp() 
		{
			ExportSchema( new string[] { "TypesTest.BinaryClass.hbm.xml"}, true, "NHibernate.Test" );
		}

		[SetUp]
		public void SetUp() 
		{
			// there are test in here where we don't need to resetup the 
			// tables - so only set the tables up once
		}

		[TearDown]
		public override void TearDown()
		{
			//base.TearDown ();
		}

		[TestFixtureTearDown]
		public void TestFixtureTearDown() 
		{
			// only do this at the end of the test fixture
			base.TearDown();
		}

		#endregion

		/// <summary>
		/// Verify Equals will correctly determine when the property
		/// is dirty.
		/// </summary>
		[Test]
		public void Equals() 
		{
			BinaryType type = (BinaryType)NHibernate.Binary;

			byte[] expected = System.Text.Encoding.UTF8.GetBytes("ghij1`23%$");
			byte[] expectedClone = System.Text.Encoding.UTF8.GetBytes("ghij1`23%$");

			Assert.IsTrue( type.Equals( expected, expected ) );
			Assert.IsTrue( type.Equals( expected, expectedClone ) );
			Assert.IsFalse( type.Equals( expected, GetByteArray( 15 ) ) );
		}

		/// <summary>
		/// Certain drivers (ie - Oralce) don't handle writing and reading null byte[] 
		/// to and from the db consistently.  Verify if this driver does.
		/// </summary>
		[Test]
		public void InsertNull() 
		{
			BinaryClass bcBinary = new BinaryClass();
			bcBinary.Id = 1;

			bcBinary.DefaultSize = null;
			bcBinary.WithSize = null;

			ISession s = sessions.OpenSession();
			s.Save(bcBinary);
			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			BinaryClass bcBinaryLoaded = (BinaryClass)s.Load( typeof(BinaryClass), 1 );

			Assert.IsNotNull(bcBinaryLoaded);
			Assert.AreEqual(null, bcBinaryLoaded.DefaultSize, "A property mapped as type=\"Byte[]\" with a null byte[] value was not saved & loaded as null");
			Assert.AreEqual(null, bcBinaryLoaded.WithSize, "A property mapped as type=\"Byte[](length)\" with null byte[] value was not saved & loaded as null");

			s.Delete(bcBinaryLoaded);
			s.Flush();
			s.Close();
		}

		/// <summary>
		/// Certain drivers (ie - Oralce) don't handle writing and reading byte[0] 
		/// to and from the db consistently.  Verify if this driver does.
		/// </summary>
		[Test]
		public void InsertZeroLength() 
		{
			BinaryClass bcBinary = new BinaryClass();
			bcBinary.Id = 1;

			bcBinary.DefaultSize = new byte[0];
			bcBinary.WithSize = new byte[0];

			ISession s = sessions.OpenSession();
			s.Save(bcBinary);
			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			BinaryClass bcBinaryLoaded = (BinaryClass)s.Load( typeof(BinaryClass), 1 );

			Assert.IsNotNull(bcBinaryLoaded);
			Assert.AreEqual(0, bcBinaryLoaded.DefaultSize.Length, "A property mapped as type=\"Byte[]\" with a byte[0] value was not saved & loaded as byte[0]");
			Assert.AreEqual(0, bcBinaryLoaded.WithSize.Length, "A property mapped as type=\"Byte[](length)\" with a byte[0] value was not saved & loaded as byte[0]");

			s.Delete(bcBinaryLoaded);
			s.Flush();
			s.Close();
		}

		/// <summary>
		/// Test the setting of values in Parameters and the reading of the 
		/// values out of the IDataReader.
		/// </summary>
		[Test]
		public void ReadWrite() 
		{
			BinaryClass bcBinary = Create( 1 );
			BinaryClass expected = Create( 1 );
			
			ISession s = sessions.OpenSession();
			s.Save( bcBinary );
			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			bcBinary = (BinaryClass)s.Load( typeof(BinaryClass), 1 );

			// make sure what was saved was expected
			ObjectAssert.AreEqual( expected.DefaultSize, bcBinary.DefaultSize );
			ObjectAssert.AreEqual( expected.WithSize, bcBinary.WithSize );

			s.Delete( bcBinary );
			s.Flush();
			s.Close();
		}

		private BinaryClass Create(int id) 
		{
			BinaryClass bcBinary = new BinaryClass();
			bcBinary.Id = id;

			bcBinary.DefaultSize = GetByteArray(5);
			bcBinary.WithSize = GetByteArray(10);

			return bcBinary;
		}

		private byte[] GetByteArray(int value) 
		{	
			BinaryFormatter bf = new BinaryFormatter();
			MemoryStream stream = new MemoryStream();
			bf.Serialize(stream, value);
			return stream.ToArray();
		}


	}
}

--- NEW FILE: StringClobTypeFixture.cs ---
using System;

using NUnit.Framework;

namespace NHibernate.Test.TypesTest
{
	/// <summary>
	/// Summary description for StringClobTypeFixture.
	/// </summary>
	[TestFixture]
	public class StringClobTypeFixture : TestCase
	{
		#region NUnit.Framework.TestFixture Members

		[TestFixtureSetUp]
		public void TestFixtureSetUp() 
		{
			ExportSchema( new string[] { "TypesTest.StringClobClass.hbm.xml"}, true, "NHibernate.Test" );
		}

		[SetUp]
		public void SetUp() 
		{
			// there are test in here where we don't need to resetup the 
			// tables - so only set the tables up once
		}

		[TearDown]
		public override void TearDown()
		{
			//base.TearDown ();
		}

		[TestFixtureTearDown]
		public void TestFixtureTearDown() 
		{
			// only do this at the end of the test fixture
			base.TearDown();
		}

		#endregion

		[Test]
		public void ReadWrite() 
		{
			ISession s = sessions.OpenSession();
			StringClobClass b = new StringClobClass();
			b.StringClob = "foo/bar/baz";
			s.Save(b);
			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			b = (StringClobClass)s.Load( typeof(StringClobClass), b.Id );
			Assert.AreEqual( "foo/bar/baz", b.StringClob );
			s.Delete( b );
			s.Flush();
			s.Close();
		}
	}
}

--- NEW FILE: DoubleClass.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 

<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">

    <class 
		name="NHibernate.Test.TypesTest.DoubleClass, NHibernate.Test" 
		table="bc_dub">
		
		<id name="Id" column="id">
			<generator class="assigned" />
		</id>
		
		<property name="DoubleValue" type="Double" column="doub"/>
	</class>
</hibernate-mapping>

--- NEW FILE: StringClobClass.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
	<class 
		name="NHibernate.Test.TypesTest.StringClobClass, NHibernate.Test"
		table="sclob"
	>
		<id name="Id" type="Int32">
			<generator class="hilo" />
		</id>
		
		<!-- 
			setting it to 100000 to get past the length that most dialects
			can hold in just a plain var binary column
		-->
		<property name="StringClob" column="clob_" type="StringClob" length="100000"/>
		
	</class>
</hibernate-mapping>

--- NEW FILE: DoubleTypeFixture.cs ---
using System;

using NHibernate.Type;
using NHibernate.Test.TypesTest;

using NUnit.Framework;

namespace NHibernate.Test.TypesTest
{
	/// <summary>
	/// Tests for mapping a Double Property to a database field.
	/// </summary>
	[TestFixture]
	public class DoubleTypeFixture : TestCase 
	{
		double[] _values = new double[2];

		#region NUnit.Framework.TestFixture Members

		[TestFixtureSetUp]
		public void TestFixtureSetUp() 
		{
			ExportSchema( new string[] { "TypesTest.DoubleClass.hbm.xml"}, true, "NHibernate.Test" );
		}

		[SetUp]
		public void SetUp() 
		{
			if( dialect is Dialect.OracleDialect ) 
			{
				_values[0] = 1.5e20;
				_values[1] = 1.2e-20;
			}
			else 
			{
				_values[0] = 1.5e35;
				_values[1] = 1.2e-35;
			}
		}

		[TearDown]
		public override void TearDown() 
		{
			// do nothing except not let the base TearDown get called
		}

		[TestFixtureTearDown]
		public void TestFixtureTearDown() 
		{
			base.TearDown();
		}

		#endregion

		/// <summary>
		/// Verify Equals will correctly determine when the property
		/// is dirty.
		/// </summary>
		[Test]
		public void Equals() 
		{
			DoubleType type = (DoubleType)NHibernate.Double;

			Assert.IsTrue( type.Equals( 1.5e20, 1.5e20 ) );
			Assert.IsFalse( type.Equals( 1.5e20, 1.4e20 ) );
		}

		[Test]
		public void ReadWrite() 
		{
			DoubleClass basic = new DoubleClass();
			basic.Id = 1;
			basic.DoubleValue = _values[0];

			ISession s = sessions.OpenSession();
			s.Save(basic);
			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			basic = (DoubleClass)s.Load( typeof(DoubleClass), 1 );

			Assert.AreEqual( _values[0], basic.DoubleValue );

			s.Delete( basic );
			s.Flush();
			s.Close();
		}
	}
}


--- NEW FILE: BinaryBlobTypeFixture.cs ---
using System;

using NHibernate;

using NUnit.Framework;

namespace NHibernate.Test.TypesTest
{
	/// <summary>
	/// Summary description for BinaryBlobTypeFixture.
	/// </summary>
	[TestFixture]
	public class BinaryBlobTypeFixture : TestCase 
	{
		#region NUnit.Framework.TestFixture Members

		[TestFixtureSetUp]
		public void TestFixtureSetUp() 
		{
			ExportSchema( new string[] { "TypesTest.BinaryBlobClass.hbm.xml"}, true, "NHibernate.Test" );
		}

		[SetUp]
		public void SetUp() 
		{
			// there are test in here where we don't need to resetup the 
			// tables - so only set the tables up once
		}

		[TearDown]
		public override void TearDown()
		{
			//base.TearDown ();
		}

		[TestFixtureTearDown]
		public void TestFixtureTearDown() 
		{
			// only do this at the end of the test fixture
			base.TearDown();
		}

		#endregion

		[Test]
		public void ReadWrite() 
		{
			ISession s = sessions.OpenSession();
			BinaryBlobClass b = new BinaryBlobClass();
			b.BinaryBlob = System.Text.UnicodeEncoding.UTF8.GetBytes("foo/bar/baz");
			s.Save(b);
			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			b = (BinaryBlobClass)s.Load( typeof(BinaryBlobClass), b.Id );
			ObjectAssert.AreEqual( System.Text.UnicodeEncoding.UTF8.GetBytes("foo/bar/baz") , b.BinaryBlob );
			s.Delete( b );
			s.Flush();
			s.Close();
		}
	}
}

--- NEW FILE: DoubleClass.cs ---
using System;

namespace NHibernate.Test.TypesTest
{
	/// <summary>
	/// Summary description for DoubleClass.
	/// </summary>
	public class DoubleClass
	{
		int _id;
		Double _doubleValue;

		public DoubleClass()
		{
		}

		public int Id 
		{
			get { return _id; }
			set { _id = value; }
		}

		public double DoubleValue
		{
			get {return _doubleValue;}
			set {_doubleValue = value;}
		}
		
	}
}


Index: ByteTypeFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/TypesTest/ByteTypeFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ByteTypeFixture.cs	22 Mar 2004 04:34:47 -0000	1.1
--- ByteTypeFixture.cs	12 Dec 2004 07:18:27 -0000	1.2
***************
*** 13,20 ****
  	public class ByteTypeFixture : BaseTypeFixture
  	{
- 		public ByteTypeFixture()
- 		{
- 		}
- 
  		/// <summary>
  		/// Test that Get(IDataReader, index) returns a boxed Byte value that is what
--- 13,16 ----

--- NEW FILE: BinaryClass.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 

<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">

    <class 
		name="NHibernate.Test.TypesTest.BinaryClass, NHibernate.Test" 
		table="bc_bin">
		
		<id name="Id" column="id">
			<generator class="assigned" />
		</id>
		
		<property name="DefaultSize" column="bin_def"/>
		<property name="WithSize" type="Byte[](2048880)" column="bin_size" />
	</class>
</hibernate-mapping>

--- NEW FILE: BinaryBlobClass.cs ---
using System;

namespace NHibernate.Test.TypesTest
{
	/// <summary>
	/// Summary description for BinaryBlobClass.
	/// </summary>
	public class BinaryBlobClass
	{
		private int _id;
		private byte[] _blob;
		private string _clob;

		public int Id
		{
			get { return _id; }
			set { _id = value; }
		}

		public byte[] BinaryBlob
		{
			get { return _blob; }
			set { _blob = value; }
		}
	}
}

--- NEW FILE: BinaryClass.cs ---
using System;

namespace NHibernate.Test.TypesTest
{
	/// <summary>
	/// Summary description for BinaryClass.
	/// </summary>
	public class BinaryClass
	{
		int _id;
		byte[] _defaultSize;
		byte[] _withSize;

		public BinaryClass()
		{
		}

		public int Id 
		{
			get { return _id; }
			set { _id = value; }
		}

		public byte[] DefaultSize
		{
			get {return _defaultSize;}
			set {_defaultSize = value;}
		}

		public byte[] WithSize
		{
			get {return _withSize;}
			set {_withSize = value;}
		}

		
		
	}
}

--- NEW FILE: StringClobClass.cs ---
using System;

namespace NHibernate.Test.TypesTest
{
	/// <summary>
	/// Summary description for StringClobClass.
	/// </summary>
	public class StringClobClass
	{
		private int _id;
		private string _clob;

		public int Id
		{
			get { return _id; }
			set { _id = value; }
		}

		public string StringClob
		{
			get { return _clob; }
			set { _clob = value; }
		}
	}
}

[Nhibernate-commit] nhibernate/src/NHibernate.Test/NHSpecificTest BasicClassFixture.cs,1.10,1.11 BasicBinaryFixture.cs,1.5,NONE BasicDoubleFixture.cs,1.1,NONE BlobberInMemoryFixture.cs,1.1,NONE

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

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

Modified Files:
	BasicClassFixture.cs 
Removed Files:
	BasicBinaryFixture.cs BasicDoubleFixture.cs 
	BlobberInMemoryFixture.cs 
Log Message:
Moved classes out of NHSpecific and into appropriate folder in Test
project.


--- BlobberInMemoryFixture.cs DELETED ---

--- BasicDoubleFixture.cs DELETED ---

Index: BasicClassFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHSpecificTest/BasicClassFixture.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BasicClassFixture.cs	24 Nov 2004 14:34:44 -0000	1.10
--- BasicClassFixture.cs	12 Dec 2004 07:18:24 -0000	1.11
***************
*** 907,916 ****
  			if(includeCollections) 
  			{
! 				ObjectAssert.AssertEquals(expected.StringArray, actual.StringArray);
! 				ObjectAssert.AssertEquals(expected.Int32Array, actual.Int32Array);
! 				ObjectAssert.AssertEquals(expected.StringBag, actual.StringBag, false);
! 				ObjectAssert.AssertEquals(expected.StringList, actual.StringList);
! 				ObjectAssert.AssertEquals(expected.StringMap, actual.StringMap, true);
! 				ObjectAssert.AssertEquals(expected.StringSet, actual.StringSet );
  			}
  		}
--- 907,916 ----
  			if(includeCollections) 
  			{
! 				ObjectAssert.AreEqual(expected.StringArray, actual.StringArray);
! 				ObjectAssert.AreEqual(expected.Int32Array, actual.Int32Array);
! 				ObjectAssert.AreEqual(expected.StringBag, actual.StringBag, false);
! 				ObjectAssert.AreEqual(expected.StringList, actual.StringList);
! 				ObjectAssert.AreEqual(expected.StringMap, actual.StringMap, true);
! 				ObjectAssert.AreEqual(expected.StringSet, actual.StringSet );
  			}
  		}

--- BasicBinaryFixture.cs DELETED ---

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel/NHSpecific BasicBinary.cs,1.1,NONE BasicBinary.hbm.xml,1.2,NONE BasicDouble.cs,1.1,NONE BasicDouble.hbm.xml,1.1,NONE BlobberInMemory.cs,1.1,NONE BlobberInMemory.hbm.xml,1.1,NONE

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

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

Removed Files:
	BasicBinary.cs BasicBinary.hbm.xml BasicDouble.cs 
	BasicDouble.hbm.xml BlobberInMemory.cs BlobberInMemory.hbm.xml 
Log Message:
Moved classes out of NHSpecific and into appropriate folder in Test
project.


--- BlobberInMemory.cs DELETED ---

--- BlobberInMemory.hbm.xml DELETED ---

--- BasicDouble.hbm.xml DELETED ---

--- BasicDouble.cs DELETED ---

--- BasicBinary.hbm.xml DELETED ---

--- BasicBinary.cs DELETED ---

[Nhibernate-commit] nhibernate/src/NHibernate/Impl CollectionEntry.cs,1.1,1.2

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

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

Modified Files:
	CollectionEntry.cs 
Log Message:
Removed a ClassWithCompositeIdFixture that was moved to a 
diff namespace.
Changed scope on a CollectionEntry.

Index: CollectionEntry.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/CollectionEntry.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CollectionEntry.cs	9 Dec 2004 22:08:54 -0000	1.1
--- CollectionEntry.cs	11 Dec 2004 20:58:46 -0000	1.2
***************
*** 12,16 ****
  	/// </summary>
  	[Serializable]
! 	public class CollectionEntry : ICollectionSnapshot 
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(CollectionEntry) );
--- 12,16 ----
  	/// </summary>
  	[Serializable]
! 	internal class CollectionEntry : ICollectionSnapshot 
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(CollectionEntry) );

[Nhibernate-commit] nhibernate/src/NHibernate.Test/NHSpecificTest ClassWithCompositeIdFixture.cs,1.6,NONE

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

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

Removed Files:
	ClassWithCompositeIdFixture.cs 
Log Message:
Removed a ClassWithCompositeIdFixture that was moved to a 
diff namespace.
Changed scope on a CollectionEntry.

--- ClassWithCompositeIdFixture.cs DELETED ---

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.64,1.65 NHibernate.cs,1.23,1.24

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

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

Modified Files:
	NHibernate-1.1.csproj NHibernate.cs 
Log Message:
NH-151: added SByteType and Fixture for it
Moved nh specific CompositeId tests to their own namespace.

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** NHibernate-1.1.csproj	11 Dec 2004 16:28:27 -0000	1.64
--- NHibernate-1.1.csproj	11 Dec 2004 20:08:12 -0000	1.65
***************
*** 1904,1907 ****
--- 1904,1912 ----
                  />
                  <File
+                     RelPath = "Type\SByteType.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Type\SerializableType.cs"
                      SubType = "Code"

Index: NHibernate.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** NHibernate.cs	9 Dec 2004 17:52:14 -0000	1.23
--- NHibernate.cs	11 Dec 2004 20:08:16 -0000	1.24
***************
*** 92,95 ****
--- 92,100 ----
  
  		/// <summary>
+ 		/// NHibernate System.SByte type
+ 		/// </summary>
+ 		public static readonly NullableType SByte = new SByteType(); 
+ 
+ 		/// <summary>
  		/// NHIbernate System.Single (float in C#) Type
  		/// </summary>

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel NHibernate.DomainModel-1.1.csproj,1.27,1.28

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

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

Modified Files:
	NHibernate.DomainModel-1.1.csproj 
Log Message:
NH-151: added SByteType and Fixture for it
Moved nh specific CompositeId tests to their own namespace.

Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** NHibernate.DomainModel-1.1.csproj	10 Dec 2004 16:40:01 -0000	1.27
--- NHibernate.DomainModel-1.1.csproj	11 Dec 2004 20:08:16 -0000	1.28
***************
*** 690,702 ****
                  />
                  <File
-                     RelPath = "NHSpecific\ClassWithCompositeId.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "NHSpecific\ClassWithCompositeId.hbm.xml"
-                     BuildAction = "EmbeddedResource"
-                 />
-                 <File
                      RelPath = "NHSpecific\ClassWithNullColumns.cs"
                      SubType = "Code"
--- 690,693 ----
***************
*** 708,716 ****
                  />
                  <File
-                     RelPath = "NHSpecific\CompositeId.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "NHSpecific\Node.cs"
                      SubType = "Code"
--- 699,702 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Type SByteType.cs,NONE,1.1 TypeFactory.cs,1.39,1.40

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

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

Modified Files:
	TypeFactory.cs 
Added Files:
	SByteType.cs 
Log Message:
NH-151: added SByteType and Fixture for it
Moved nh specific CompositeId tests to their own namespace.

--- NEW FILE: SByteType.cs ---
using System;
using System.Data;

using NHibernate.Engine;
using NHibernate.SqlTypes;

namespace NHibernate.Type 
{
	/// <summary>
	/// Maps a <see cref="System.SByte"/> Property 
	/// to a <see cref="DbType.SByte"/> column.
	/// </summary>
	public class SByteType : ValueTypeType, IDiscriminatorType 
	{
		
		internal SByteType() : base( new SByteSqlType() ) 
		{
		}

		public override object Get(IDataReader rs, int index) 
		{
			return Convert.ToSByte(rs[index]); 
		}

		public override object Get(IDataReader rs, string name) 
		{
			return Convert.ToSByte(rs[name]);
		}

		public override System.Type ReturnedClass 
		{
			get { return typeof(SByte); }
		}
		
		public override void Set(IDbCommand cmd, object value, int index) 
		{
			( (IDataParameter)cmd.Parameters[index] ).Value = (SByte) value;
		}

		public override string Name 
		{
			get { return "SByte"; }
		}

		public override string ObjectToSQLString(object value) 
		{
			return value.ToString();
		}

		public virtual object StringToObject(string xml) 
		{
			return SByte.Parse(xml);
		}
	}
}

Index: TypeFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TypeFactory.cs,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** TypeFactory.cs	4 Dec 2004 22:24:17 -0000	1.39
--- TypeFactory.cs	11 Dec 2004 20:08:20 -0000	1.40
***************
*** 102,105 ****
--- 102,107 ----
  			typeByTypeOfName[ typeof(System.Int64).FullName ] = NHibernate.Int64;
  			typeByTypeOfName[ typeof(System.Int64).AssemblyQualifiedName ] = NHibernate.Int64;
+ 			typeByTypeOfName[ typeof(System.SByte).FullName ] = NHibernate.SByte;
+ 			typeByTypeOfName[ typeof(System.SByte).AssemblyQualifiedName ] = NHibernate.SByte;
  			typeByTypeOfName[ typeof(System.Single).FullName ] = NHibernate.Single;
  			typeByTypeOfName[ typeof(System.Single).AssemblyQualifiedName ] = NHibernate.Single;
***************
*** 126,129 ****
--- 128,132 ----
  			typeByTypeOfName[ NHibernate.Int32.Name ] = NHibernate.Int32;
  			typeByTypeOfName[ NHibernate.Int64.Name ] = NHibernate.Int64;
+ 			typeByTypeOfName[ NHibernate.SByte.Name ] = NHibernate.SByte;
  			typeByTypeOfName[ NHibernate.String.Name ] = NHibernate.String;
  			typeByTypeOfName[ NHibernate.Single.Name ] = NHibernate.Single;