nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/src/NHibernate.Test/NHSpecificTest BasicTimeFixture.cs,NONE,1.1

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

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

Added Files:
	BasicTimeFixture.cs 
Log Message:
Moved TimeType to its own test classes in the NHSpecific area and out
of the ported classes.  MySql does not follow the DbType.Time docs so
this will help to isolate failing tests to just that datatype.

--- NEW FILE: BasicTimeFixture.cs ---

using System;

using NHibernate.DomainModel.NHSpecific;

using NUnit.Framework;

namespace NHibernate.Test.NHSpecificTest
{
	/// <summary>
	/// Tests for mapping a type="Time" for a DateTime Property to a database field.
	/// </summary>
	[TestFixture]
	public class BasicTimeFixture : TestCase
	{
		[SetUp]
		public void SetUp() 
		{
			ExportSchema( new string[] { "NHSpecific.BasicTime.hbm.xml"}, true );
		}

		[Test]
		public void Insert() 
		{
			BasicTime basic = Create(1);

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

			s = sessions.OpenSession();

			BasicTime basicLoaded = (BasicTime)s.Load( typeof(BasicTime), 1 );

			Assert.IsNotNull( basicLoaded );
			Assert.IsFalse( basic==basicLoaded );

			Assert.AreEqual( basic.TimeValue.Hour, basicLoaded.TimeValue.Hour );
			Assert.AreEqual( basic.TimeValue.Minute, basicLoaded.TimeValue.Minute );
			Assert.AreEqual( basic.TimeValue.Second, basicLoaded.TimeValue.Second );

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

		[Test]
		public void TimeArray() 
		{
			BasicTime basic = Create(1);

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

			s = sessions.OpenSession();

			BasicTime basicLoaded = (BasicTime)s.Load( typeof(BasicTime), 1 );

			Assert.AreEqual( 0, basicLoaded.TimeArray.Length );

			basicLoaded.TimeArray = new DateTime[] {new DateTime( 2000, 01, 01, 12, 1, 1 ), new DateTime(1500, 1, 1) }; 
			
			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			basic = (BasicTime)s.Load( typeof(BasicTime), 1 );
			// make sure the 0 index saved with values in Time
			Assert.AreEqual( 12, basic.TimeArray[0].Hour );
			Assert.AreEqual( 1, basic.TimeArray[0].Minute );
			Assert.AreEqual( 1, basic.TimeArray[0].Second );

			// make sure the value below 1753 was not written to db - per msdn docs
			// meaning of DbType.Time.  If not written to the db it will have the value
			// of an uninitialized DateTime - which is the min value.
			Assert.AreEqual( DateTime.MinValue, basic.TimeArray[1], "date before 1753 should not have been written" );
			s.Delete( basic );
			s.Flush();
			s.Close();

		}

		[Test]
		public void Update() 
		{
			BasicTime basic = Create(1);
			
			ISession s = sessions.OpenSession();
			s.Save( basic );
			s.Flush();
			s.Close();

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

			basic.TimeValue = new DateTime( 2000, 12, 1, 13, 1, 2 );

			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			// make sure the update went through
			BasicTime basicLoaded = (BasicTime)s.Load( typeof(BasicTime), 1 );

			Assert.AreEqual( 13, basicLoaded.TimeValue.Hour );
			Assert.AreEqual( 1, basicLoaded.TimeValue.Minute );
			Assert.AreEqual( 2, basicLoaded.TimeValue.Second );
			
			s.Delete( basicLoaded );
			s.Flush();
			s.Close();
		}

		private BasicTime Create(int id) 
		{
			BasicTime basic = new BasicTime();
			basic.Id = id;

			basic.TimeValue = new DateTime(1753, 01, 01, 12, 00, 00, 00 );

			return basic;
		}

	}
}

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel/NHSpecific BasicTime.cs,NONE,1.1 BasicTime.hbm.xml,NONE,1.1

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

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

Added Files:
	BasicTime.cs BasicTime.hbm.xml 
Log Message:
Moved TimeType to its own test classes in the NHSpecific area and out
of the ported classes.  MySql does not follow the DbType.Time docs so
this will help to isolate failing tests to just that datatype.

--- NEW FILE: BasicTime.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">

    <class 
		name="NHibernate.DomainModel.NHSpecific.BasicTime, NHibernate.DomainModel" 
		table="bc_time"
	>
		
		<id name="Id" column="id">
			<generator class="assigned" />
		</id>
		
		<property name="TimeValue" type="Time" column="timecol"/>
		
		<array name="TimeArray" table="bct_arr">
			<key>
				<column name="bct_id" length="16" />
			</key>
			<index column="j"/>
			<element type="Time" column="the_time" />
		</array>
	</class>
</hibernate-mapping>

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

namespace NHibernate.DomainModel.NHSpecific
{
	/// <summary>
	/// Summary description for BasicTime.
	/// </summary>
	public class BasicTime
	{
		private int _id;
		private DateTime _timeValue;
		private DateTime[] _timeArray;

		public BasicTime()
		{
		}

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

		public DateTime TimeValue
		{
			get { return _timeValue; }
			set { _timeValue = value; }
		}

		public DateTime[] TimeArray
		{
			get { return _timeArray; }
			set { _timeArray = value; }
		}

	}
}

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Baz.cs,1.9,1.10 Baz.hbm.xml,1.16,1.17 FooBar.hbm.xml,1.17,1.18 NHibernate.DomainModel-1.1.csproj,1.24,1.25

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

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

Modified Files:
	Baz.cs Baz.hbm.xml FooBar.hbm.xml 
	NHibernate.DomainModel-1.1.csproj 
Log Message:
Moved TimeType to its own test classes in the NHSpecific area and out
of the ported classes.  MySql does not follow the DbType.Time docs so
this will help to isolate failing tests to just that datatype.

Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FooBar.hbm.xml	1 Sep 2004 00:10:11 -0000	1.17
--- FooBar.hbm.xml	3 Nov 2004 03:37:05 -0000	1.18
***************
*** 124,128 ****
  					<key column="foo_id"/>
  					<index column="i"/>
! 					<element column="date_" type="Time"/>
  				</array>
  				
--- 124,132 ----
  					<key column="foo_id"/>
  					<index column="i"/>
! 					<element column="date_" type="DateTime"/>
! 					<!-- 
! 						in the hibernate test this was a type="time", but in nh the functionallity
! 						between type="Time" and type="Time" is not quite the same
! 					-->
  				</array>
  				

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Baz.hbm.xml	28 Jul 2004 15:08:18 -0000	1.16
--- Baz.hbm.xml	3 Nov 2004 03:37:05 -0000	1.17
***************
*** 112,128 ****
  			</composite-element>
  		</array>
! 		<array name="TimeArray">
! 			<key>
! 				<column 
! 					name="baz_id" 
! 					length="16"
! 				/>
! 			</key>
! 			<index column="j"/>
! 			<element 
! 				column="the_time" 
! 				type="Time"
! 			/>
! 		</array>
  		<bag 
  			name="Bag" 
--- 112,116 ----
  			</composite-element>
  		</array>
! 		
  		<bag 
  			name="Bag" 

Index: Baz.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Baz.cs	29 Jun 2004 14:26:27 -0000	1.9
--- Baz.cs	3 Nov 2004 03:37:05 -0000	1.10
***************
*** 20,24 ****
  	private NestingComponent _collectionComponent; 
  	private String _code;
- 	private DateTime[] _timeArray;
  	private FooComponent[] _components;
  	private string[] _stringArray;
--- 20,23 ----
***************
*** 395,413 ****
  	
  	 /// <summary>
- 	 /// Gets or sets the _timeArray
- 	 /// </summary> 
- 	 public DateTime[] TimeArray
- 	 {
- 		 get 
- 		 {
- 			 return _timeArray; 
- 		 }
- 		 set 
- 		 {
- 			 _timeArray = value;
- 		 }
- 	 }
- 
- 	/// <summary>
  	/// Get/set for stringSet
  	/// </summary>
--- 394,397 ----
***************
*** 588,593 ****
  											 new FooComponent("bar", 88, null, new FooComponent("sub", 69, null, null) )
  										 };
- 		 TimeArray = new DateTime[] { new DateTime(), new DateTime(), DateTime.MinValue, new DateTime(0) };
- 		
  		 Count = 667;
  		 Name="Bazza";
--- 572,575 ----

Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** NHibernate.DomainModel-1.1.csproj	1 Sep 2004 00:10:11 -0000	1.24
--- NHibernate.DomainModel-1.1.csproj	3 Nov 2004 03:37:05 -0000	1.25
***************
*** 658,661 ****
--- 658,670 ----
                  />
                  <File
