Fix odbc tests

Author: maca88

src/NHibernate/Driver/OdbcDriver.cs

@@ -78,10 +78,18 @@ private void SetVariableLengthParameterSize(DbParameter dbParam, SqlType sqlType
 			{
 				switch (dbParam.DbType)
 				{
-					case DbType.AnsiString:
 					case DbType.AnsiStringFixedLength:
-					case DbType.String:
 					case DbType.StringFixedLength:
+						// For types that are using one character (CharType, AnsiCharType, TrueFalseType, YesNoType and EnumCharType),
+						// we have to specify the length otherwise sql function like charindex won't work as expected.
+						if (sqlType.Length == 1)
+						{
+							dbParam.Size = sqlType.Length;
+						}
+
+						break;
+					case DbType.AnsiString:
+					case DbType.String:
 						// NH-4083: do not limit to column length if above 2000. Setting size may trigger conversion from
 						// nvarchar to ntext when size is superior or equal to 2000, causing some queries to fail:
 						// https://stackoverflow.com/q/8569844/1178314

src/NHibernate/Driver/SqlClientDriver.cs

@@ -161,7 +161,9 @@ protected override void InitializeParameter(DbParameter dbParam, string name, Sq
 			{
 				case DbType.AnsiString:
 				case DbType.AnsiStringFixedLength:
-					dbParam.Size = IsAnsiText(dbParam, sqlType) ? MsSql2000Dialect.MaxSizeForAnsiClob : MsSql2000Dialect.MaxSizeForLengthLimitedAnsiString;
+					dbParam.Size = IsAnsiText(dbParam, sqlType)
+						? MsSql2000Dialect.MaxSizeForAnsiClob
+						: IsChar(dbParam, sqlType) ? sqlType.Length : MsSql2000Dialect.MaxSizeForLengthLimitedAnsiString;
 					break;
 				case DbType.Binary:
 					dbParam.Size = IsBlob(dbParam, sqlType) ? MsSql2000Dialect.MaxSizeForBlob : MsSql2000Dialect.MaxSizeForLengthLimitedBinary;
@@ -174,7 +176,9 @@ protected override void InitializeParameter(DbParameter dbParam, string name, Sq
 					break;
 				case DbType.String:
 				case DbType.StringFixedLength:
-					dbParam.Size = IsText(dbParam, sqlType) ? MsSql2000Dialect.MaxSizeForClob : MsSql2000Dialect.MaxSizeForLengthLimitedString;
+					dbParam.Size = IsText(dbParam, sqlType)
+						? MsSql2000Dialect.MaxSizeForClob
+						: IsChar(dbParam, sqlType) ? sqlType.Length : MsSql2000Dialect.MaxSizeForLengthLimitedString;
 					break;
 				case DbType.DateTime2:
 					dbParam.Size = MsSql2000Dialect.MaxDateTime2;
@@ -283,6 +287,17 @@ protected static bool IsBlob(DbParameter dbParam, SqlType sqlType)
 			return (sqlType is BinaryBlobSqlType) || ((DbType.Binary == dbParam.DbType) && sqlType.LengthDefined && (sqlType.Length > MsSql2000Dialect.MaxSizeForLengthLimitedBinary));
 		}
 
+		/// <summary>
+		/// Interprets if a parameter is a character (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 character, otherwise False</returns>
+		protected static bool IsChar(DbParameter dbParam, SqlType sqlType)
+		{
+			return (DbType.StringFixedLength == dbParam.DbType || DbType.StringFixedLength == dbParam.DbType) && 
+			       sqlType.LengthDefined && sqlType.Length == 1;
+		}
 		public override IResultSetsCommand GetResultSetsCommand(ISessionImplementor session)
 		{
 			return new BasicResultSetsCommand(session);

src/NHibernate/Driver/SqlServerCeDriver.cs

@@ -76,6 +76,13 @@ protected override void InitializeParameter(DbParameter dbParam, string name, Sq
 		{
 			base.InitializeParameter(dbParam, name, AdjustSqlType(sqlType));
 
+			// For types that are using one character (CharType, AnsiCharType, TrueFalseType, YesNoType and EnumCharType),
+			// we have to specify the length otherwise sql function like charindex won't work as expected.
+			if (sqlType.LengthDefined && sqlType.Length == 1)
+			{
+				dbParam.Size = sqlType.Length;
+			}
+
 			AdjustDbParamTypeForLargeObjects(dbParam, sqlType);
 		}
 

src/NHibernate/Type/AbstractCharType.cs

@@ -48,9 +48,6 @@ public override System.Type ReturnedClass
 		public override void Set(DbCommand cmd, object value, int index, ISessionImplementor session)
 		{
 			cmd.Parameters[index].Value = Convert.ToChar(value);
-			// Some databases (e.g. Sql Server) require the length for char, otherwise functions like IndexOf('a')
-			// won't work as expected.
-			cmd.Parameters[index].Size = SqlType.Length;
 		}
 
 		public override string ObjectToSQLString(object value, Dialect.Dialect dialect)