Merge pull request #490 from oskarb/fix-odbc-test-failures

Fix many odbc test failures

Author: oskarb

build-common/common-project.xml

@@ -164,6 +164,16 @@
 				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
 			</namespaces>
 		</xmlpoke>
+		
+		<!-- Make sure the property exists - it's only set for some scenarios. -->
+		<property name="nhibernate.odbc.explicit_datetime_scale" value="" unless="${property::exists('nhibernate.odbc.explicit_datetime_scale')}"/>
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='odbc.explicit_datetime_scale']"
+			value="${nhibernate.odbc.explicit_datetime_scale}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
 	</target>
 
 	<target name="common.remove-connection-settings-from-app-config">

build-common/teamcity-hibernate.cfg.xml

@@ -22,5 +22,7 @@
 			<property name="command_timeout">444</property>
 			<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
 			<property name="adonet.wrap_result_sets">false</property>
+
+			<property name="odbc.explicit_datetime_scale"></property>
 		</session-factory>
 	</hibernate-configuration>

src/NHibernate/Cfg/Environment.cs

@@ -181,6 +181,11 @@ public static string Version
 		public const string OrderUpdates = "order_updates";
 
 		public const string QueryModelRewriterFactory = "query.query_model_rewriter_factory";
+
+		/// <summary>
+		/// This may need to be set to 3 if you are using the OdbcDriver with MS SQL Server 2008+.
+		/// </summary>
+		public const string OdbcDateTimeScale = "odbc.explicit_datetime_scale";
 
 		/// <summary>
 		/// If this setting is set to false, exceptions in IInterceptor.BeforeTransactionCompletion bubble to the caller of ITransaction.Commit and abort the commit.
@@ -378,4 +383,4 @@ private static IBytecodeProvider CreateCustomBytecodeProvider(string assemblyQua
 			}
 		}
 	}
-}
+}

src/NHibernate/Driver/OdbcDriver.cs

@@ -1,7 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.Odbc;
 using NHibernate.SqlTypes;
+using NHibernate.Util;
+using Environment = NHibernate.Cfg.Environment;
 
 namespace NHibernate.Driver
 {
@@ -13,6 +16,23 @@ namespace NHibernate.Driver
 	/// </remarks>
 	public class OdbcDriver : DriverBase
 	{
+		private static readonly IInternalLogger Log = LoggerProvider.LoggerFor(typeof(OdbcDriver));
+
+		private byte? _dbDateTimeScale;
+
+
+		public override void Configure(IDictionary<string, string> settings)
+		{
+			base.Configure(settings);
+
+			// Explicit scale for DbType.DateTime. Seems required for at least MS SQL Server 2008+.
+			_dbDateTimeScale = PropertiesHelper.GetByte(Environment.OdbcDateTimeScale, settings, null);
+			if (_dbDateTimeScale != null && Log.IsInfoEnabled)
+			{
+				Log.Info(string.Format("Will use scale {0} for DbType.DateTime parameters.", _dbDateTimeScale));
+			}
+		}
+
 		public override IDbConnection CreateConnection()
 		{
 			return new OdbcConnection();
@@ -38,8 +58,11 @@ public override string NamedPrefix
 			get { return String.Empty; }
 		}
 
-		private static void SetVariableLengthParameterSize(IDbDataParameter dbParam, SqlType sqlType)
+		private void SetVariableLengthParameterSize(IDbDataParameter dbParam, SqlType sqlType)
 		{
+			if (Equals(sqlType, SqlTypeFactory.DateTime) && _dbDateTimeScale != null)
+				dbParam.Scale = _dbDateTimeScale.Value;
+
 			// Override the defaults using data from SqlType.
 			if (sqlType.LengthDefined)
 			{
@@ -59,4 +82,4 @@ protected override void InitializeParameter(IDbDataParameter dbParam, string nam
 			SetVariableLengthParameterSize(dbParam, sqlType);
 		}
 	}
-}
+}

src/NHibernate/Util/PropertiesHelper.cs

@@ -20,6 +20,14 @@ public static bool GetBoolean(string property, IDictionary<string, string> prope
 			return GetBoolean(property, properties, false);
 		}
 
+		public static byte? GetByte(string property, IDictionary<string, string> properties, byte? defaultValue)
+		{
+			string toParse;
+			properties.TryGetValue(property, out toParse);
+			byte result;
+			return byte.TryParse(toParse, out result) ? result : defaultValue;
+		}
+
 		public static int GetInt32(string property, IDictionary<string, string> properties, int defaultValue)
 		{
 			string toParse;
@@ -67,4 +75,4 @@ public static IDictionary<string, string> ToDictionary(string property, string d
 			return map;
 		}
 	}
-}
+}

src/NHibernate/nhibernate-configuration.xsd

@@ -120,6 +120,7 @@
 								<xs:enumeration value="order_updates" />
 								<xs:enumeration value="query.query_model_rewriter_factory" />
 								<xs:enumeration value="linqtohql.generatorsregistry" />
+								<xs:enumeration value="odbc.explicit_datetime_scale" />
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:attribute>
@@ -229,4 +230,4 @@
 			<xs:attribute name="use" type="xs:boolean" />
 		</xs:complexType>
 	</xs:element>
-</xs:schema>
+</xs:schema>

teamcity.build

@@ -46,8 +46,18 @@
 	</target>
 
 	<target name="setup-teamcity-sqlServerOdbc">
-		<property name="nhibernate.connection.driver_class"				value="NHibernate.Driver.OdbcDriver" />
-		<property name="nhibernate.connection.connection_string"	value="Driver={SQL Server Native Client 11.0};Server=.\SQLExpress;Database=nhibernateOdbc;Trusted_Connection=yes" />
+		<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OdbcDriver" />
+		<property name="nhibernate.odbc.explicit_datetime_scale" value="3" />
+	<!-- We need to use a dialect that avoids mapping DbType.Time to TIME on MSSQL. On modern SQL Server
+		this becomes TIME(7). Later, such values cannot be read back over ODBC. The
+		error we get is "System.ArgumentException : Unknown SQL type - SS_TIME_EX.". I don't know for certain
+		why this occurs, but MS docs do say that for a client "compiled using a version of SQL Server Native
+		Client prior to SQL Server 2008", TIME(7) cannot be converted back to the client. Assuming that .Net's
+		OdbcDriver would be considered a "client compiled with a previous version", it would make sense. Anyway,
+		using the MsSql2005Dialect avoids these test failures. -->
+		<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2005Dialect" />
+	<!-- The OdbcDriver inherits SupportsMultipleOpenReaders=true from DriverBase, which requires Mars_Connection=yes for SQL Server. -->
+		<property name="nhibernate.connection.connection_string" value="Driver={SQL Server Native Client 11.0};Server=.\SQLExpress;Database=nhibernateOdbc;Trusted_Connection=yes;Mars_Connection=yes;" />
 		<property name="NHibernate.Test.IgnoreFail" value="true" />
 		<property name="teamcity.last.result" value="${root.dir}/lib/teamcity/sqlServerOdbc/NHibernate.Test.last-results.xml" />
 	</target>