+                     RelPath = "NHSpecific\BasicTime.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "NHSpecific\BasicTime.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
                      RelPath = "NHSpecific\BlobberInMemory.cs"
                      SubType = "Code"

[Nhibernate-commit] nhibernate/src/NHibernate AssemblyInfo.cs,1.10,1.11

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
commend out attribute for key file.

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/AssemblyInfo.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AssemblyInfo.cs	3 Nov 2004 02:03:13 -0000	1.10
--- AssemblyInfo.cs	3 Nov 2004 02:23:16 -0000	1.11
***************
*** 20,23 ****
  [assembly: AssemblyInformationalVersionAttribute("0.4")]
  [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
! [assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  
--- 20,23 ----
  [assembly: AssemblyInformationalVersionAttribute("0.4")]
  [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
! //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.13,1.14

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

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

Modified Files:
	NHibernateSolution.build 
Log Message:
results of alpha build 0.4

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NHibernateSolution.build	13 Oct 2004 04:42:49 -0000	1.13
--- NHibernateSolution.build	3 Nov 2004 02:04:02 -0000	1.14
***************
*** 19,23 ****
  	<property name="project.name" value="nhibernate" />
  	<property name="project.version.major" value="0" />
! 	<property name="project.version.minor" value="3" />
  	<property name="project.version.build" value="0" />
  	<property name="project.version.revision" value="0" />
--- 19,23 ----
  	<property name="project.name" value="nhibernate" />
  	<property name="project.version.major" value="0" />
! 	<property name="project.version.minor" value="4" />
  	<property name="project.version.build" value="0" />
  	<property name="project.version.revision" value="0" />

[Nhibernate-commit] nhibernate/src/NHibernate AssemblyInfo.cs,1.9,1.10

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
results of alpha build 0.4

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/AssemblyInfo.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssemblyInfo.cs	24 Sep 2004 04:17:23 -0000	1.9
--- AssemblyInfo.cs	3 Nov 2004 02:03:13 -0000	1.10
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
! //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
! [assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Tasks AssemblyInfo.cs,1.3,1.4

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
results of alpha build 0.4

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Tasks/AssemblyInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssemblyInfo.cs	24 Sep 2004 04:17:23 -0000	1.3
--- AssemblyInfo.cs	3 Nov 2004 02:03:21 -0000	1.4
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.Tasks")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.Tasks")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel AssemblyInfo.cs,1.8,1.9

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
results of alpha build 0.4

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/AssemblyInfo.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AssemblyInfo.cs	24 Sep 2004 04:17:23 -0000	1.8
--- AssemblyInfo.cs	3 Nov 2004 02:03:15 -0000	1.9
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.DomainModel")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.DomainModel")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test AssemblyInfo.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-serv28831/src/NHibernate.Test

Modified Files:
	AssemblyInfo.cs 
Log Message:
results of alpha build 0.4

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/AssemblyInfo.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AssemblyInfo.cs	24 Sep 2004 04:17:24 -0000	1.8
--- AssemblyInfo.cs	3 Nov 2004 02:03:21 -0000	1.9
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.Test")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.Test")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Tool.hbm2net AssemblyInfo.cs,1.4,1.5

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
results of alpha build 0.4

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Tool.hbm2net/AssemblyInfo.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AssemblyInfo.cs	24 Sep 2004 04:17:24 -0000	1.4
--- AssemblyInfo.cs	3 Nov 2004 02:03:21 -0000	1.5
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.Tool.hbm2net")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.Tool.hbm2net")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate/Id IdentifierGeneratorFactory.cs,1.11,1.12

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

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

Modified Files:
	IdentifierGeneratorFactory.cs 
Log Message:
removed mssql specific use of GetDecimal.  MySql has a slightly
different return type.

Index: IdentifierGeneratorFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IdentifierGeneratorFactory.cs	11 Oct 2004 23:57:54 -0000	1.11
--- IdentifierGeneratorFactory.cs	1 Nov 2004 16:26:04 -0000	1.12
***************
*** 5,9 ****
  using NHibernate.Type;
  
