nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel/NHSpecific BasicObject.cs,NONE,1.1 BasicObject.hbm.xml,NONE,1.1 BasicSerializable.cs,NONE,1.1 BasicSerializable.hbm.xml,NONE,1.1 BasicClass.cs,1.2,1.3 BasicClass.hbm.xml,1.3,1.4

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

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

Modified Files:
	BasicClass.cs BasicClass.hbm.xml 
Added Files:
	BasicObject.cs BasicObject.hbm.xml BasicSerializable.cs 
	BasicSerializable.hbm.xml 
Log Message:
Beginning to isolate the Types so I can figure out what is ADO.NET driver
problems and which are NHibernate problems.  NH works great with Ms
Sql 2000, but not so great with MySql & Oracle.

--- NEW FILE: BasicSerializable.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
	<class 
		name="NHibernate.DomainModel.NHSpecific.BasicSerializable, NHibernate.DomainModel" 
		table="bc_ser">
		
		<id name="Id">
			<generator class="native" />
		</id>
		
		<property 
			name="SerializableProperty" 
			type="NHibernate.DomainModel.NHSpecific.SerializableClass, NHibernate.DomainModel(1000)"  
			column="ser_p"
		/>
		
		<property 
			name="Serial" 
			column="serial_" 
			type="Serializable"
			length="4000"
		/>
		
	</class>
</hibernate-mapping>

--- NEW FILE: BasicObject.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
	<class 
		name="NHibernate.DomainModel.NHSpecific.BasicObject, NHibernate.DomainModel"
		table="bc_obj"
	>
		<id name="Id">
			<generator class="native" />
		</id>
		
		<property name="Name" />
		<property name="Any" type="Object" >
			<column name="the_type" />
			<column name="id_ser" />
		</property>
	</class>
	
	<class 
		name="NHibernate.DomainModel.NHSpecific.BasicObjectRef, NHibernate.DomainModel"
		table="bc_ref"
	>
		<id name="Id">
			<generator class="native" />
		</id>
		
		<property name="Name" />
		
	</class>
	
</hibernate-mapping>
--- NEW FILE: BasicSerializable.cs ---
using System;

namespace NHibernate.DomainModel.NHSpecific 
{

	/// <summary>
	/// Summary description for BasicSerializable.
	/// </summary>
	public class BasicSerializable 
	{
		private int _id;
		private SerializableClass _serializableProperty;
		private object _serial;

		public BasicSerializable() 
		{
			_serializableProperty = new SerializableClass();
			_serializableProperty._classId = 5;
			_serializableProperty._classString = "serialize me";
		}

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

		public object Serial 
		{
			get { return _serial; }
			set { _serial = value; }
		}
	}

	[Serializable]
	public class SerializableClass 
	{
		public int _classId;
		public string _classString;

		public override int GetHashCode()
		{
			// not a good method, but all that is needed for this Class
			// to be used by tests.
			return base.GetHashCode();
		}

		public override bool Equals(object obj)
		{
			SerializableClass lhs = obj as SerializableClass;
			if(lhs==null) return false;

			if(this==lhs) return true;

			if(this._classId.Equals(lhs._classId) 
				&& this._classString.Equals(this._classString)) return true;

			return false;
		}

	}

}

Index: BasicClass.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHSpecific/BasicClass.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BasicClass.hbm.xml	19 Jul 2004 03:19:00 -0000	1.3
--- BasicClass.hbm.xml	31 Aug 2004 20:24:24 -0000	1.4
***************
*** 22,26 ****
  		<property name="Int32Property" type="Int32" column="int_p"/>
  		<property name="Int64Property" type="Int64" column="lng_p"/>
- 		<property name="SerializableProperty" type="NHibernate.DomainModel.NHSpecific.SerializableClass, NHibernate.DomainModel(1000)"  column="ser_p"/>
  		<property name="SingleProperty" type="Single" column="flt_p"/>
  		<property name="StringProperty" type="String" column="str_p"/>
--- 22,25 ----

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

namespace NHibernate.DomainModel.NHSpecific 
{

	/// <summary>
	/// Used to test how NHibernate handles mappings for type="Object"
	/// and type="Any"
	/// </summary>
	/// <remarks>
	/// This class is used in two hbm.xml files.
	/// </remarks>
	public class BasicObject 
	{
		private int _id;
		private object _any;
		private string _name;
		
		public int Id
		{
			get { return _id; }
			set { _id = value; }
		}

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

		public object Any
		{
			get { return _any; }
			set { _any = value; }
		}

	}

	/// <summary>
	/// Summary description for BasicObject.
	/// </summary>
	[Serializable]
	public class BasicObjectRef 
	{
		private int _id;
		private string _name;

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

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

	}
}

