NH-2943: Add support for OracleDbType.XmlType

Author: hazzik

src/NHibernate/AdoNet/OracleDataClientBatchingBatcher.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Reflection;
 using System.Text;
 using NHibernate.AdoNet.Util;
 using NHibernate.Exceptions;
@@ -16,7 +15,7 @@ namespace NHibernate.AdoNet
 	public class OracleDataClientBatchingBatcher : AbstractBatcher
 	{
 		private int _batchSize;
-		private int _countOfCommands = 0;
+		private int _countOfCommands;
 		private int _totalExpectedRowsAffected;
 		private IDbCommand _currentBatch;
 		private IDictionary<string, List<object>> _parameterValueListHashTable;
@@ -69,9 +68,9 @@ public override void AddToBatch(IExpectation expectation)
 				firstOnBatch = false;
 			}
 
-			List<object> parameterValueList;
 			foreach (IDataParameter currentParameter in CurrentCommand.Parameters)
 			{
+				List<object> parameterValueList;
 				if (firstOnBatch)
 				{
 					parameterValueList = new List<object>();
@@ -125,7 +124,7 @@ protected override void DoExecuteBatch(IDbCommand ps)
 				// setting the ArrayBindCount on the OracleCommand
 				// this value is not a part of the ADO.NET API.
 				// It's and ODP implementation, so it is being set by reflection
-				SetObjectParam(_currentBatch, "ArrayBindCount", arraySize);
+				SetArrayBindCount(arraySize);
 				int rowsAffected;
 				try
 				{
@@ -149,11 +148,12 @@ protected override int CountOfStatementsInCurrentBatch
 			get { return _countOfCommands; }
 		}
 
-		private void SetObjectParam(Object obj, string paramName, object paramValue)
+		private void SetArrayBindCount(int arraySize)
 		{
-			System.Type objType = obj.GetType();
-			PropertyInfo propInfo = objType.GetProperty(paramName);
-			propInfo.SetValue(obj, paramValue, null);
+			//TODO: cache the property info.
+			var objType = _currentBatch.GetType();
+			var propInfo = objType.GetProperty("ArrayBindCount");
+			propInfo.SetValue(_currentBatch, arraySize, null);
 		}
 
 		public override int BatchSize

src/NHibernate/Driver/OracleDataClientDriver.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using System.Reflection;
 using NHibernate.AdoNet;
@@ -23,8 +24,9 @@ public class OracleDataClientDriver : ReflectionBasedDriver, IEmbeddedBatcherFac
 		private static readonly SqlType GuidSqlType = new SqlType(DbType.Binary, 16);
 		private readonly PropertyInfo oracleCommandBindByName;
 		private readonly PropertyInfo oracleDbType;
-		private readonly object oracleDbTypeRefCursor;
-
+		private readonly object oracleDbTypeRefCursor;
+		private readonly object oracleDbTypeXmlType;
+
 		/// <summary>
 		/// Initializes a new instance of <see cref="OracleDataClientDriver"/>.
 		/// </summary>
@@ -45,7 +47,8 @@ public OracleDataClientDriver()
 			oracleDbType = parameterType.GetProperty("OracleDbType");
 
 			System.Type oracleDbTypeEnum = ReflectHelper.TypeFromAssembly("Oracle.DataAccess.Client.OracleDbType", driverAssemblyName, false);
-			oracleDbTypeRefCursor = System.Enum.Parse(oracleDbTypeEnum, "RefCursor");
+			oracleDbTypeRefCursor = Enum.Parse(oracleDbTypeEnum, "RefCursor");
+			oracleDbTypeXmlType = Enum.Parse(oracleDbTypeEnum, "XmlType");
 		}
 
 		/// <summary></summary>
@@ -81,13 +84,22 @@ protected override void InitializeParameter(IDbDataParameter dbParam, string nam
 					break;
 				case DbType.Guid:
 					base.InitializeParameter(dbParam, name, GuidSqlType);
+					break;
+				case DbType.Xml:
+					this.InitializeParameter(dbParam, name, oracleDbTypeXmlType);
 					break;
 				default:
 					base.InitializeParameter(dbParam, name, sqlType);
 					break;
 			}
-		}
-
+		}
+
+		private void InitializeParameter(IDbDataParameter dbParam, string name, object sqlType)
+		{
+			dbParam.ParameterName = FormatNameForParameter(name);
+			oracleDbType.SetValue(dbParam, sqlType, null);
+		}
+
 		protected override void OnBeforePrepare(IDbCommand command)
 		{
 			base.OnBeforePrepare(command);
@@ -111,15 +123,11 @@ protected override void OnBeforePrepare(IDbCommand command)
 			outCursor.Direction = detail.HasReturn ? ParameterDirection.ReturnValue : ParameterDirection.Output;
 
 			command.Parameters.Insert(0, outCursor);
-		}
-
-		#region IEmbeddedBatcherFactoryProvider Members
-
+		}
+
 		System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass
 		{
 			get { return typeof (OracleDataClientBatchingBatcherFactory); }
-		}
-
-		#endregion
+		}
 	}
 }