- 
  namespace NHibernate.Id 
  {
--- 5,8 ----
***************
*** 11,41 ****
  	/// Factory methods for <c>IdentifierGenerator</c> framework.
  	/// </summary>
! 	public sealed class IdentifierGeneratorFactory {
! 		public static object Get(IDataReader rs, System.Type clazz) {
! 			
! 			// here is an interesting one - MsSql's @@identity returns a
! 			// numeric - which translates to a C# decimal type.  I don't know
! 			// if this is specific to the SqlServer provider or other providers
! 			
! 			decimal identityValue = rs.GetDecimal(0);
! 
! 			if (clazz==typeof(long)) 
! 			{
! 				return (long)identityValue;
! 				//return (long)rs[0];
! 			} 
! 			else if (clazz==typeof(int)) 
! 			{
! 				return (int)identityValue;
! 				//return (int)rs.[0];
! 			} 
! 			else if (clazz==typeof(short)) 
  			{
! 				return (short)identityValue;
! 				//return (short)rs[0];
! 			} 
! 			else 
  			{
! 				throw new IdentifierGenerationException("this id generator generates Int64, Int32, Int16");
  			}
  		}
--- 10,28 ----
  	/// Factory methods for <c>IdentifierGenerator</c> framework.
  	/// </summary>
! 	public sealed class IdentifierGeneratorFactory 
! 	{
! 		public static object Get(IDataReader rs, System.Type clazz) 
! 		{
! 			// here is an interesting one: 
! 			// - MsSql's @@identity returns a numeric - which translates to a C# decimal type.  
! 			// - MySql LAST_IDENITY() returns an Int64 			
! 			try 
  			{
! 				object identityValue = rs[0]; 
! 				return Convert.ChangeType( identityValue, clazz );
! 			}
! 			catch( Exception e ) 
  			{
! 				throw new IdentifierGenerationException("this id generator generates Int64, Int32, Int16", e);
  			}
  		}

[Nhibernate-commit] nhibernate/src/NHibernate/Impl FilterImpl.cs,1.7,1.8 QueryImpl.cs,1.14,1.15 SessionImpl.cs,1.45,1.46

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

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

Modified Files:
	FilterImpl.cs QueryImpl.cs SessionImpl.cs 
Log Message:
Added class QueryParameters to reduce the number of params in 
methods.  It was taken from h2.1.6

Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** SessionImpl.cs	13 Oct 2004 12:38:37 -0000	1.45
--- SessionImpl.cs	31 Oct 2004 04:31:00 -0000	1.46
***************
*** 1564,1580 ****
  		public IList Find(string query, object[] values, IType[] types) 
  		{
! 			return Find(query, values, types, null, null, null);
  		}
  
! 		public IList Find(string query, object[] values, IType[] types, RowSelection selection, IDictionary namedParams,
! 			IDictionary lockModes) 
  		{
- 
  			if ( log.IsDebugEnabled ) 
  			{
  				log.Debug( "find: " + query);
! 				if (values.Length!=0) log.Debug( "parameters: " + StringHelper.ToString(values) );
  			}
  
  			QueryTranslator[] q = GetQueries(query, false);
  
--- 1564,1580 ----
  		public IList Find(string query, object[] values, IType[] types) 
  		{
! 			return Find(query, new QueryParameters( types, values ) ) ;
  		}
  
! 		public IList Find(string query, QueryParameters parameters) 
  		{
  			if ( log.IsDebugEnabled ) 
  			{
  				log.Debug( "find: " + query);
! 				parameters.LogParameters();
  			}
  
+ 			parameters.ValidateParameters();
+ 
  			QueryTranslator[] q = GetQueries(query, false);
  
***************
*** 1591,1595 ****
  					try 
  					{
! 						currentResults = q[i].FindList(this, values, types, true, selection, namedParams, lockModes);
  					} 
  					catch (Exception e) 
--- 1591,1595 ----
  					try 
  					{
! 						currentResults = q[i].FindList(this, parameters, true);
  					} 
  					catch (Exception e) 
***************
*** 1598,1602 ****
  					}
  					
! 					for (int j=0;j<results.Count;j++) {
  						currentResults.Add( results[j] );
  					}
--- 1598,1603 ----
  					}
  					
! 					for (int j=0;j<results.Count;j++) 
! 					{
  						currentResults.Add( results[j] );
  					}
***************
*** 1609,1612 ****
--- 1610,1614 ----
  			}
  			return results;
+ 
  		}
  
***************
*** 1643,1656 ****
  		public IEnumerable Enumerable(string query, object[] values, IType[] types) 
  		{
! 			return Enumerable(query, values, types, null, null, null);
  		}
  
! 		public IEnumerable Enumerable(string query, object[] values, IType[] types, RowSelection selection, 
! 			IDictionary namedParams, IDictionary lockModes) 
  		{
  			if ( log.IsDebugEnabled ) 
  			{
  				log.Debug( "GetEnumerable: " + query );
! 				if (values.Length!=0) log.Debug( "parameters: " + StringHelper.ToString(values) );
  			}
  
--- 1645,1657 ----
  		public IEnumerable Enumerable(string query, object[] values, IType[] types) 
  		{
! 			return Enumerable( query, new QueryParameters( types, values ) );
  		}
  
! 		public IEnumerable Enumerable(string query, QueryParameters parameters) 
  		{
  			if ( log.IsDebugEnabled ) 
  			{
  				log.Debug( "GetEnumerable: " + query );
! 				parameters.LogParameters();
  			}
  
***************
*** 1662,1666 ****
  			IEnumerable[] results = null;
  			bool many = q.Length>1;
! 			if (many) results = new IEnumerable[q.Length];
  
  			//execute the queries and return all results as a single enumerable
--- 1663,1670 ----
  			IEnumerable[] results = null;
  			bool many = q.Length>1;
! 			if( many ) 
! 			{
! 				results = new IEnumerable[q.Length];
! 			}
  
  			//execute the queries and return all results as a single enumerable
***************
*** 1669,1673 ****
  				try 
  				{
! 					result = q[i].GetEnumerable(values, types, selection, namedParams, lockModes, this);
  				} 
  				catch (Exception e) 
--- 1673,1677 ----
  				try 
  				{
! 					result = q[i].GetEnumerable( parameters, this );
  				} 
  				catch (Exception e) 
***************
*** 1684,1690 ****
  		}
  
- 		//TODO: new in H2.0.3 - missing parameters.
- 		//public IScrollableResults scroll() {}
- 
  		public int Delete(string query) 
  		{
--- 1688,1691 ----
***************
*** 3606,3615 ****
  		public ICollection Filter(object collection, string filter) 
  		{
! 			return Filter( collection, filter, new object[1], new IType[1], null, null, null);
  		}
  
  		public ICollection Filter(object collection, string filter, object value, IType type) 
  		{
! 			return Filter( collection, filter, new object[] { null, value }, new IType[] { null, type }, null, null, null );
  		}
  
--- 3607,3618 ----
  		public ICollection Filter(object collection, string filter) 
  		{
! 			QueryParameters qp = new QueryParameters( new IType[1], new object[1] );
! 			return Filter( collection, filter, qp );
  		}
  
  		public ICollection Filter(object collection, string filter, object value, IType type) 
  		{
! 			QueryParameters qp = new QueryParameters( new IType[] { null, type }, new object[] { null, value } );
! 			return Filter( collection, filter, qp );
  		}
  
***************
*** 3618,3624 ****
  			object[] vals = new object[ values.Length + 1 ];
  			IType[] typs = new IType[ values.Length + 1 ];
! 			Array.Copy(values, 0, vals, 1, values.Length);
! 			Array.Copy(types, 0, typs, 1, types.Length);
! 			return Filter(collection, filter, vals, typs, null, null, null);
  		}
  
--- 3621,3628 ----
  			object[] vals = new object[ values.Length + 1 ];
  			IType[] typs = new IType[ values.Length + 1 ];
! 			Array.Copy( values, 0, vals, 1, values.Length );
! 			Array.Copy( types, 0, typs, 1, types.Length );
! 			QueryParameters qp = new QueryParameters( typs, vals );
! 			return Filter( collection, filter, qp );
  		}
  
***************
*** 3630,3645 ****
  		/// <param name="collection"></param>
  		/// <param name="filter"></param>
! 		/// <param name="values"></param>
! 		/// <param name="types"></param>
! 		/// <param name="selection"></param>
! 		/// <param name="namedParams"></param>
  		/// <param name="scalar"></param>
  		/// <returns></returns>
! 		private FilterTranslator GetFilterTranslator(object collection, string filter, object[] values, IType[] types, RowSelection selection, IDictionary namedParams, bool scalar) 
  		{
  			if ( log.IsDebugEnabled ) 
  			{
  				log.Debug( "filter: " + filter );
! 				if ( values.Length!=0 ) log.Debug( "parameters: " + StringHelper.ToString(values) );
  			}
  
--- 3634,3646 ----
  		/// <param name="collection"></param>
  		/// <param name="filter"></param>
! 		/// <param name="parameters"></param>
  		/// <param name="scalar"></param>
  		/// <returns></returns>
! 		private FilterTranslator GetFilterTranslator(object collection, string filter, QueryParameters parameters, bool scalar) 
  		{
  			if ( log.IsDebugEnabled ) 
  			{
  				log.Debug( "filter: " + filter );
! 				parameters.LogParameters();
  			}
  
***************
*** 3673,3678 ****
  			}
  			
! 			values[0] = e.loadedKey;
! 			types[0] = e.loadedPersister.KeyType;
  
  			return q;
--- 3674,3679 ----
  			}
  			
! 			parameters.PositionalParameterValues[0] = e.loadedKey;
! 			parameters.PositionalParameterTypes[0] = e.loadedPersister.KeyType;
  
  			return q;
***************
*** 3680,3687 ****
  		}
  
! 		public IList Filter(object collection, string filter, object[] values, IType[] types, RowSelection selection, 
! 			IDictionary namedParams, IDictionary lockModes) 
  		{
- 
  			string[] concreteFilters = QueryTranslator.ConcreteQueries(filter, factory);
  			FilterTranslator[] filters = new FilterTranslator[ concreteFilters.Length ];
--- 3681,3686 ----
  		}
  
! 		public IList Filter(object collection, string filter, QueryParameters parameters) 
  		{
  			string[] concreteFilters = QueryTranslator.ConcreteQueries(filter, factory);
  			FilterTranslator[] filters = new FilterTranslator[ concreteFilters.Length ];
***************
*** 3689,3693 ****
  			for ( int i=0; i<concreteFilters.Length; i++ ) 
  			{
! 				filters[i] = GetFilterTranslator(collection, concreteFilters[i], values, types, selection, namedParams, false);
  			}
  
--- 3688,3697 ----
  			for ( int i=0; i<concreteFilters.Length; i++ ) 
  			{
! 				filters[i] = GetFilterTranslator(
! 					collection, 
! 					concreteFilters[i], 
! 					parameters, 
! 					false );
! 					
  			}
  
***************
*** 3702,3706 ****
  					try 
  					{
! 						currentResults = filters[i].FindList(this, values, types, true, selection, namedParams, lockModes);
  					} 
  					catch (Exception e) 
--- 3706,3710 ----
  					try 
  					{
! 						currentResults = filters[i].FindList( this, parameters, true );
  					} 
  					catch (Exception e) 
***************
*** 3722,3729 ****
  		}
  
! 		public IEnumerable EnumerableFilter(object collection, string filter, object[] values, IType[] types, 
! 			RowSelection selection, IDictionary namedParams, IDictionary lockModes) 
  		{
- 
  			string[] concreteFilters = QueryTranslator.ConcreteQueries(filter, factory);
  			FilterTranslator[] filters = new FilterTranslator[ concreteFilters.Length ];
--- 3726,3731 ----
  		}
  
! 		public IEnumerable EnumerableFilter(object collection, string filter, QueryParameters parameters) 
  		{
  			string[] concreteFilters = QueryTranslator.ConcreteQueries(filter, factory);
  			FilterTranslator[] filters = new FilterTranslator[ concreteFilters.Length ];
***************
*** 3731,3735 ****
  			for (int i=0; i<concreteFilters.Length; i++ ) 
  			{
! 				filters[i] = GetFilterTranslator(collection, concreteFilters[i], values, types, selection, namedParams, true);
  			}
  
--- 3733,3741 ----
  			for (int i=0; i<concreteFilters.Length; i++ ) 
  			{
! 				filters[i] = GetFilterTranslator(
! 					collection, 
! 					concreteFilters[i], 
! 					parameters,
! 					true);
  			}
  
***************
*** 3746,3750 ****
  				try 
  				{ 
! 					result = filters[i].GetEnumerable(values, types, selection, namedParams, lockModes, this);
  				} 
  				catch (Exception e) 
--- 3752,3756 ----
  				try 
  				{ 
! 					result = filters[i].GetEnumerable( parameters, this );
  				} 
  				catch (Exception e) 

Index: QueryImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/QueryImpl.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** QueryImpl.cs	22 Aug 2004 06:25:06 -0000	1.14
--- QueryImpl.cs	31 Oct 2004 04:31:00 -0000	1.15
***************
*** 27,36 ****
  		}
  
! 		public virtual IEnumerable Enumerable() {
! 			IDictionary namedParams = new Hashtable( namedParameters );
! 			
! 			string query = BindParameterLists(namedParams);
! 			return session.Enumerable(query, (object[]) values.ToArray(typeof(object)), 
! 				(IType[]) types.ToArray(typeof(IType)), selection, namedParams, lockModes);
  		}
  
