Added more properties to the test entity

Author: gliljas

src/NHibernate.Test/NHSpecificTest/GH1300/Entity.cs

@@ -5,5 +5,7 @@ class Entity
 		public virtual int Id { get; set; }
 		public virtual string Name { get; set; }
 		public virtual string AnsiName { get; set; }
+		public virtual string FullText { get; set; }
+		public virtual string AnsiFullText { get; set; }
 	}
 }

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

@@ -70,13 +70,17 @@ public void InsertShouldUseMappedSize()
 			using (var session = OpenSession())
 			using (var transaction = session.BeginTransaction())
 			{
-				var e1 = new Entity { Name = "Al", AnsiName = "Al" };
+				var e1 = new Entity { Name = "1", AnsiName = "2", FullText = "3", AnsiFullText = "4" };
 				session.Save(e1);
 				transaction.Commit();
-				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(SqlDbType.NVarChar));
-				Assert.That(Driver.LastCommandParameters.First().Size, Is.EqualTo(3));
-				Assert.That(Driver.LastCommandParameters.Last().SqlDbType, Is.EqualTo(SqlDbType.VarChar));
-				Assert.That(Driver.LastCommandParameters.Last().Size, Is.EqualTo(3));
+				Assert.That(Driver.LastCommandParameters.Single(x => (string) x.Value == "1").SqlDbType, Is.EqualTo(SqlDbType.NVarChar));
+				Assert.That(Driver.LastCommandParameters.Single(x => (string) x.Value == "1").Size, Is.EqualTo(3));
+				Assert.That(Driver.LastCommandParameters.Single(x => (string) x.Value == "2").SqlDbType, Is.EqualTo(SqlDbType.VarChar));
+				Assert.That(Driver.LastCommandParameters.Single(x => (string) x.Value == "2").Size, Is.EqualTo(3));
+				Assert.That(Driver.LastCommandParameters.Single(x => (string) x.Value == "3").SqlDbType, Is.EqualTo(SqlDbType.NVarChar));
+				Assert.That(Driver.LastCommandParameters.Single(x => (string) x.Value == "3").Size, Is.EqualTo(MsSql2000Dialect.MaxSizeForClob));
+				Assert.That(Driver.LastCommandParameters.Single(x => (string) x.Value == "4").SqlDbType, Is.EqualTo(SqlDbType.VarChar));
+				Assert.That(Driver.LastCommandParameters.Single(x => (string) x.Value == "4").Size, Is.EqualTo(MsSql2000Dialect.MaxSizeForAnsiClob));
 			}
 		}
 
@@ -139,27 +143,7 @@ public void MappedAsShouldUseExplicitSize()
 				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(SqlDbType.VarChar));
 			}
 		}
-
-		[Test]
-		public void LongStringCausesClobSizedParameter()
-		{
-			Driver.ClearCommands();
-
-			using (var session = OpenSession())
-			using (var transaction = session.BeginTransaction())
-			{
-				session.Query<Entity>().Where(x => x.Name == new string('x', MsSql2000Dialect.MaxSizeForLengthLimitedString + 1)).ToList();
-
-				Assert.That(Driver.LastCommandParameters.First().Size, Is.EqualTo(MsSql2000Dialect.MaxSizeForClob));
-				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(SqlDbType.NVarChar));
-
-				session.Query<Entity>().Where(x => x.AnsiName == new string('x', MsSql2000Dialect.MaxSizeForLengthLimitedAnsiString + 1)).ToList();
-
-				Assert.That(Driver.LastCommandParameters.First().Size, Is.EqualTo(MsSql2000Dialect.MaxSizeForAnsiClob));
-				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(SqlDbType.VarChar));
-			}
-		}
-
+		
 		[TestCase("Name", SqlDbType.NVarChar)]
 		[TestCase("AnsiName", SqlDbType.VarChar)]
 		public void HqlLikeShouldUseLargerSize(string property, SqlDbType expectedDbType)

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.GH1300">
-
-    <class name="Entity">
-        <id name="Id" generator="native" />
-        <property name="Name" length="3"/>
-        <property name="AnsiName" length="3" type="AnsiString"/>
-    </class>
-
+  <class name="Entity">
+    <id name="Id" generator="native" />
+    <property name="Name" length="3"/>
+    <property name="AnsiName" length="3" type="AnsiString"/>
+    <property name="FullText" length="5000"/>
+    <property name="AnsiFullText" length="10000" type="AnsiString"/>
+  </class>
 </hibernate-mapping>

src/NHibernate/Driver/SqlClientDriver.cs

@@ -304,19 +304,19 @@ public override bool SupportsMultipleQueries
 		/// <inheritdoc />
 		public override DateTime MinDate => new DateTime(1753, 1, 1);
 
-		public void AdjustParameterForValue(DbParameter parameter, SqlType sqlType, object value)
+		public virtual void AdjustParameterForValue(DbParameter parameter, SqlType sqlType, object value)
 		{
 			if (value is string stringVal)
 			{
 				switch (parameter.DbType)
 				{
 					case DbType.AnsiString:
 					case DbType.AnsiStringFixedLength:
-						parameter.Size = IsAnsiText(parameter, sqlType) || stringVal.Length > MsSql2000Dialect.MaxSizeForLengthLimitedAnsiString ? MsSql2000Dialect.MaxSizeForAnsiClob : Math.Max(stringVal.Length, sqlType.LengthDefined ? sqlType.Length : parameter.Size);
+						parameter.Size = IsAnsiText(parameter, sqlType) ? MsSql2000Dialect.MaxSizeForAnsiClob : Math.Max(stringVal.Length, sqlType.LengthDefined ? sqlType.Length : parameter.Size);
 						break;
 					case DbType.String:
 					case DbType.StringFixedLength:
-						parameter.Size = IsText(parameter, sqlType) || stringVal.Length > MsSql2000Dialect.MaxSizeForLengthLimitedString ? MsSql2000Dialect.MaxSizeForClob : Math.Max(stringVal.Length, sqlType.LengthDefined ? sqlType.Length : parameter.Size);
+						parameter.Size = IsText(parameter, sqlType) ? MsSql2000Dialect.MaxSizeForClob : Math.Max(stringVal.Length, sqlType.LengthDefined ? sqlType.Length : parameter.Size);
 						break;
 				}
 			}