Index: BasicClass.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHSpecific/BasicClass.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BasicClass.cs	29 Jun 2004 04:28:08 -0000	1.2
--- BasicClass.cs	31 Aug 2004 20:24:24 -0000	1.3
***************
*** 5,36 ****
  {
  
! 	[Serializable]
! 	public class SerializableClass 
! 	{
! 		public int _classId;
! 		public string _classString;
! 
! 		public override int GetHashCode()
! 		{
! 			// not a good method, but all that is needed for this Class
! 			// to be used by tests.
! 			return base.GetHashCode();
! 		}
! 
! 		public override bool Equals(object obj)
! 		{
! 			SerializableClass lhs = obj as SerializableClass;
! 			if(lhs==null) return false;
! 
! 			if(this==lhs) return true;
! 
! 			if(this._classId.Equals(lhs._classId) 
! 				&& this._classString.Equals(this._classString)) return true;
! 
! 			return false;
! 		}
! 
! 	}
! 
  	/// <summary>
  	/// Summary description for BasicClass.
--- 5,9 ----
  {
  
! 	
  	/// <summary>
  	/// Summary description for BasicClass.
***************
*** 53,57 ****
  		private int _int32Property;
  		private long _int64Property;
- 		private SerializableClass _serializableProperty;
  		private float _singleProperty;
  		private string _stringProperty;
--- 26,29 ----
***************
*** 70,76 ****
  		public BasicClass()
  		{
! 			_serializableProperty = new SerializableClass();
! 			_serializableProperty._classId = 5;
! 			_serializableProperty._classString = "serialize me";
  		}
  
--- 42,46 ----
  		public BasicClass()
  		{
! 			
  		}
  
***************
*** 147,156 ****
  		}
  
- 		public SerializableClass SerializableProperty 
- 		{
- 			get {return _serializableProperty;}
- 			set {_serializableProperty = value;}
- 		}
- 
  		public float SingleProperty 
  		{
--- 117,120 ----

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Fo.cs,1.1,1.2 Fo.hbm.xml,1.7,1.8 Foo.cs,1.11,1.12 FooBar.hbm.xml,1.14,1.15 FooProxy.cs,1.5,1.6 NHibernate.DomainModel-1.1.csproj,1.22,1.23 Parent.cs,1.3,1.4 ParentChild.hbm.xml,1.4,1.5

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

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

Modified Files:
	Fo.cs Fo.hbm.xml Foo.cs FooBar.hbm.xml FooProxy.cs 
	NHibernate.DomainModel-1.1.csproj Parent.cs 
	ParentChild.hbm.xml 
Log Message:
Beginning to isolate the Types so I can figure out what is ADO.NET driver
problems and which are NHibernate problems.  NH works great with Ms
Sql 2000, but not so great with MySql & Oracle.

Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FooBar.hbm.xml	23 Aug 2004 02:11:53 -0000	1.14
--- FooBar.hbm.xml	31 Aug 2004 20:24:23 -0000	1.15
***************
*** 69,74 ****
  		<property name="Byte" column="byte_"/>
  		<property name="YesNo" type="yes_no"/>
! 		<property name="Blob" type="NHibernate.DomainModel.Foo+Struct, NHibernate.DomainModel" column="blobb_"/>
! 		<property name="NullBlob" type="Serializable"/>
  		<property name="Status" column="`status_@###`" type="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel"/>
  		<property name="Binary" column="bin_"/>
--- 69,73 ----
  		<property name="Byte" column="byte_"/>
  		<property name="YesNo" type="yes_no"/>
! 		
  		<property name="Status" column="`status_@###`" type="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel"/>
  		<property name="Binary" column="bin_"/>

Index: Fo.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fo.hbm.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Fo.hbm.xml	21 Aug 2004 16:40:42 -0000	1.7
--- Fo.hbm.xml	31 Aug 2004 20:24:23 -0000	1.8
***************
*** 24,42 ****
  			/>
  		</composite-id>
  		<version 
  			name="Version" 
  			type="Int64" 
  		/>
- 		<!-- 
- 			todo: what property matches to a java version of Serializable?? 
- 			This is kind of a hack because NHibernate doesn't match System.Object to
- 			ObjectType.
- 		-->
- 		<property 
- 			name="Serial" 
- 			column="serial_" 
- 			type="Serializable"
- 			length="4000"
- 		/>
  		
  		<property name="Buf" length="500"/>
--- 24,32 ----
  			/>
  		</composite-id>
+ 		
  		<version 
  			name="Version" 
  			type="Int64" 
  		/>
  		
  		<property name="Buf" length="500"/>

Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** NHibernate.DomainModel-1.1.csproj	25 Aug 2004 04:06:20 -0000	1.22
--- NHibernate.DomainModel-1.1.csproj	31 Aug 2004 20:24:23 -0000	1.23
***************
*** 631,634 ****
--- 631,652 ----
                  />
                  <File
+                     RelPath = "NHSpecific\BasicObject.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "NHSpecific\BasicObject.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "NHSpecific\BasicSerializable.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "NHSpecific\BasicSerializable.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
                      RelPath = "NHSpecific\BlobberInMemory.cs"
                      SubType = "Code"

Index: Foo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Foo.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Foo.cs	23 Aug 2004 02:11:53 -0000	1.11
--- Foo.cs	31 Aug 2004 20:24:23 -0000	1.12
***************
*** 23,43 ****
  	public class Foo : FooProxy, ILifecycle
  	{
! 		[Serializable]
! 		public class Struct
! 		{
! 			public string name;
! 			public int count;
! 
! 			public override bool Equals(object obj)
! 			{
! 				Struct s = (Struct) obj;
! 				return ( s.name==name || s.name.Equals(name) ) && s.count==count;
! 			}
! 	 
! 			public override int GetHashCode()
! 			{
! 				return count;
! 			}
! 		}
  
  		#region Fields
--- 23,43 ----
  	public class Foo : FooProxy, ILifecycle
  	{
! //		[Serializable]
! //		public class Struct
! //		{
! //			public string name;
! //			public int count;
! //
! //			public override bool Equals(object obj)
! //			{
! //				Struct s = (Struct) obj;
! //				return ( s.name==name || s.name.Equals(name) ) && s.count==count;
! //			}
! //	 
! //			public override int GetHashCode()
! //			{
! //				return count;
! //			}
! //		}
  
  		#region Fields
***************
*** 63,68 ****
  		private byte _byte;
  		private bool _yesno;
- 		private Foo.Struct _blob;
- 		private object _nullBlob;
  		private FooStatus _status;
  		private byte[] _binary;
--- 63,66 ----
***************
*** 251,272 ****
  	
  		/// <summary>
- 		/// Get/set for blob
- 		/// </summary>
- 		public Foo.Struct Blob
- 		{
- 			get { return _blob; }
- 			set { _blob = value; }
- 		}
- 	
- 		/// <summary>
- 		/// Get/set for nullBlob
- 		/// </summary>
- 		public object NullBlob
- 		{
- 			get { return _nullBlob; }
- 			set { _nullBlob = value; }
- 		}
- 	
- 		/// <summary>
  		/// Get/set for status
  		/// </summary>
--- 249,252 ----
***************
*** 390,397 ****
  			_char = '@';
  			_bytes = System.Text.Encoding.ASCII.GetBytes(_string);
- 			Struct ss = new Struct();
- 			ss.name="name";
- 			ss.count = 69;
- 			_blob = ss;
  			_status=FooStatus.ON;
  			_binary = System.Text.Encoding.ASCII.GetBytes( _string + "yada yada yada" );
--- 370,373 ----
***************
*** 459,463 ****
  				&& ( _zero == other.Zero )
  				&& ( ( _foo == other.TheFoo ) || ( _foo.Key.Equals( other.TheFoo.Key ) ) )
! 				&& ( ( _blob == other.Blob ) || ( _blob.Equals(other.Blob) ) )
  				&& ( _yesno == other.YesNo )
  				&& ( _status == other.Status )
--- 435,439 ----
  				&& ( _zero == other.Zero )
  				&& ( ( _foo == other.TheFoo ) || ( _foo.Key.Equals( other.TheFoo.Key ) ) )
! //				&& ( ( _blob == other.Blob ) || ( _blob.Equals(other.Blob) ) )
  				&& ( _yesno == other.YesNo )
  				&& ( _status == other.Status )

Index: Parent.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Parent.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Parent.cs	9 Jun 2004 01:03:59 -0000	1.3
--- Parent.cs	31 Aug 2004 20:24:23 -0000	1.4
***************
*** 11,15 ****
  		private int _count;
  		private Child _child;
- 		private object _any;
  		private int _x;
  		
--- 11,14 ----
***************
*** 32,43 ****
  		}
  
- 		
- 		public object Any
- 		{
- 			get { return _any; }
- 			set { _any = value; }
- 		}
- 
- 		
  		public int X
  		{
--- 31,34 ----

Index: ParentChild.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ParentChild.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ParentChild.hbm.xml	13 Aug 2004 13:26:35 -0000	1.4
--- ParentChild.hbm.xml	31 Aug 2004 20:24:23 -0000	1.5
***************
*** 14,21 ****
  		<property name="Count" column="count_"/>
  		<one-to-one name="Child"/>
!         <property name="Any" type="Object">
!         	<column name="any_id"/>
!         	<column name="any_class"/>
!         </property>
  	</class>
  	
--- 14,18 ----
  		<property name="Count" column="count_"/>
  		<one-to-one name="Child"/>
! 		
  	</class>
  	

Index: FooProxy.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooProxy.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FooProxy.cs	6 Jul 2004 04:26:32 -0000	1.5
--- FooProxy.cs	31 Aug 2004 20:24:23 -0000	1.6
***************
*** 35,50 ****
  		}
  
- 		object NullBlob
- 		{
- 			get;
- 			set;
- 		}
- 
- 		Foo.Struct Blob
- 		{
- 			get;
- 			set;
- 		}
- 
  		bool YesNo
  		{
--- 35,38 ----

Index: Fo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fo.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Fo.cs	3 Jun 2004 03:23:33 -0000	1.1
--- Fo.cs	31 Aug 2004 20:24:17 -0000	1.2
***************
*** 13,17 ****
  
  		private byte[] _buf;
- 		private object _serial;
  		private long _version;
  		private int _x;
--- 13,16 ----
***************
*** 23,33 ****
  		}
  
- 		public object Serial
- 		{
- 			get { return _serial; }
- 			set { _serial = value; }
- 		}
- 
- 		
  		public long Version
  		{
--- 22,25 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Ps PreparedStatementCache.cs,1.2,NONE

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

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

Removed Files:
	PreparedStatementCache.cs 
Log Message:
Removed PreparedStatementCache code.

--- PreparedStatementCache.cs DELETED ---

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

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

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

Modified Files:
	NullableType.cs 
Log Message:
Removed PreparedStatementCache code.

Index: NullableType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/NullableType.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NullableType.cs	20 Aug 2004 17:39:01 -0000	1.9
--- NullableType.cs	31 Aug 2004 13:14:26 -0000	1.10
***************
*** 4,8 ****
  using NHibernate.SqlTypes;
  using NHibernate.Engine;
- using NHibernate.Ps;
  using NHibernate.Util;
  
--- 4,7 ----

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.42,1.43

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

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

Modified Files:
	NHibernate-1.1.csproj 
Log Message:
Removed PreparedStatementCache code.

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** NHibernate-1.1.csproj	25 Aug 2004 03:58:08 -0000	1.42
--- NHibernate-1.1.csproj	31 Aug 2004 13:14:24 -0000	1.43
***************
*** 1414,1422 ****
                  />
                  <File
-                     RelPath = "Ps\PreparedStatementCache.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "SqlCommand\Alias.cs"
                      SubType = "Code"
--- 1414,1417 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Environment.cs,1.16,1.17

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

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

Modified Files:
	Environment.cs 
Log Message:
Removed PreparedStatementCache code.

Index: Environment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Environment.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Environment.cs	28 Aug 2004 04:08:43 -0000	1.16
--- Environment.cs	31 Aug 2004 13:14:24 -0000	1.17
***************
*** 38,42 ****
  		public const string ConnectionString = "hibernate.connection.connection_string";
  		public const string Isolation = "hibernate.connection.isolation";
- 		public const string StatementCacheSize = "hibernate.statement_cache.size";
  		public const string SessionFactoryName = "hibernate.session_factory_name";
  		public const string Dialect = "hibernate.dialect";
--- 38,41 ----
***************
*** 57,61 ****
  		public const string StatementFetchSize = "hibernate.jdbc.fetch_size";
  		public const string UseScrollableResultSet = "hibernate.jdbc.use_scrollable_resultset";
! 
  		static Environment() 
  		{
--- 56,60 ----
  		public const string StatementFetchSize = "hibernate.jdbc.fetch_size";
  		public const string UseScrollableResultSet = "hibernate.jdbc.use_scrollable_resultset";
! 		
  		static Environment() 
  		{

[Nhibernate-commit] nhibernate/src/NHibernate/Impl BatcherImpl.cs,1.3,1.4 SessionFactoryImpl.cs,1.28,1.29

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

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

Modified Files:
	BatcherImpl.cs SessionFactoryImpl.cs 
Log Message:
Removed PreparedStatementCache code.

Index: SessionFactoryImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionFactoryImpl.cs,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** SessionFactoryImpl.cs	28 Aug 2004 04:07:04 -0000	1.28
--- SessionFactoryImpl.cs	31 Aug 2004 13:14:25 -0000	1.29
***************
*** 19,23 ****
  using NHibernate.Metadata;
  using NHibernate.Persister;
- using NHibernate.Ps;
  using NHibernate.Transaction;
  using NHibernate.Type;
--- 19,22 ----
***************
*** 82,86 ****
  		[NonSerialized] private IDictionary querySubstitutions;
  		[NonSerialized] private Dialect.Dialect dialect;
- 		[NonSerialized] private PreparedStatementCache statementCache;
  		[NonSerialized] private ITransactionFactory transactionFactory;
  		[NonSerialized] private int adoBatchSize;
--- 81,84 ----
***************
*** 133,142 ****
  			connectionProvider = ConnectionProviderFactory.NewConnectionProvider(properties);
  
- 			// TODO: DESIGNQUESTION: There are other points in the application that have questions about the
- 			// statementCache - I just don't see this as being needed yet.  
- 			int cacheSize = PropertiesHelper.GetInt32( Cfg.Environment.StatementCacheSize, properties, 0);
- 			statementCache = ( cacheSize<1 || connectionProvider.IsStatementCache ) ? null : new PreparedStatementCache(cacheSize);
- 			//statementCache = null;
- 
  			statementFetchSize = PropertiesHelper.GetInt32( Cfg.Environment.StatementFetchSize, properties, -1);
  			if((int)statementFetchSize==-1) statementFetchSize = null;
--- 131,134 ----
***************
*** 569,633 ****
  		}
  
- 		//TODO: revisit if we want the SessionFactoryImpl to store the PreparedStatements considering
- 		// that ADO.NET handles prepared Commands differently depending on the provider
- 		public IDbCommand GetPreparedStatement(IDbConnection conn, string sql, bool scrollable) {
- 
- 			if ( log.IsDebugEnabled ) log.Debug("prepared statement get: " + sql);
- 			if ( showSql ) log.Debug("Hibernate: " + sql);
- 
- 			//TODO: what would be the implications of hooking up the PreparedStatment (IDbCommand) to
- 			// the IDbTransaction at this point.  I am a little nervous about this because the SessionFactory
- 			// is not specific to a Session.  So would the IDbCommand object be shared among different sessions?
- 			// Would that cause us to run into problems where one Session would be using the Transaction from 
- 			// a different Session??
- 			// NOTE: I have commented out the code that assigns the statement cache - so it will always
- 			// be null and we will be creating a new command each time.
- 					
- 			if ( statementCache != null ) 
- 			{
- 				return statementCache.GetPreparedStatement(sql, conn);
- 			} 
- 			else {
- 				try {
- 					log.Debug("preparing statement");
- 					IDbCommand retVal = conn.CreateCommand();
- 					retVal.CommandText = sql;
- 					retVal.CommandType = CommandType.Text;
- 
- 					
- 					// Hack: disable Prepare() as long as the parameters have no datatypes!!
- #if FALSE
- 					retVal.Prepare();
- #endif
- 					// end-of Hack
- 
- 					return retVal;
- 				} 
- 				catch (Exception e) {
- 					throw e;
- 				}
- 			}
- 		}
- 
- 		public void ClosePreparedStatement(IDbCommand ps) 
- 		{
- 			if ( statementCache != null ) {
- 				statementCache.ClosePreparedStatement(ps);
- 			} else {
- 				try {
- 					log.Debug("closing statement");
- 					//TODO: there is some missing logic about when this gets called - with the OleDb driver
- 					// as soon as the Dispose is called the CommandText=="", with SqlServer driver that 
- 					// is not occurring - don't know why not???  This prevents a command from being called
- 					// more than 1 time in a row...
- 					// In H2.0.3 this is a Close - not a dispose.  It looks like each Provider implements
- 					// Dispose just a bit differently...
- 					//ps.Dispose();
- 				} catch (Exception e) {
- 					throw e;
- 				}
- 			}
- 		}
- 
  		public bool UseAdoBatch {
  			get { return adoBatchSize > 0; }
--- 561,564 ----

Index: BatcherImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/BatcherImpl.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BatcherImpl.cs	28 Aug 2004 04:18:40 -0000	1.3
--- BatcherImpl.cs	31 Aug 2004 13:14:25 -0000	1.4
***************
*** 77,83 ****
  			LogOpenPreparedCommands();
  			
- 			//return JoinTransaction( factory.GetPreparedStatement( session.Connection, sql, false) );
  			return session.Preparer.PrepareCommand(sql);
- 
  		}
  		
--- 77,81 ----
***************
*** 88,92 ****
  			LogOpenPreparedCommands();
  			IDbCommand command = session.Preparer.PrepareCommand(sql);
- 			//factory.GetPreparedStatement( session.Connection, sql, false );
  			
  			// not sure if this is needed because fetch size doesn't apply
--- 86,89 ----
***************
*** 167,171 ****
  		{
  			LogClosePreparedCommands();
- 			// factory.ClosePreparedStatement(cmd);
  		}
  
--- 164,167 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Engine ISessionFactoryImplementor.cs,1.7,1.8

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

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

Modified Files:
	ISessionFactoryImplementor.cs 
Log Message:
Removed PreparedStatementCache code.

Index: ISessionFactoryImplementor.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Engine/ISessionFactoryImplementor.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ISessionFactoryImplementor.cs	28 Aug 2004 04:15:12 -0000	1.7
--- ISessionFactoryImplementor.cs	31 Aug 2004 13:14:24 -0000	1.8
***************
*** 109,127 ****
  
  		/// <summary>
- 		/// Dispose of a prepared statement
- 		/// </summary>
- 		/// <param name="ps"></param>
- 		void ClosePreparedStatement(IDbCommand ps);
- 
- 		/// <summary>
- 		/// Obtain a prepared statement
- 		/// </summary>
- 		/// <param name="conn"></param>
- 		/// <param name="sql"></param>
- 		/// <param name="scrollable"></param>
- 		/// <returns></returns>
- 		IDbCommand GetPreparedStatement(IDbConnection conn, string sql, bool scrollable);
- 
- 		/// <summary>
  		/// The ADO.NET batch size 
  		/// </summary>
--- 109,112 ----

[Nhibernate-commit] nhibernate/src/NHibernate.Test MasterDetailTest.cs,1.13,1.14

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

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

Modified Files:
	MasterDetailTest.cs 
Log Message:
It's good to know, how big is the session.


Index: MasterDetailTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MasterDetailTest.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MasterDetailTest.cs	30 Aug 2004 18:28:11 -0000	1.13
--- MasterDetailTest.cs	31 Aug 2004 08:23:31 -0000	1.14
***************
*** 398,401 ****
--- 398,402 ----
  			f.Serialize(stream, s);
  			stream.Position = 0;
+ 			Console.WriteLine(stream.Length);
  
  			s = (ISession)f.Deserialize(stream);

[Nhibernate-commit] nhibernate releasenotes.txt,1.10,1.11

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

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

Modified Files:
	releasenotes.txt 
Log Message:
updated with latest modifications.

Index: releasenotes.txt
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/releasenotes.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** releasenotes.txt	27 Aug 2004 13:30:47 -0000	1.10
--- releasenotes.txt	30 Aug 2004 18:32:04 -0000	1.11
***************
*** 7,11 ****
  - Fixed bug with Hql and multi column IType
  - Fixed bug with NullReferenceException and TypeType class.
! - Simple Filters are now working.
  - Compiled Queries and Filters are now cached.
  - Refactored Hql to use a SqlString instead of string containing sql.
--- 7,11 ----
  - Fixed bug with Hql and multi column IType
  - Fixed bug with NullReferenceException and TypeType class.
! - ISession.Filter() is now working.
  - Compiled Queries and Filters are now cached.
  - Refactored Hql to use a SqlString instead of string containing sql.
***************
*** 16,19 ****
--- 16,20 ----
  - Added Types to read BLOB/CLOB columns to a byte[]/string Property.
  - TypeFactory was modified to allow the attribute "type" to be the Assembly Qualified Name, Full Name, NHibernate IType.Name, or Hibernate name to help with porting hibernate hbm.xml files and Net2Hbm that John is writing.
+ - Fixed bug with Hql and scalar queries 
  
  PreAlpha Build 0.1.0.0

[Nhibernate-commit] nhibernate/src/NHibernate.Test MasterDetailTest.cs,1.12,1.13

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

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

Modified Files:
	MasterDetailTest.cs 
Log Message:
Fixed NH-79

Index: MasterDetailTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MasterDetailTest.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MasterDetailTest.cs	20 Aug 2004 15:34:05 -0000	1.12
--- MasterDetailTest.cs	30 Aug 2004 18:28:11 -0000	1.13
***************
*** 115,119 ****
  
  		[Test]
- 		[Ignore("HQL bugs - http://jira.nhibernate.org:8080/browse/NH-79")]
  		public void MasterDetail() 
  		{
--- 115,118 ----
***************
*** 190,195 ****
  			s.Close();
  
- 			//http://jira.nhibernate.org:8080/browse/NH-79
- 			/* 
  			s = sessions.OpenSession();
  			t = s.BeginTransaction();
--- 189,192 ----
***************
*** 202,207 ****
  			t.Commit();
  			s.Close();
- 			*/
- 
  
  			s = sessions.OpenSession();
--- 199,202 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Hql QueryTranslator.cs,1.42,1.43

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

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

Modified Files:
	QueryTranslator.cs 
Log Message:
Fixed NH-79

Index: QueryTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** QueryTranslator.cs	27 Aug 2004 04:13:17 -0000	1.42
--- QueryTranslator.cs	30 Aug 2004 18:28:11 -0000	1.43
***************
*** 532,537 ****
  			{
  				rtsize = returnTypes.Count;
! 				foreach(string entityName in entitiesToFetch)
  					returnTypes.Add(entityName);
  			}
  			
--- 532,539 ----
  			{
  				rtsize = returnTypes.Count;
! 				foreach(string entityName in entitiesToFetch) 
! 				{
  					returnTypes.Add(entityName);
+ 				}
  			}
  			
***************
*** 556,560 ****
  
  			int scalarSize = scalarTypes.Count;
! 			hasScalars = scalarTypes.Count!=size;
  
  			types = new IType[scalarSize];
--- 558,562 ----
  
  			int scalarSize = scalarTypes.Count;
! 			hasScalars = scalarTypes.Count!=rtsize;
  
  			types = new IType[scalarSize];

[Nhibernate-commit] nhibernate/src/NHibernate/Persister EntityPersister.cs,1.26,1.27 NormalizedEntityPersister.cs,1.29,1.30

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

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

Modified Files:
	EntityPersister.cs NormalizedEntityPersister.cs 
Log Message:
Fixed problems with FOR UPDATE NOWAIT string that was being built.

Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NormalizedEntityPersister.cs	28 Aug 2004 17:16:21 -0000	1.29
--- NormalizedEntityPersister.cs	30 Aug 2004 02:49:06 -0000	1.30
***************
*** 530,534 ****
  				GenerateLockString(lockString, " FOR UPDATE") :
  				GenerateLockString(lockString, null);
! 			SqlString lockExclusiveNowaitString = dialect.SupportsForUpdate ? 
  				GenerateLockString(lockString, " FOR UPDATE NOWAIT") :
  				GenerateLockString(lockString, null);
--- 530,534 ----
  				GenerateLockString(lockString, " FOR UPDATE") :
  				GenerateLockString(lockString, null);
! 			SqlString lockExclusiveNowaitString = dialect.SupportsForUpdateNoWait ? 
  				GenerateLockString(lockString, " FOR UPDATE NOWAIT") :
  				GenerateLockString(lockString, null);

Index: EntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** EntityPersister.cs	28 Aug 2004 17:19:30 -0000	1.26
--- EntityPersister.cs	30 Aug 2004 02:49:06 -0000	1.27
***************
*** 357,361 ****
  				GenerateLockString(lockString, " FOR UPDATE") :
  				GenerateLockString(lockString, null);
! 			SqlString lockExclusiveNowaitString = dialect.SupportsForUpdate ? 
  				GenerateLockString(lockString, " FOR UPDATE NOWAIT") :
  				GenerateLockString(lockString, null);
--- 357,361 ----
  				GenerateLockString(lockString, " FOR UPDATE") :
  				GenerateLockString(lockString, null);
! 			SqlString lockExclusiveNowaitString = dialect.SupportsForUpdateNoWait ? 
  				GenerateLockString(lockString, " FOR UPDATE NOWAIT") :
  				GenerateLockString(lockString, null);
***************
*** 375,379 ****
  			
  			SqlString selectForUpdateNoWaitString = factory.Dialect.SupportsForUpdateNoWait ?
! 				GenerateSelectForUpdateString(" FOR UPDATE NO WAIT") : 
  				selectForUpdateString.Clone();
  
--- 375,379 ----
  			
  			SqlString selectForUpdateNoWaitString = factory.Dialect.SupportsForUpdateNoWait ?
! 				GenerateSelectForUpdateString(" FOR UPDATE NOWAIT") : 
  				selectForUpdateString.Clone();
  

[Nhibernate-commit] nhibernate/src/NHibernate/Persister AbstractEntityPersister.cs,1.22,1.23

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

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

Modified Files:
	AbstractEntityPersister.cs 
Log Message:
Commented a method better.

Index: AbstractEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/AbstractEntityPersister.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** AbstractEntityPersister.cs	23 Aug 2004 02:09:17 -0000	1.22
--- AbstractEntityPersister.cs	28 Aug 2004 17:20:17 -0000	1.23
***************
*** 409,412 ****
--- 409,418 ----
  		}
  
+ 		/// <summary>
+ 		/// Checks to make sure that one and only one row was affected
+ 		/// by the IDbCommand that was run.
+ 		/// </summary>
+ 		/// <param name="rows">The results of IDbCommand..ExecuteNonQuery()</param>
+ 		/// <param name="id">The idenitifer of the Entity.  Use for logging purposes.</param>
  		protected virtual void Check(int rows, object id) 
  		{

[Nhibernate-commit] nhibernate/src/NHibernate/Persister EntityPersister.cs,1.25,1.26

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

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

Modified Files:
	EntityPersister.cs 
Log Message:
fixed another spot with copy & paste code for expected row count...

Index: EntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** EntityPersister.cs	28 Aug 2004 04:26:29 -0000	1.25
--- EntityPersister.cs	28 Aug 2004 17:19:30 -0000	1.26
***************
*** 803,813 ****
  				Dehydrate(id, fields, notNull, insertCmd, session);
  				
! 				// IDbCommand REFACTOR 
! 				// session.Batcher.AddToBatch(1);
! 				int rowCount = insertCmd.ExecuteNonQuery();
! 
! 				//negative expected row count means we don't know how many rows to expect
! 				if ( rowCount > 0 && rowCount != 1)
! 					throw new HibernateException("SQL update or deletion failed (row not found)");
  
  			}
--- 803,807 ----
  				Dehydrate(id, fields, notNull, insertCmd, session);
  				
! 				session.Batcher.AddToBatch(1);
  
  			}
***************
*** 925,929 ****
  				deleteCmd = session.Batcher.PrepareBatchCommand( SqlDeleteString );
  			}
! 			
  			
  			try 
--- 919,923 ----
  				deleteCmd = session.Batcher.PrepareBatchCommand( SqlDeleteString );
  			}
! 						
  			
  			try 
***************
*** 1012,1017 ****
  			if (!hasUpdateableColumns) return;
  
- 
  			IDbCommand statement = null; 
  			if( IsVersioned ) 
  			{
--- 1006,1011 ----
  			if (!hasUpdateableColumns) return;
  
  			IDbCommand statement = null; 
+ 
  			if( IsVersioned ) 
  			{

[Nhibernate-commit] nhibernate/src/NHibernate/Persister NormalizedEntityPersister.cs,1.28,1.29

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

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

Modified Files:
	NormalizedEntityPersister.cs 
Log Message:
Removed a comment that no longer applied.

Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** NormalizedEntityPersister.cs	28 Aug 2004 04:26:29 -0000	1.28
--- NormalizedEntityPersister.cs	28 Aug 2004 17:16:21 -0000	1.29
***************
*** 944,948 ****
  
  				IDbCommand st = session.Batcher.PrepareCommand( (SqlString)lockers[lockMode] );
- 
  				try 
  				{
--- 944,947 ----
***************
*** 1207,1211 ****
  					IdentifierType.NullSafeSet( statements[i], id, 0, session );
  
- 					// TODO: see if we want to synch this design up with EntityPersister, inconsistent right now...
  					Check( statements[i].ExecuteNonQuery(), id );
  				}
--- 1206,1209 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Impl PreparerImpl.cs,1.8,1.9

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

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

Modified Files:
	PreparerImpl.cs 
Log Message:
Removed some comments that no longer applied.

Index: PreparerImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/PreparerImpl.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PreparerImpl.cs	25 Aug 2004 03:54:49 -0000	1.8
--- PreparerImpl.cs	28 Aug 2004 16:30:18 -0000	1.9
***************
*** 152,159 ****
  				dbCommand = JoinTransaction(dbCommand);
  			
- 				// TODO: remove this comment for Prepare() once we have fixed up the SqlTypes
- 				// and are able to differentiate between a Command that can be prepared and 
- 				// one that cannot.
- 				// for example - with SqlServer2000 a Command with a binary type 
  				if(factory.ConnectionProvider.Driver.SupportsPreparingCommands) 
  				{
--- 152,155 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Util IdentityMap.cs,1.11,1.12

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

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

Modified Files:
	IdentityMap.cs 
Log Message:
Added more details to error message.

Index: IdentityMap.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/IdentityMap.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IdentityMap.cs	9 Aug 2004 03:18:49 -0000	1.11
--- IdentityMap.cs	28 Aug 2004 15:51:29 -0000	1.12
***************
*** 251,255 ****
  			if(obj is System.ValueType) 
  			{
! 				throw new ArgumentException("A ValueType can not be used with IdentityKey.  " + 
  					"The thread at google has a good description about what happens with boxing " + 
  					"and unboxing ValueTypes and why they can not be used as an IdentityKey: " + 
--- 251,259 ----
  			if(obj is System.ValueType) 
  			{
! 				throw new ArgumentException(
! 					"There is a problem with your mappings.  You are probably trying to map a System.ValueType to " + 
! 					"a <class> which NHibernate does not allow or you are incorrectly using the " +
! 					"IDictionary that is mapped to a <set>.  \n\n" + 
! 					"A ValueType can not be used with IdentityKey.  " + 
  					"The thread at google has a good description about what happens with boxing " + 
  					"and unboxing ValueTypes and why they can not be used as an IdentityKey: " + 

[Nhibernate-commit] nhibernate/src/NHibernate/Hql WhereParser.cs,1.20,1.21

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

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

Modified Files:
	WhereParser.cs 
Log Message:
Removed a TODO that doesn't apply anymore.

Index: WhereParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/WhereParser.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** WhereParser.cs	20 Aug 2004 17:39:02 -0000	1.20
--- WhereParser.cs	28 Aug 2004 15:33:56 -0000	1.21
***************
*** 31,35 ****
  		private static StringCollection expressionTerminators = new StringCollection(); //tokens that close a sub expression
  		private static StringCollection expressionOpeners = new StringCollection(); //tokens that open a sub expression
- 		//TODO: HACK to make this internal for QueryTranslator...
  		private static StringCollection booleanOperators = new StringCollection(); //tokens that would indicate a sub expression is a boolean expression
  
--- 31,34 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect MsSql2000Dialect.cs,1.17,1.18

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

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

Modified Files:
	MsSql2000Dialect.cs 
Log Message:
Cleaned up code a little bit.

Index: MsSql2000Dialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MsSql2000Dialect.cs	25 Aug 2004 03:55:56 -0000	1.17
--- MsSql2000Dialect.cs	28 Aug 2004 15:32:33 -0000	1.18
***************
*** 19,32 ****
  			Register( DbType.AnsiString, "VARCHAR(255)" );
  			Register( DbType.AnsiString, 8000, "VARCHAR($1)" );
! 			Register( DbType.AnsiString, 2147483647, "TEXT"); // should use the IType.ClobType
! 			// TODO: figure out how to support this - VARCHAR > 8000 since
! 			// there is no DbType.CLOB - might just make it a mapping
! 			// requirement that they specify a sql-type or make NHibernate's
! 			// own DbType enum or use SqlType as the key for Register
! 			//Register( DbType.AnsiString, "TEXT" );
  			Register( DbType.Binary, "VARBINARY(8000)");
  			Register( DbType.Binary, 8000, "VARBINARY($1)");
! 			Register( DbType.Binary, 2147483647, "IMAGE" );// should use the IType.BlobType
! 			Register( DbType.Boolean, "BIT" ); //Sybase BIT type does not support null values
  			Register( DbType.Byte, "TINYINT" );
  			Register( DbType.Currency, "MONEY");
--- 19,27 ----
  			Register( DbType.AnsiString, "VARCHAR(255)" );
  			Register( DbType.AnsiString, 8000, "VARCHAR($1)" );
! 			Register( DbType.AnsiString, 2147483647, "TEXT"); 
  			Register( DbType.Binary, "VARBINARY(8000)");
  			Register( DbType.Binary, 8000, "VARBINARY($1)");
! 			Register( DbType.Binary, 2147483647, "IMAGE" );
! 			Register( DbType.Boolean, "BIT" ); 
  			Register( DbType.Byte, "TINYINT" );
  			Register( DbType.Currency, "MONEY");
***************
*** 52,56 ****
  			Register( DbType.String, "NVARCHAR(255)" );
  			Register( DbType.String, 4000, "NVARCHAR($1)" );
! 			Register( DbType.String, 1073741823, "NTEXT" );// should use the IType.ClobType
  			Register( DbType.Time, "DATETIME" );
  			
--- 47,51 ----
  			Register( DbType.String, "NVARCHAR(255)" );
  			Register( DbType.String, 4000, "NVARCHAR($1)" );
! 			Register( DbType.String, 1073741823, "NTEXT" );
  			Register( DbType.Time, "DATETIME" );
  			

[Nhibernate-commit] nhibernate/src/NHibernate/Collection CollectionPersister.cs,1.27,1.28

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

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

Modified Files:
	CollectionPersister.cs 
Log Message:
Removed all the hacks with expected row count now that batcher is 
implemented.

Index: CollectionPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/CollectionPersister.cs,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** CollectionPersister.cs	28 Aug 2004 04:23:44 -0000	1.27
--- CollectionPersister.cs	28 Aug 2004 15:31:46 -0000	1.28
***************
*** 717,728 ****
  								WriteKey(st, id, false, session);
  								collection.WriteTo(st, this, entry, i, false);
! 								//TODO: this is hackish for expected row count
! 								int expectedRowCount = 1;
! 								int rowCount = st.ExecuteNonQuery();
! 
! 								//negative expected row count means we don't know how many rows to expect
! 								if ( expectedRowCount>0 && expectedRowCount!=rowCount )
! 									throw new HibernateException("SQL update or deletion failed (row not found)");
! 								//session.Batcher.AddToBatch(1);
  							}
  							i++;
--- 717,721 ----
  								WriteKey(st, id, false, session);
  								collection.WriteTo(st, this, entry, i, false);
! 								session.Batcher.AddToBatch(1);
  							}
  							i++;

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Binder.cs,1.29,1.30

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

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

Modified Files:
	Binder.cs 
Log Message:
Removed some TODO's that are complete or won't be done.

Index: Binder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Binder.cs,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Binder.cs	22 Aug 2004 06:24:26 -0000	1.29
--- Binder.cs	28 Aug 2004 15:31:07 -0000	1.30
***************
*** 815,821 ****
  				cascade[i] = prop.CascadeStyle;
  				joinedFetch[i] = prop.Value.OuterJoinFetchSetting;
! 				//skiping dynaprops
! 				//TODO: Dynaprops
! 
  				// the setters is new code added for field access
  				setters[i] = prop.GetSetter( model.ComponentClass );
--- 815,819 ----
  				cascade[i] = prop.CascadeStyle;
  				joinedFetch[i] = prop.Value.OuterJoinFetchSetting;
! 				
  				// the setters is new code added for field access
  				setters[i] = prop.GetSetter( model.ComponentClass );
***************
*** 825,829 ****
  			}
  
- 			//TODO: resume here with adding setters and getters
  			model.Type = 
  				(IType) new ComponentType( model.ComponentClass, names, getters, setters, foundCustomAccessor, types, joinedFetch, cascade, model.ParentProperty, model.IsEmbedded );
--- 823,826 ----

[Nhibernate-commit] nhibernate/src/NHibernate/SqlCommand SqlSelectBuilder.cs,1.2,1.3

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

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

Modified Files:
	SqlSelectBuilder.cs 
Log Message:
Modified SetFromClause in SqlSelectBuilder to take a SqlString.  Removed
some of the HACKs that were in classes using that method.

Index: SqlSelectBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SqlSelectBuilder.cs	16 Aug 2004 05:18:52 -0000	1.2
--- SqlSelectBuilder.cs	28 Aug 2004 05:26:36 -0000	1.3
***************
*** 54,57 ****
--- 54,69 ----
  
  		/// <summary>
+ 		/// Sets the text that should appear after the FROM
+ 		/// </summary>
+ 		/// <param name="fromClause">The fromClause in a SqlString</param>
+ 		/// <returns>The SqlSelectBuilder</returns>
+ 		public SqlSelectBuilder SetFromClause(SqlString fromClause) 
+ 		{
+ 			// it is safe to do this because a fromClause will have no
+ 			// parameters
+ 			return SetFromClause( fromClause.ToString() );
+ 		}
+ 
+ 		/// <summary>
  		/// Sets the text that should appear after the ORDER BY.
  		/// </summary>

[Nhibernate-commit] nhibernate/src/NHibernate/Loader AbstractEntityLoader.cs,1.9,1.10 OneToManyLoader.cs,1.9,1.10 OuterJoinLoader.cs,1.13,1.14

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

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

Modified Files:
	AbstractEntityLoader.cs OneToManyLoader.cs OuterJoinLoader.cs 
Log Message:
Modified SetFromClause in SqlSelectBuilder to take a SqlString.  Removed
some of the HACKs that were in classes using that method.

Index: AbstractEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/AbstractEntityLoader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AbstractEntityLoader.cs	19 Aug 2004 17:49:59 -0000	1.9
--- AbstractEntityLoader.cs	28 Aug 2004 05:26:36 -0000	1.10
***************
*** 41,50 ****
  				SelectString(persister, alias, suffixes[joins] )
  				)
- 				//TODO: HACK with ToString() required because of SetFromClause
  				.SetFromClause
  				(
  					persister.FromTableFragment(alias).Append(
  						persister.FromJoinFragment(alias, true, true)
! 					).ToString()
  				)
  				.SetOuterJoins
--- 41,49 ----
  				SelectString(persister, alias, suffixes[joins] )
  				)
  				.SetFromClause
  				(
  					persister.FromTableFragment(alias).Append(
  						persister.FromJoinFragment(alias, true, true)
! 					)
  				)
  				.SetOuterJoins
***************
*** 87,95 ****
  				);
  
- 			//TODO: HACK with ToString() because of SetFromClause
  			sqlBuilder.SetFromClause(
  				persister.FromTableFragment(alias).Append(
  					persister.FromJoinFragment(alias, true, true)
! 				).ToString()
  			);
  
--- 86,93 ----
  				);
  
  			sqlBuilder.SetFromClause(
  				persister.FromTableFragment(alias).Append(
  					persister.FromJoinFragment(alias, true, true)
! 				)
  			);
  

Index: OuterJoinLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** OuterJoinLoader.cs	16 Aug 2004 05:26:39 -0000	1.13
--- OuterJoinLoader.cs	28 Aug 2004 05:26:36 -0000	1.14
***************
*** 424,428 ****
  		private static void AppendSelectString(StringBuilder buf, ILoadable persister, string alias, string suffix) 
  		{
! 			//TODO: HACKs with ToString()
  			buf.Append( persister.IdentifierSelectFragment(alias,suffix).ToString() )
  				.Append( persister.PropertySelectFragment(alias, suffix).ToString() );
--- 424,429 ----
  		private static void AppendSelectString(StringBuilder buf, ILoadable persister, string alias, string suffix) 
  		{
! 			// doing a ToString is okay because SelectFragments will have no parameters
! 			// and will be just straight strings cotaining sql.
  			buf.Append( persister.IdentifierSelectFragment(alias,suffix).ToString() )
  				.Append( persister.PropertySelectFragment(alias, suffix).ToString() );

Index: OneToManyLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OneToManyLoader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OneToManyLoader.cs	19 Aug 2004 17:49:59 -0000	1.9
--- OneToManyLoader.cs	28 Aug 2004 05:26:36 -0000	1.10
***************
*** 62,70 ****
  
  
- 			//TODO: HACK with ToString() because of SetFromClause
  			selectBuilder.SetFromClause(
  				persister.FromTableFragment(alias).Append(
  					persister.FromJoinFragment(alias, true, true)
! 				).ToString()
  			);
  
--- 62,69 ----
  
  
  			selectBuilder.SetFromClause(
  				persister.FromTableFragment(alias).Append(
  					persister.FromJoinFragment(alias, true, true)
! 				)
  			);
  

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

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

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

Modified Files:
	Vetoer.hbm.xml 
Log Message:
Fixed http://jira.nhibernate.org:8080/browse/NH-82 - a <property> that was
mapping a class property of System.String[] was not mapping to 
SerializableType like h2.0.3.

Index: Vetoer.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Vetoer.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Vetoer.hbm.xml	15 Jul 2004 19:16:12 -0000	1.4
--- Vetoer.hbm.xml	28 Aug 2004 04:57:15 -0000	1.5
***************
*** 12,20 ****
  		</id>
  		<property name="Name" />
! 		<property name="Strings" type="System.String[]"/>
! 		<!-- 
! 			TODO: fix that NH is not recognizing this as an serializable object and that I have to add 
! 			type="System.String[]" to the property
! 		-->
  	</class>
  </hibernate-mapping>
\ No newline at end of file
--- 12,16 ----
  		</id>
  		<property name="Name" />
! 		<property name="Strings" /> 
  	</class>
  </hibernate-mapping>
\ No newline at end of file