--- 27,42 ----
  		}
  
! 		public virtual IEnumerable Enumerable() 
! 		{
! 			//TODO: see if there is a better way to implement
! 			QueryParameters qp = new QueryParameters( 
! 				(IType[])types.ToArray( typeof(IType) ),
! 				(object[])values.ToArray( typeof(object) ), 
! 				new Hashtable( namedParameters ),
! 				lockModes,
! 				selection );
! 
! 			string query = BindParameterLists( qp.NamedParameters );
! 			return session.Enumerable( query, qp );
  		}
  
***************
*** 45,54 ****
  		}
  
! 	    public virtual IList List() {
! 			IDictionary namedParams = new Hashtable( namedParameters );
! 			
! 			string query = BindParameterLists(namedParams);
! 			return session.Find(query, (object[]) values.ToArray(typeof(object)), (IType[]) types.ToArray(typeof(IType)), 
! 				selection, namedParams, lockModes);
  		}
  
--- 51,66 ----
  		}
  
! 	    public virtual IList List() 
! 		{
! 			//TODO: see if there is a better way to implement
! 			QueryParameters qp = new QueryParameters( 
! 				(IType[])types.ToArray( typeof(IType) ),
! 				(object[])values.ToArray( typeof(object) ), 
! 				new Hashtable( namedParameters ),
! 				lockModes,
! 				selection );
! 
! 			string query = BindParameterLists( qp.NamedParameters );
! 			return session.Find( query, qp );
  		}
  

Index: FilterImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/FilterImpl.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FilterImpl.cs	30 Oct 2004 14:41:54 -0000	1.7
--- FilterImpl.cs	31 Oct 2004 04:31:00 -0000	1.8
***************
*** 22,35 ****
  		public override IEnumerable Enumerable() 
  		{
! 			IDictionary namedParams = new Hashtable( NamedParams );
! 			string query = BindParameterLists( namedParams );
! 			return Session.EnumerableFilter( collection, query, ValueArray(), TypeArray(), Selection, namedParams, LockModes);
  		}
  
  		public override IList List() 
  		{
! 			IDictionary namedParams = new Hashtable( NamedParams );
! 			string query = BindParameterLists( namedParams );
! 			return Session.Filter( collection, query, ValueArray(), TypeArray(), Selection, namedParams, LockModes);
  		}
  
--- 22,45 ----
  		public override IEnumerable Enumerable() 
  		{
! 			//TODO: see if there is a better way to implement
! 			QueryParameters qp = new QueryParameters( TypeArray(), ValueArray() );
! 			qp.NamedParameters = new Hashtable( NamedParams );
! 			qp.RowSelection = Selection;
! 			qp.LockModes = LockModes;
! 
! 			string query = BindParameterLists( qp.NamedParameters );
! 			return Session.EnumerableFilter( collection, query, qp );
  		}
  
  		public override IList List() 
  		{
! 			//TODO: see if there is a better way to implement
! 			QueryParameters qp = new QueryParameters( TypeArray(), ValueArray() );
! 			qp.NamedParameters = new Hashtable( NamedParams );
! 			qp.RowSelection = Selection;
! 			qp.LockModes = LockModes;
! 
! 			string query = BindParameterLists( qp.NamedParameters );
! 			return Session.Filter( collection, query, qp );
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Hql QueryTranslator.cs,1.46,1.47

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

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

Modified Files:
	QueryTranslator.cs 
Log Message:
Added class QueryParameters to reduce the number of params in 
methods.  It was taken from h2.1.6

Index: QueryTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** QueryTranslator.cs	20 Sep 2004 03:00:18 -0000	1.46
--- QueryTranslator.cs	31 Oct 2004 04:30:59 -0000	1.47
***************
*** 924,938 ****
  		}
  
! 		public IEnumerable GetEnumerable(object[] values, IType[] types, RowSelection selection, 
! 			IDictionary namedParams, IDictionary lockModes, ISessionImplementor session) 
  		{
! 			SqlString sqlWithLock = ApplyLocks(SqlString, lockModes, session.Factory.Dialect);
  
  			IDbCommand st = PrepareCommand(
  				sqlWithLock,
! 				values, types, namedParams, selection, false, session);
  			
! 			IDataReader rs = GetResultSet( st, selection, session );
! 			return new EnumerableImpl(rs, st, session, ReturnTypes, ScalarColumnNames, selection );
  			
  		}
--- 924,937 ----
  		}
  
! 		public IEnumerable GetEnumerable(QueryParameters parameters, ISessionImplementor session) 
  		{
! 			SqlString sqlWithLock = ApplyLocks(SqlString, parameters.LockModes, session.Factory.Dialect);
  
  			IDbCommand st = PrepareCommand(
  				sqlWithLock,
! 				parameters, false, session);
  			
! 			IDataReader rs = GetResultSet( st, parameters.RowSelection, session );
! 			return new EnumerableImpl(rs, st, session, ReturnTypes, ScalarColumnNames, parameters.RowSelection );
  			
  		}
***************
*** 1057,1070 ****
  		}
  
! 		public IList FindList(
! 			ISessionImplementor session,
! 			object[] values,
! 			IType[] types,
! 			bool returnProxies,
! 			RowSelection selection,
! 			IDictionary namedParams,
! 			IDictionary lockModes) 
  		{
! 			return base.Find(session, values, types, returnProxies, selection, namedParams, lockModes);
  		}
  
--- 1056,1063 ----
  		}
  
! 
! 		public IList FindList(ISessionImplementor session, QueryParameters parameters, bool returnProxies) 
  		{
! 			return base.Find( session, parameters, returnProxies ); 
  		}
  
***************
*** 1235,1239 ****
  		}
  
- 		
  		/// <summary>
  		/// Creates an IDbCommand object and populates it with the values necessary to execute it against the 
--- 1228,1231 ----
***************
*** 1241,1248 ****
  		/// </summary>
  		/// <param name="sqlString">The SqlString to convert into a prepared IDbCommand.</param>
! 		/// <param name="values">The values that should be bound to the parameters in the IDbCommand</param>
! 		/// <param name="types">The IType for the value</param>
! 		/// <param name="namedParams">The HQL named parameters.</param>
! 		/// <param name="selection">The RowSelection to help setup the CommandTimeout</param>
  		/// <param name="scroll">TODO: find out where this is used...</param>
  		/// <param name="session">The SessionImpl this Command is being prepared in.</param>
--- 1233,1237 ----
  		/// </summary>
  		/// <param name="sqlString">The SqlString to convert into a prepared IDbCommand.</param>
! 		/// <param name="parameters"></param>
  		/// <param name="scroll">TODO: find out where this is used...</param>
  		/// <param name="session">The SessionImpl this Command is being prepared in.</param>
***************
*** 1254,1258 ****
  		/// namedParams parameters.
  		/// </remarks>
