Merge branch 'darrenkopp-NH-3252'

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH3252/Fixture.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using NHibernate.Linq;
+
+namespace NHibernate.Test.NHSpecificTest.NH3252
+{
+    [TestFixture]
+    public class Fixture : TestCase
+    {
+        protected override string MappingsAssembly
+        {
+            get { return "NHibernate.Test"; }
+        }
+
+        protected override IList Mappings
+        {
+            get { return new string[] { "NHSpecificTest.NH3252.Mappings.hbm.xml" }; }
+        }
+
+        [Test]
+        public void VerifyThatWeCanSaveAndLoad()
+        {
+            using (ISession session = OpenSession())
+            using (ITransaction transaction = session.BeginTransaction())
+            {
+
+                session.Save(new Note { Text = new String('0', 9000) });
+                transaction.Commit();
+            }
+
+            using (ISession session = OpenSession())
+            using (ITransaction transaction = session.BeginTransaction())
+            {
+
+                var note = session.Query<Note>().First();
+                Assert.AreEqual(9000, note.Text.Length);
+            }
+        }
+
+        protected override void OnTearDown()
+        {
+            using (ISession session = OpenSession())
+            using (ITransaction transaction = session.BeginTransaction())
+            {
+                session.Delete("from System.Object");
+
+                session.Flush();
+                transaction.Commit();
+            }
+        }
+    }
+}

src/NHibernate.Test/NHSpecificTest/NH3252/Mappings.hbm.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.Test.NHSpecificTest.NH3252" assembly="NHibernate.Test">
+  <class name="Note">
+    <id name="Id" type="Int32">
+      <generator class="identity" />
+    </id>
+    <property name="Text" type="AnsiString" length="10000" />
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH3252/Note.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH3252
+{
+    class Note
+    {
+        public virtual int Id { get; protected set; }
+
+        public virtual string Text { get; set; }
+    }
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -801,6 +801,8 @@
     <Compile Include="NHSpecificTest\NH3428\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3316\ByCodeFixture.cs" />
     <Compile Include="NHSpecificTest\NH3316\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3252\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3252\Note.cs" />
     <Compile Include="NHSpecificTest\NH3408\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3408\Model.cs" />
     <Compile Include="NHSpecificTest\NH2297\CustomCompositeUserType.cs" />
@@ -3163,6 +3165,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH3505\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3428\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3641\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH3252\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3408\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2408\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2297\MappingsNames.hbm.xml" />

src/NHibernate/Driver/SqlClientDriver.cs

@@ -122,7 +122,7 @@ protected static void SetDefaultParameterSize(IDbDataParameter dbParam, SqlType
 			{
 				case DbType.AnsiString:
 				case DbType.AnsiStringFixedLength:
-					dbParam.Size = MaxSizeForLengthLimitedAnsiString;
+                    dbParam.Size = IsAnsiText(dbParam, sqlType) ? MaxSizeForAnsiClob : MaxSizeForLengthLimitedAnsiString;
 					break;
 				case DbType.Binary:
 					dbParam.Size = IsBlob(dbParam, sqlType) ? MaxSizeForBlob : MaxSizeForLengthLimitedBinary;
@@ -144,6 +144,17 @@ protected static void SetDefaultParameterSize(IDbDataParameter dbParam, SqlType
 			}
 		}
 
+        /// <summary>
+        /// Interprets if a parameter is a Clob (for the purposes of setting its default size)
+        /// </summary>
+        /// <param name="dbParam">The parameter</param>
+        /// <param name="sqlType">The <see cref="SqlType" /> of the parameter</param>
+        /// <returns>True, if the parameter should be interpreted as a Clob, otherwise False</returns>
+        protected static bool IsAnsiText(IDbDataParameter dbParam, SqlType sqlType)
+        {
+            return ((DbType.AnsiString == dbParam.DbType || DbType.AnsiStringFixedLength == dbParam.DbType) && sqlType.LengthDefined && (sqlType.Length > MaxSizeForLengthLimitedAnsiString));
+        }
+
 		/// <summary>
 		/// Interprets if a parameter is a Clob (for the purposes of setting its default size)
 		/// </summary>