! 		protected override IDbCommand PrepareCommand(SqlString sqlString, object[] values, IType[] types, IDictionary namedParams, RowSelection selection, bool scroll, ISessionImplementor session) 
  		{
  			SqlString sql = null;
--- 1243,1247 ----
  		/// namedParams parameters.
  		/// </remarks>
! 		protected override IDbCommand PrepareCommand(SqlString sqlString, QueryParameters parameters, bool scroll, ISessionImplementor session) 
  		{
  			SqlString sql = null;
***************
*** 1282,1288 ****
  				{
  				
! 					for( int i=0; i<types.Length; i++ ) 
  					{
! 						string[] colNames = new string[types[i].GetColumnSpan(factory)];
  						for( int j=0; j<colNames.Length; j++ ) 
  						{
--- 1271,1277 ----
  				{
  				
! 					for( int i=0; i<parameters.PositionalParameterTypes.Length; i++ ) 
  					{
! 						string[] colNames = new string[ parameters.PositionalParameterTypes[i].GetColumnSpan(factory)];
  						for( int j=0; j<colNames.Length; j++ ) 
  						{
***************
*** 1290,1296 ****
  						}
  
! 						Parameter[] parameters = Parameter.GenerateParameters( factory, colNames , types[i] );
  
! 						foreach(Parameter param in parameters) 
  						{
  							sqlPartIndex = paramIndexes[paramIndex];
--- 1279,1285 ----
  						}
  
! 						Parameter[] sqlParameters = Parameter.GenerateParameters( factory, colNames , parameters.PositionalParameterTypes[i] );
  
! 						foreach(Parameter param in sqlParameters) 
  						{
  							sqlPartIndex = paramIndexes[paramIndex];
***************
*** 1301,1310 ****
  					}
  
! 					if( namedParams!=null && namedParams.Count > 0 ) 
  					{
  						// convert the named parameters to an array of types
  						ArrayList paramTypeList = new ArrayList();
  				
! 						foreach( DictionaryEntry e in namedParams ) 
  						{
  							string name = (string) e.Key;
--- 1290,1299 ----
  					}
  
! 					if( parameters.NamedParameters!=null && parameters.NamedParameters.Count > 0 ) 
  					{
  						// convert the named parameters to an array of types
  						ArrayList paramTypeList = new ArrayList();
  				
! 						foreach( DictionaryEntry e in parameters.NamedParameters ) 
  						{
  							string name = (string) e.Key;
***************
*** 1344,1350 ****
  							}
  
! 							Parameter[] parameters = Parameter.GenerateParameters( factory, colNames , type );
  
! 							foreach(Parameter param in parameters) 
  							{
  								sqlPartIndex = paramIndexes[paramIndex];
--- 1333,1339 ----
  							}
  
! 							Parameter[] sqlParameters = Parameter.GenerateParameters( factory, colNames , type );
  
! 							foreach(Parameter param in sqlParameters) 
  							{
  								sqlPartIndex = paramIndexes[paramIndex];
***************
*** 1362,1366 ****
  			this.sqlString = sql;
  
! 			return base.PrepareCommand(sql, values, types, namedParams, selection, scroll, session);
  		}
  	}
--- 1351,1355 ----
  			this.sqlString = sql;
  
! 			return base.PrepareCommand(sql, parameters, scroll, session);
  		}
  	}

[Nhibernate-commit] nhibernate/src/NHibernate/Loader CriteriaLoader.cs,1.8,1.9 Loader.cs,1.37,1.38

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

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

Modified Files:
	CriteriaLoader.cs Loader.cs 
Log Message:
Added class QueryParameters to reduce the number of params in 
methods.  It was taken from h2.1.6

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Loader.cs	29 Oct 2004 05:53:49 -0000	1.37
--- Loader.cs	31 Oct 2004 04:31:00 -0000	1.38
***************
*** 93,98 ****
  			return false;
  		}
! 
! 
  		/// <summary>
  		/// Execute an SQL query and attempt to instantiate instances of the class mapped by the given
--- 93,97 ----
  			return false;
  		}
! 			
  		/// <summary>
  		/// Execute an SQL query and attempt to instantiate instances of the class mapped by the given
***************
*** 117,134 ****
  		private IList DoFind(
  			ISessionImplementor session,
! 			object[] values,
! 			IType[] types,
  			object optionalObject,
  			object optionalID,
  			PersistentCollection optionalCollection,
  			object optionalCollectionOwner,
! 			bool returnProxies,
! 			RowSelection selection,
! 			IDictionary namedParams,
! 			IDictionary lockModes) 
  		{
  
! 			int maxRows = (selection==null || selection.MaxRows==RowSelection.NoValue) ?
! 				int.MaxValue : selection.MaxRows;
  
  			ILoadable[] persisters = Persisters;
--- 116,129 ----
  		private IList DoFind(
  			ISessionImplementor session,
! 			QueryParameters parameters,
  			object optionalObject,
  			object optionalID,
  			PersistentCollection optionalCollection,
  			object optionalCollectionOwner,
! 			bool returnProxies)  
  		{
  
! 			int maxRows = ( parameters.RowSelection==null || parameters.RowSelection.MaxRows==RowSelection.NoValue ) ?
! 				int.MaxValue : parameters.RowSelection.MaxRows;
  
  			ILoadable[] persisters = Persisters;
***************
*** 139,143 ****
  			string[] suffixes = Suffixes;
  
! 			LockMode[] lockModeArray = GetLockModes(lockModes);
  		
  			// this is a CollectionInitializer and we are loading up a single collection
--- 134,138 ----
  			string[] suffixes = Suffixes;
  
! 			LockMode[] lockModeArray = GetLockModes( parameters.LockModes );
  		
  			// this is a CollectionInitializer and we are loading up a single collection
***************
*** 164,171 ****
  
  			st = PrepareCommand(
! 				ApplyLocks(SqlString, lockModes, session.Factory.Dialect), 
! 				values, types, namedParams, selection, false, session);
  
! 			IDataReader rs = GetResultSet(st, selection, session);
  
  			try 
--- 159,168 ----
  
  			st = PrepareCommand(
! 				ApplyLocks(SqlString, parameters.LockModes, session.Factory.Dialect), 
! 				parameters, 
! 				false, 
! 				session);
  
! 			IDataReader rs = GetResultSet(st, parameters.RowSelection, session);
  
  			try 
***************
*** 547,550 ****
--- 544,555 ----
  		}
  
+ //		[Obsolete("use QueryParameters instead.")]
+ //		protected virtual IDbCommand PrepareCommand(SqlString sqlString, object[] values, IType[] types, IDictionary namedParams, RowSelection selection, bool scroll, ISessionImplementor session) 
+ //		{
+ //			QueryParameters qp = new QueryParameters( types, values, namedParams, null, selection );
+ //			return PrepareCommand( sqlString, qp, scroll, session );
+ // 
+ //		}
+ 
  		/// <summary>
  		/// Creates an IDbCommand object and populates it with the values necessary to execute it against the 
***************
*** 559,568 ****
  		/// <param name="session">The SessionImpl this Command is being prepared in.</param>
  		/// <returns>An IDbCommand that is ready to be executed.</returns>
! 		protected virtual IDbCommand PrepareCommand(SqlString sqlString, object[] values, IType[] types, IDictionary namedParams, RowSelection selection, bool scroll, ISessionImplementor session) 
  		{
  			Dialect.Dialect dialect = session.Factory.Dialect;
  			
! 			bool useLimit = UseLimit(selection, dialect);
! 			bool scrollable =  scroll || (!useLimit && GetFirstRow(selection)!=0);
  			if(useLimit) sqlString = dialect.GetLimitString(sqlString);
  
--- 564,573 ----
  		/// <param name="session">The SessionImpl this Command is being prepared in.</param>
  		/// <returns>An IDbCommand that is ready to be executed.</returns>
! 		protected virtual IDbCommand PrepareCommand(SqlString sqlString, QueryParameters parameters, bool scroll, ISessionImplementor session) 
  		{
  			Dialect.Dialect dialect = session.Factory.Dialect;
  			
! 			bool useLimit = UseLimit( parameters.RowSelection, dialect );
! 			bool scrollable =  scroll || (!useLimit && GetFirstRow(parameters.RowSelection)!=0);
  			if(useLimit) sqlString = dialect.GetLimitString(sqlString);
  
***************
*** 571,577 ****
  			try 
  			{
! 				if (selection!=null && selection.Timeout!=RowSelection.NoValue) 
  				{
! 					command.CommandTimeout = selection.Timeout;
  				}
  				
--- 576,582 ----
  			try 
  			{
! 				if( parameters.RowSelection!=null && parameters.RowSelection.Timeout!=RowSelection.NoValue) 
  				{
! 					command.CommandTimeout = parameters.RowSelection.Timeout;
  				}
  				
***************
*** 580,605 ****
  				if( useLimit && dialect.BindLimitParametersFirst ) 
  				{
! 					BindLimitParameters(command, colIndex, selection, session);
  					colIndex+=2;
  				}
  
! 				for (int i=0; i < values.Length; i++) 
  				{
! 					types[i].NullSafeSet( command, values[i], colIndex, session);
! 					colIndex += types[i].GetColumnSpan( session.Factory );
  				}
  				
  				//if (namedParams!=null)	
! 				colIndex += BindNamedParameters(command, namedParams, colIndex, session);
  				
  				if( useLimit && !dialect.BindLimitParametersFirst ) 
  				{
! 					BindLimitParameters(command, colIndex, selection, session);
  				}
  
! 				if(!useLimit) SetMaxRows(command, selection);
! 				if(selection!=null && selection.Timeout!=RowSelection.NoValue) 
  				{
! 					command.CommandTimeout = selection.Timeout;
  				}
  
--- 585,610 ----
  				if( useLimit && dialect.BindLimitParametersFirst ) 
  				{
! 					BindLimitParameters(command, colIndex, parameters.RowSelection, session);
  					colIndex+=2;
  				}
  
! 				for (int i=0; i < parameters.PositionalParameterValues.Length; i++) 
  				{
! 					parameters.PositionalParameterTypes[i].NullSafeSet( command, parameters.PositionalParameterValues[i], colIndex, session);
! 					colIndex += parameters.PositionalParameterTypes[i].GetColumnSpan( session.Factory );
  				}
  				
  				//if (namedParams!=null)	
! 				colIndex += BindNamedParameters(command, parameters.NamedParameters, colIndex, session);
  				
  				if( useLimit && !dialect.BindLimitParametersFirst ) 
  				{
! 					BindLimitParameters(command, colIndex, parameters.RowSelection, session);
  				}
  
! 				if(!useLimit) SetMaxRows( command, parameters.RowSelection );
! 				if(parameters.RowSelection!=null && parameters.RowSelection.Timeout!=RowSelection.NoValue) 
  				{
! 					command.CommandTimeout = parameters.RowSelection.Timeout;
  				}
  
***************
*** 719,725 ****
  			object optionalObject,
  			object optionalID,
! 			bool returnProxies) {
! 
! 			return DoFind(session, values, types, optionalObject, optionalID, null, null, returnProxies, null, null, null);
  		}
  
--- 724,731 ----
  			object optionalObject,
  			object optionalID,
! 			bool returnProxies) 
! 		{
! 			QueryParameters qp = new QueryParameters( types, values );
! 			return DoFind( session, qp, optionalObject, optionalID, null, null, returnProxies );
  		}
  
***************
*** 731,735 ****
  			PersistentCollection collection) 
  		{
! 			return DoFind(session, new object[] {id}, new IType[] {type}, null, null, collection, owner, true, null, null, null);
  		}
  
--- 737,742 ----
  			PersistentCollection collection) 
  		{
! 			QueryParameters qp = new QueryParameters( new IType[] {type}, new object[] {id} );
! 			return DoFind( session, qp, null, null, collection, owner, true ); 
  		}
  
***************
*** 737,761 ****
  		/// Called by subclasses that implement queries.
  		/// </summary>
- 		/// <param name="session"></param>
- 		/// <param name="values"></param>
- 		/// <param name="types"></param>
- 		/// <param name="returnProxies"></param>
- 		/// <param name="selection"></param>
- 		/// <param name="namedParams"></param>
- 		/// <param name="lockModes"></param>
- 		/// <returns></returns>
  		protected virtual IList Find(
  			ISessionImplementor session,
! 			object[] values,
! 			IType[] types,
! 			bool returnProxies,
! 			RowSelection selection,
! 			IDictionary namedParams,
! 			IDictionary lockModes) 
  		{
! 			return DoFind(session, values, types, null, null, null, null, returnProxies, selection, namedParams, lockModes);
  		}
! 
! 
  		private string[][] suffixedKeyColumns;
  		private string[][] suffixedVersionColumnNames;
--- 744,755 ----
  		/// Called by subclasses that implement queries.
  		/// </summary>
  		protected virtual IList Find(
  			ISessionImplementor session,
! 			QueryParameters parameters,
! 			bool returnProxies) 
  		{
! 			return DoFind( session, parameters, null, null, null, null, returnProxies );
  		}
! 		
  		private string[][] suffixedKeyColumns;
  		private string[][] suffixedVersionColumnNames;

Index: CriteriaLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CriteriaLoader.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CriteriaLoader.cs	2 Sep 2004 04:00:39 -0000	1.8
--- CriteriaLoader.cs	31 Oct 2004 04:31:00 -0000	1.9
***************
*** 72,76 ****
  			IType[] typeArray = (IType[]) types.ToArray(typeof(IType));
  		
! 			return Find(session, valueArray, typeArray, true, criteria.Selection, null, null);
  		}
  
--- 72,77 ----
  			IType[] typeArray = (IType[]) types.ToArray(typeof(IType));
  		
! 			QueryParameters qp = new QueryParameters( typeArray, valueArray, null, criteria.Selection );
! 			return Find( session, qp, true );
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.56,1.57

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

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

Modified Files:
	NHibernate-1.1.csproj 
Log Message:
Added class QueryParameters to reduce the number of params in 
methods.  It was taken from h2.1.6

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** NHibernate-1.1.csproj	30 Oct 2004 14:41:53 -0000	1.56
--- NHibernate-1.1.csproj	31 Oct 2004 04:30:59 -0000	1.57
***************
*** 606,609 ****
--- 606,614 ----
                  />
                  <File
+                     RelPath = "Engine\QueryParameters.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Engine\RowSelection.cs"
                      SubType = "Code"

[Nhibernate-commit] nhibernate/src/NHibernate/Engine QueryParameters.cs,NONE,1.1 ISessionImplementor.cs,1.22,1.23

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

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

Modified Files:
	ISessionImplementor.cs 
Added Files:
	QueryParameters.cs 
Log Message:
Added class QueryParameters to reduce the number of params in 
methods.  It was taken from h2.1.6

Index: ISessionImplementor.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Engine/ISessionImplementor.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ISessionImplementor.cs	27 Sep 2004 01:55:35 -0000	1.22
--- ISessionImplementor.cs	31 Oct 2004 04:30:59 -0000	1.23
***************
*** 184,206 ****
  		/// </summary>
  		/// <param name="query"></param>
! 		/// <param name="values"></param>
! 		/// <param name="types"></param>
! 		/// <param name="selection"></param>
! 		/// <param name="namedParams"></param>
  		/// <returns></returns>
! 		IList Find(string query, object[] values, IType[] types, RowSelection selection, IDictionary namedParams,
! 			IDictionary lockModes);
! 	
  		/// <summary>
  		/// Execute an <c>Iterate()</c> query
  		/// </summary>
  		/// <param name="query"></param>
! 		/// <param name="values"></param>
! 		/// <param name="types"></param>
! 		/// <param name="selection"></param>
! 		/// <param name="namedParams"></param>
  		/// <returns></returns>
! 		IEnumerable Enumerable(string query, object[] values, IType[] types, RowSelection selection, 
! 			IDictionary namedParams, IDictionary lockModes);
  
  		/// <summary>
--- 184,198 ----
  		/// </summary>
  		/// <param name="query"></param>
! 		/// <param name="parameters"></param>
  		/// <returns></returns>
! 		IList Find(string query, QueryParameters parameters);
! 
  		/// <summary>
  		/// Execute an <c>Iterate()</c> query
  		/// </summary>
  		/// <param name="query"></param>
! 		/// <param name="parameters"></param>
  		/// <returns></returns>
! 		IEnumerable Enumerable(string query, QueryParameters parameters);
  
  		/// <summary>
***************
*** 209,219 ****
  		/// <param name="collection"></param>
  		/// <param name="filter"></param>
! 		/// <param name="values"></param>
! 		/// <param name="types"></param>
! 		/// <param name="selection"></param>
! 		/// <param name="namedParams"></param>
  		/// <returns></returns>
! 		IList Filter(object collection, string filter, object[] values, IType[] types, RowSelection selection, 
! 			IDictionary namedParams, IDictionary lockModes);
  
  		/// <summary>
--- 201,207 ----
  		/// <param name="collection"></param>
  		/// <param name="filter"></param>
! 		/// <param name="parameters"></param>
  		/// <returns></returns>
! 		IList Filter(object collection, string filter, QueryParameters parameters);
  
  		/// <summary>
***************
*** 222,233 ****
  		/// <param name="collection"></param>
  		/// <param name="filter"></param>
! 		/// <param name="values"></param>
! 		/// <param name="types"></param>
! 		/// <param name="selection"></param>
! 		/// <param name="namedParams"></param>
  		/// <returns></returns>
! 		IEnumerable EnumerableFilter(object collection, string filter, object[] values, IType[] types, RowSelection selection, 
! 			IDictionary namedParams, IDictionary lockModes);
! 		
  		/// <summary>
  		/// Get the <c>IClassPersister</c> for an object
--- 210,217 ----
  		/// <param name="collection"></param>
  		/// <param name="filter"></param>
! 		/// <param name="parameters"></param>
  		/// <returns></returns>
! 		IEnumerable EnumerableFilter(object collection, string filter, QueryParameters parameters);
! 
  		/// <summary>
  		/// Get the <c>IClassPersister</c> for an object

--- NEW FILE: QueryParameters.cs ---
using System;
using System.Collections;
using System.Text;

using NHibernate.Type;
using NHibernate.Util;

namespace NHibernate.Engine
{
	/// <summary>
	/// Container for data that is used during the NHibernate query/load process. 
	/// </summary>
	public class QueryParameters
	{
		private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(QueryParameters) );

		private IType[] _positionalParameterTypes;
		private object[] _positionalParameterValues;
		private RowSelection _rowSelection;
		private IDictionary _lockModes;
		private IDictionary _namedParameters;

		/// <summary>
		/// Initializes an instance of the <see cref="QueryParameters"/> class.
		/// </summary>
		/// <param name="positionalParameterTypes">An array of <see cref="IType"/> objects for the parameters.</param>
		/// <param name="positionalParameterValues">An array of <see cref="object"/> objects for the parameters.</param>
		public QueryParameters(IType[] positionalParameterTypes, object[] positionalParameterValues)
			: this( positionalParameterTypes, positionalParameterValues, null, null )
		{
		}

		/// <summary>
		/// Initializes an instance of the <see cref="QueryParameters"/> class.
		/// </summary>
		/// <param name="positionalParameterTypes">An array of <see cref="IType"/> objects for the parameters.</param>
		/// <param name="positionalParameterValues">An array of <see cref="object"/> objects for the parameters.</param>
		/// <param name="lockModes">An <see cref="IDictionary"/> that is hql alias keyed to a LockMode value.</param>
		/// <param name="rowSelection"></param>
		public QueryParameters(IType[] positionalParameterTypes, object[] positionalParameterValues, IDictionary lockModes, RowSelection rowSelection)
			: this( positionalParameterTypes, positionalParameterValues, null, lockModes, rowSelection )
		{
		}

		/// <summary>
		/// Initializes an instance of the <see cref="QueryParameters"/> class.
		/// </summary>
		/// <param name="positionalParameterTypes">An array of <see cref="IType"/> objects for the parameters.</param>
		/// <param name="positionalParameterValues">An array of <see cref="object"/> objects for the parameters.</param>
		/// <param name="namedParameters">An <see cref="IDictionary"/> that is <c>parameter name</c> keyed to a <see cref="TypedValue"/> value.</param>
		/// <param name="lockModes">An <see cref="IDictionary"/> that is <c>hql alias</c> keyed to a LockMode value.</param>
		/// <param name="rowSelection"></param>
		public QueryParameters(IType[] positionalParameterTypes, object[] positionalParameterValues, IDictionary namedParameters, IDictionary lockModes, RowSelection rowSelection) 
		{
			_positionalParameterTypes = positionalParameterTypes;
			_positionalParameterValues = positionalParameterValues;
			_rowSelection = rowSelection;
			_lockModes = lockModes;
			_namedParameters = namedParameters;
		}

		/// <summary>
		/// Gets or sets an <see cref="IDictionary"/> that contains the alias name of the
		/// object from hql as the key and the <see cref="LockMode"/> as the value.
		/// </summary>
		/// <value>An <see cref="IDictionary"/> of lock modes.</value>
		public IDictionary LockModes
		{
			get { return _lockModes; }
			set { _lockModes = value; }
		}

		/// <summary>
		/// Gets or sets an <see cref="IDictionary"/> that contains the named 
		/// parameter as the key and the <see cref="TypedValue"/> as the value.
		/// </summary>
		/// <value>An <see cref="IDictionary"/> of named parameters.</value>
		public IDictionary NamedParameters
		{
			get { return _namedParameters; }
			set { _namedParameters = value; }
		}

		/// <summary>
		/// Gets or sets an array of <see cref="IType"/> objects that is stored at the index 
		/// of the Parameter.
		/// </summary>
		public IType[] PositionalParameterTypes
		{
			get { return _positionalParameterTypes; }
			set { _positionalParameterTypes = value; }
		}

		/// <summary>
		/// Gets or sets an array of <see cref="object"/> objects that is stored at the index 
		/// of the Parameter.
		/// </summary>
		public object[] PositionalParameterValues
		{
			get { return _positionalParameterValues; }
			set { _positionalParameterValues = value; }
		}

		public bool HasRowSelection 
		{
			get { return _rowSelection!=null; }
		}

		/// <summary>
		/// Gets or sets the <see cref="RowSelection"/> for the Query.
		/// </summary>
		public RowSelection RowSelection
		{
			get { return _rowSelection; }
			set { _rowSelection = value; }
		}

		/// <summary>
		/// Ensure the Types and Values are the same length.
		/// </summary>
		/// <exception cref="QueryException">
		/// If the Lengths of <see cref="PositionalParameterTypes"/> and 
		/// <see cref="PositionalParameterValues"/> are not equal.
		/// </exception>
		public void ValidateParameters() 
		{
			int typesLength = PositionalParameterTypes!=null ? 0 : PositionalParameterTypes.Length;
			int valuesLength = PositionalParameterValues!=null ? 0 : PositionalParameterValues.Length;

			if( typesLength!=valuesLength ) 
			{
				throw new QueryException( "Number of positional parameter types (" + typesLength + ") does not match number of positional parameter values (" + valuesLength + ")" );
			}
		}

		internal void LogParameters() 
		{
			StringBuilder builder = new StringBuilder();
			
			if( PositionalParameterTypes!=null && PositionalParameterTypes.Length>0 ) 
			{
				for( int i=0; i<PositionalParameterTypes.Length; i++ ) 
				{
					if( PositionalParameterTypes[i]!=null ) 
					{
						builder.Append( PositionalParameterTypes[i].Name );
					}
					else 
					{
						builder.Append( "null type" );
					}

					builder.Append( " = " );

					if( PositionalParameterValues[i]!=null ) 
					{
						builder.Append( PositionalParameterValues[i].ToString() );
					}
					else 
					{
						builder.Append( "null value" );
					}

					builder.Append( ", " );
				}
			}
			else 
			{
				builder.Append( "No Types and Values" );
			}

			//TODO: add logging for named parameters
			log.Debug( builder.ToString() );
		}
	}
}

[Nhibernate-commit] nhibernate/src/NHibernate/Cache CacheFactory.cs,1.1,1.2

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

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

Modified Files:
	CacheFactory.cs 
Log Message:
removed some not implemented code and no longer applicable
comments

Index: CacheFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache/CacheFactory.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CacheFactory.cs	29 Oct 2004 05:55:26 -0000	1.1
--- CacheFactory.cs	31 Oct 2004 04:25:56 -0000	1.2
***************
*** 19,23 ****
  		public const string ReadWrite = "read-write";
  		public const string NonstrictReadWrite = "nonstrict-read-write";
- 		public const string Transactional = "transactional";
  
  		public static ICacheConcurrencyStrategy CreateCache(XmlNode node, string name, bool mutable) 
--- 19,22 ----
***************
*** 50,57 ****
  					ccs = new NonstrictReadWriteCache();
  					break;
- 				case CacheFactory.Transactional : 
- 					// TODO: build this
- 					//ccs = new TransactionalCache();
- 					break;
  				default :
  					throw new MappingException( "cache usage attribute should be read-write, read-only, nonstrict-read-write, or transactional" );
--- 49,52 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Configuration.cs,1.22,1.23 Settings.cs,1.1,1.2

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

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

Modified Files:
	Configuration.cs Settings.cs 
Log Message:
removed some not implemented code and no longer applicable
comments

Index: Configuration.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Configuration.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Configuration.cs	29 Oct 2004 05:58:06 -0000	1.22
--- Configuration.cs	31 Oct 2004 04:25:57 -0000	1.23
***************
*** 814,818 ****
  		}
  
- 		//TODO: make properties a Settings class
  		protected void ConfigureCaches(Settings settings) 
  		{
--- 814,817 ----

Index: Settings.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Settings.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Settings.cs	29 Oct 2004 05:58:06 -0000	1.1
--- Settings.cs	31 Oct 2004 04:25:57 -0000	1.2
***************
*** 51,57 ****
  		}
  
- 
- 		// some other ones in here I don't think will be added
- 		
  		public string DefaultSchemaName
  		{
--- 51,54 ----
***************
*** 78,82 ****
  		}
  
- 
  		public string SessionFactoryName
  		{
--- 75,78 ----
***************
*** 91,95 ****
  		}
  
- 		
  	}
  }
--- 87,90 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Cache HashtableCacheProvider.cs,1.1,1.2 ICacheProvider.cs,1.1,1.2

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

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

Modified Files:
	HashtableCacheProvider.cs ICacheProvider.cs 
Log Message:
BuildCache now uses IDictionary instead of ICollection.

Index: ICacheProvider.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache/ICacheProvider.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ICacheProvider.cs	20 Aug 2004 02:34:20 -0000	1.1
--- ICacheProvider.cs	30 Oct 2004 21:20:17 -0000	1.2
***************
*** 15,19 ****
  		/// <param name="properties">configuration settings</param>
  		/// <returns></returns>
! 		ICache BuildCache(string regionName, ICollection properties );
  			
  		/// <summary>
--- 15,19 ----
  		/// <param name="properties">configuration settings</param>
  		/// <returns></returns>
! 		ICache BuildCache(string regionName, IDictionary properties );
  			
  		/// <summary>

Index: HashtableCacheProvider.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache/HashtableCacheProvider.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HashtableCacheProvider.cs	26 Oct 2004 21:15:09 -0000	1.1
--- HashtableCacheProvider.cs	30 Oct 2004 21:20:17 -0000	1.2
***************
*** 12,16 ****
  		#region ICacheProvider Members
  
! 		public ICache BuildCache(string regionName, ICollection properties)
  		{
  			return new HashtableCache( regionName );
--- 12,16 ----
  		#region ICacheProvider Members
  
! 		public ICache BuildCache(string regionName, IDictionary properties)
  		{
  			return new HashtableCache( regionName );

[Nhibernate-commit] nhibernate releasenotes.txt,1.16,1.17

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

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

Modified Files:
	releasenotes.txt 
Log Message:
Began release notes for next build.

Index: releasenotes.txt
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/releasenotes.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** releasenotes.txt	22 Sep 2004 08:00:29 -0000	1.16
--- releasenotes.txt	30 Oct 2004 14:42:38 -0000	1.17
***************
*** 1,2 ****
--- 1,18 ----
+ Alpha Build 0.4.0.0
+ ======================== 
+ - Started work on documentation.
+ - Improved Cache to use pluggable CacheProviders like Hibernate 2.1. (Kevin Williams)
+ - Removed properties UseScrollableResults, BatchSize, and FetchSize - not applicable to ADO.NET.
+ - Fixed problem with object not getting removed from Cache when Evicted from Session.
+ - Added to MySqlDialect a mapping from DbType.Guid to varchar(40) for schema-export. (Thomas Kock)
+ - Added lowercase-underscore naming strategy. (Corey Behrends)
+ - Fixed bug with access="field" and no type="" attribute causing Exception in ReflectHelper.
+ - Removed IVersionType implementation from TimeType and DateType.
+ - Moved Eg namespace from NHibernate core to NHibernate.Eg project.
+ - Added guid.comb id generator. (Donald Mull)
+ - Added ability to configure with a cfg.xml embedded as a resource in an assembly (Thomas Kock)
+ - Fixed PostgreSQLDialect binding of Limit Parameters. (Martijn Boland)
+ - Began restructure of lib folder to support net-1.0, net-1.1, net-2.0, and mono-1.0 in build.  Still only 'officially' supports net-1.1.
+ 
  Alpha Build 0.3.0.0
  ======================== 

[Nhibernate-commit] nhibernate/src/NHibernate/Impl FilterImpl.cs,1.6,1.7 SessionFactoryImpl.cs,1.34,1.35 ScrollableResultsImpl.cs,1.2,NONE

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

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

Modified Files:
	FilterImpl.cs SessionFactoryImpl.cs 
Removed Files:
	ScrollableResultsImpl.cs 
Log Message:
NH-37: removed IScrollableResults
removed some commented out code for old properties.

Index: SessionFactoryImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionFactoryImpl.cs,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** SessionFactoryImpl.cs	29 Oct 2004 05:58:06 -0000	1.34
--- SessionFactoryImpl.cs	30 Oct 2004 14:41:54 -0000	1.35
***************
*** 459,471 ****
  		}
  
- //		public bool UseAdoBatch 
- //		{
- //			get { return adoBatchSize > 0; }
- //		}
- 
- //		public int ADOBatchSize {
- //			get { return adoBatchSize; }
- //		}
- 
  		public bool EnableJoinedFetch 
  		{
--- 459,462 ----
***************
*** 473,480 ****
  		}
  
- //		public bool UseScrollableResultSets {
- //			get { return useScrollableResultSets; }
- //		}
- 
  		public string GetNamedQuery(string name) 
  		{
--- 464,467 ----

Index: FilterImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/FilterImpl.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FilterImpl.cs	29 Mar 2004 04:03:17 -0000	1.6
--- FilterImpl.cs	30 Oct 2004 14:41:54 -0000	1.7
***************
*** 34,42 ****
  		}
  
- 		public IScrollableResults Scroll() 
- 		{
- 			throw new NotImplementedException("Can't Scroll Filters");
- 		}
- 
  		private IType[] TypeArray() 
  		{
--- 34,37 ----

--- ScrollableResultsImpl.cs DELETED ---

[Nhibernate-commit] nhibernate/src/NHibernate/Engine ISessionFactoryImplementor.cs,1.10,1.11

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

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

Modified Files:
	ISessionFactoryImplementor.cs 
Log Message:
NH-37: removed IScrollableResults
removed some commented out code for old properties.

Index: ISessionFactoryImplementor.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Engine/ISessionFactoryImplementor.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ISessionFactoryImplementor.cs	29 Oct 2004 05:58:06 -0000	1.10
--- ISessionFactoryImplementor.cs	30 Oct 2004 14:41:54 -0000	1.11
***************
*** 63,71 ****
  		bool EnableJoinedFetch { get; }
  
- //		/// <summary>
- //		/// Are scrollable <c>ResultSet</c>s supported
- //		/// </summary>
- //		bool UseScrollableResultSets { get; } //TODO: Depricate, as there is no such thing
- 
  		/// <summary>
  		/// Get the database schema specified in <c>hibernate.default_schema</c>
--- 63,66 ----
***************
*** 117,131 ****
  		/// <returns></returns>
  		string GetImportedClassName(string name);
- 
- //		/// <summary>
- //		/// The ADO.NET batch size 
- //		/// </summary>
- //		int ADOBatchSize { get; } //TODO: Depricate, should always be 0
- 
- //		/// <summary>
- //		/// Set the fetch size
- //		/// </summary>
- //		/// <param name="command"></param>
- //		void SetFetchSize(IDbCommand command);
  	}
  }
--- 112,115 ----

[Nhibernate-commit] nhibernate/src/NHibernate.Test FooBarTest.cs,1.67,1.68 SQLFunctionsTest.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-serv17186/src/NHibernate.Test

Modified Files:
	FooBarTest.cs SQLFunctionsTest.cs 
Log Message:
NH-37: removed IScrollableResults
removed some commented out code for old properties.

Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** FooBarTest.cs	20 Sep 2004 02:27:01 -0000	1.67
--- FooBarTest.cs	30 Oct 2004 14:41:54 -0000	1.68
***************
*** 2120,2129 ****
  			s.Close();
  		}
- 		
- 		[Test]
- 		[Ignore("IScrollableResults - http://jira.nhibernate.org:8080/browse/NH-37")]
- 		public void ScrollableIterator() 
- 		{
- 		}
  
  		[Test]
--- 2120,2123 ----

Index: SQLFunctionsTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SQLFunctionsTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SQLFunctionsTest.cs	25 Aug 2004 04:06:59 -0000	1.5
--- SQLFunctionsTest.cs	30 Oct 2004 14:41:54 -0000	1.6
***************
*** 65,69 ****
  
  		[Test]
- 		[Ignore("IScrollableResults - http://jira.nhibernate.org:8080/browse/NH-37")]
  		public void SQLFunctions() 
  		{
--- 65,68 ----
***************
*** 204,218 ****
  			Assert.AreEqual( 1, q.List().Count );
  			
- 
- 			/*
- 			 * http://jira.nhibernate.org:8080/browse/NH-37
- 			IScrollableResults sr = s.CreateQuery("from Simple s").Scroll();
- 			sr.Next();
- 			sr.GetInt64(0);
- 			long lid = sr.Get(0, NHibernate.Int64);
- 			Assert.AreEqual( lid, s.GetIdentifier( sr.Get(0, NHibernate.Entity(typeof(Simple)) ) ) );
- 			sr.Close();
- 			*/
- 
  			s.Delete(other);
  			s.Delete(simple);
--- 203,206 ----

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.55,1.56 IScrollableResults.cs,1.3,NONE

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

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

Modified Files:
	NHibernate-1.1.csproj 
Removed Files:
	IScrollableResults.cs 
Log Message:
NH-37: removed IScrollableResults
removed some commented out code for old properties.

--- IScrollableResults.cs DELETED ---

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** NHibernate-1.1.csproj	29 Oct 2004 05:59:38 -0000	1.55
--- NHibernate-1.1.csproj	30 Oct 2004 14:41:53 -0000	1.56
***************
*** 165,173 ****
                  />
                  <File
-                     RelPath = "IScrollableResults.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "ISession.cs"
                      SubType = "Code"
--- 165,168 ----
***************
*** 1001,1009 ****
                  />
                  <File
-                     RelPath = "Impl\ScrollableResultsImpl.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "Impl\SessionFactoryImpl.cs"
                      SubType = "Code"
--- 996,999 ----

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

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

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

Modified Files:
	NHibernate-1.1.csproj 
Log Message:
NH-90 : added new files for it.

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** NHibernate-1.1.csproj	26 Oct 2004 21:22:08 -0000	1.54
--- NHibernate-1.1.csproj	29 Oct 2004 05:59:38 -0000	1.55
***************
*** 306,309 ****
--- 306,314 ----
                  />
                  <File
+                     RelPath = "Cache\CacheFactory.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Cache\HashtableCache.cs"
                      SubType = "Code"
***************
*** 371,374 ****
--- 376,389 ----
                  />
                  <File
+                     RelPath = "Cfg\Settings.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "Cfg\SettingsFactory.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Collection\ArrayHolder.cs"
                      SubType = "Code"