Merge pull request #435 from nrubino/master

Add SybaseASE driver for ado.net 4/4.5 connector, NH-3991
Fix Trim for Sybase ASE

Author: fredericDelaporte

src/NHibernate/Dialect/Function/AnsiTrimEmulationFunction.cs

@@ -5,7 +5,6 @@
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
-using NHibernate.Util;
 using System.Text.RegularExpressions;
 
 namespace NHibernate.Dialect.Function
@@ -41,6 +40,40 @@ public class AnsiTrimEmulationFunction : ISQLFunction, IFunctionGrammar
 			new SQLFunctionTemplate(NHibernateUtil.String,
 			                        "replace( replace( ltrim( rtrim( replace( replace( ?1, ' ', '${space}$' ), ?2, ' ' ) ) ), ' ', ?2 ), '${space}$', ' ' )");
 
+		private readonly ISQLFunction _leadingTrim = LeadingTrim;
+		private readonly ISQLFunction _trailingTrim = TrailingTrim;
+		private readonly ISQLFunction _bothTrim = BothTrim;
+
+		/// <summary>
+		/// Default constructor. The target database has to support the <c>replace</c> function.
+		/// </summary>
+		public AnsiTrimEmulationFunction()
+		{
+		}
+
+		/// <summary>
+		/// Constructor for supplying the name of the replace function to use.
+		/// </summary>
+		/// <param name="replaceFunction">The replace function.</param>
+		public AnsiTrimEmulationFunction(string replaceFunction)
+		{
+			_leadingTrim =
+				new SQLFunctionTemplate(
+					NHibernateUtil.String,
+					$"{replaceFunction}( {replaceFunction}( ltrim( {replaceFunction}( {replaceFunction}( ?1, ' ', " +
+					"'${space}$' ), ?2, ' ' ) ), ' ', ?2 ), '${space}$', ' ' )");
+			_trailingTrim =
+				new SQLFunctionTemplate(
+					NHibernateUtil.String,
+					$"{replaceFunction}( {replaceFunction}( rtrim( {replaceFunction}( {replaceFunction}( ?1, ' ', " +
+					"'${space}$' ), ?2, ' ' ) ), ' ', ?2 ), '${space}$', ' ' )");
+			_bothTrim =
+				new SQLFunctionTemplate(
+					NHibernateUtil.String,
+					$"{replaceFunction}( {replaceFunction}( ltrim( rtrim( {replaceFunction}( {replaceFunction}( ?1, ' ', " +
+					"'${space}$' ), ?2, ' ' ) ) ), ' ', ?2 ), '${space}$', ' ' )");
+		}
+
 		#region ISQLFunction Members
 
 		public IType ReturnType(IType columnType, IMapping mapping)
@@ -174,18 +207,18 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 
 				return TrailingSpaceTrim.Render(argsToUse, factory);
 			}
-			
+
 			if (leading && trailing)
 			{
-				return BothTrim.Render(argsToUse, factory);
+				return _bothTrim.Render(argsToUse, factory);
 			}
-			
+
 			if (leading)
 			{
-				return LeadingTrim.Render(argsToUse, factory);
+				return _leadingTrim.Render(argsToUse, factory);
 			}
-			
-			return TrailingTrim.Render(argsToUse, factory);
+
+			return _trailingTrim.Render(argsToUse, factory);
 		}
 
 		#endregion

src/NHibernate/Dialect/SybaseASE15Dialect.cs

@@ -105,7 +105,7 @@ public SybaseASE15Dialect()
 			RegisterFunction("square", new StandardSQLFunction("square"));
 			RegisterFunction("str", new StandardSQLFunction("str", NHibernateUtil.String));
 			RegisterFunction("tan", new StandardSQLFunction("tan", NHibernateUtil.Double));
-			// TODO RegisterFunction("trim", new SQLFunctionTemplate(NHibernateUtil.String, "ltrim(rtrim(?1))"));
+			RegisterFunction("trim", new AnsiTrimEmulationFunction("str_replace"));
 			RegisterFunction("upper", new StandardSQLFunction("upper"));
 			RegisterFunction("user", new NoArgSQLFunction("user", NHibernateUtil.String));
 			RegisterFunction("year", new StandardSQLFunction("year", NHibernateUtil.Int32));

src/NHibernate/Driver/SybaseAseClientDriver.cs

@@ -1,9 +1,7 @@
-using System;
-
-namespace NHibernate.Driver
+namespace NHibernate.Driver
 {
 	/// <summary>
-	/// This provides a driver for Sybase ASE 15 using the ADO.NET driver.
+	/// This provides a driver for Sybase ASE 15 using the ADO.NET 2 driver.
 	/// </summary>
 	/// <remarks>
 	/// You will need the following libraries available to your application:
@@ -12,25 +10,13 @@ namespace NHibernate.Driver
 	/// <li>sybdrvado20.dll</li>
 	/// </ul>
 	/// </remarks>
-	public class SybaseAseClientDriver : ReflectionBasedDriver
+	public class SybaseAseClientDriver : SybaseAseClientDriverBase
 	{
-		public SybaseAseClientDriver() : base("Sybase.AdoNet2.AseClient", "Sybase.Data.AseClient.AseConnection", "Sybase.Data.AseClient.AseCommand")
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public SybaseAseClientDriver() : base("Sybase.AdoNet2.AseClient")
 		{
 		}
-		
-		public override string NamedPrefix
-		{
-			get { return "@"; }
-		}
-		
-		public override bool UseNamedPrefixInParameter
-		{
-			get { return true; }
-		}
-		
-		public override bool UseNamedPrefixInSql
-		{
-			get { return true; }
-		}
 	}
 }

src/NHibernate/Driver/SybaseAseClientDriverAdoNet4.cs

@@ -0,0 +1,15 @@
+namespace NHibernate.Driver
+{
+	/// <summary>
+	/// This provides a driver for Sybase ASE 15 using the ADO.NET 4 driver.
+	/// </summary>
+	public class SybaseAdoNet4Driver : SybaseAseClientDriverBase
+	{
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public SybaseAdoNet4Driver() : base("Sybase.AdoNet4.AseClient")
+		{
+		}
+	}
+}

src/NHibernate/Driver/SybaseAseClientDriverAdoNet45.cs

@@ -0,0 +1,15 @@
+namespace NHibernate.Driver
+{
+	/// <summary>
+	/// This provides a driver for Sybase ASE 16 using the ADO.NET 4.5 driver.
+	/// </summary>
+	public class SybaseAdoNet45Driver : SybaseAseClientDriverBase
+	{
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public SybaseAdoNet45Driver() : base("Sybase.AdoNet45.AseClient")
+		{
+		}
+	}
+}

src/NHibernate/Driver/SybaseAseClientDriverBase.cs

@@ -0,0 +1,54 @@
+namespace NHibernate.Driver
+{
+	/// <summary>
+	/// This provides a driver base for Sybase ASE 15 using the ADO.NET driver. (Also known as SAP
+	/// Adaptive Server Enterprise.)
+	/// </summary>
+	/// <remarks>
+	/// ASE was formerly Sybase SQL Server, not to be confused with SQL Anywhere / ASA.
+	/// </remarks>
+	public abstract class SybaseAseClientDriverBase : ReflectionBasedDriver
+	{
+		/// <summary>
+		/// Initializes a new instance of <see cref="SybaseAseClientDriverBase" /> with
+		/// type names that are loaded from the specified assembly.
+		/// </summary>
+		/// <param name="assemblyName">Assembly to load the types from.</param>
+		protected SybaseAseClientDriverBase(string assemblyName) : base(
+			"Sybase.Data.AseClient",
+			assemblyName,
+			"Sybase.Data.AseClient.AseConnection",
+			"Sybase.Data.AseClient.AseCommand")
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance of <see cref="SybaseAseClientDriverBase" /> with
+		/// type names that are loaded from the specified assembly.
+		/// </summary>
+		/// <param name="providerInvariantName">The Invariant name of a provider.</param>
+		/// <param name="assemblyName">Assembly to load the types from.</param>
+		/// <param name="connectionTypeName">Connection type name.</param>
+		/// <param name="commandTypeName">Command type name.</param>
+		protected SybaseAseClientDriverBase(
+			string providerInvariantName,
+			string assemblyName,
+			string connectionTypeName,
+			string commandTypeName) : base(
+			providerInvariantName,
+			assemblyName,
+			connectionTypeName,
+			commandTypeName)
+		{
+		}
+
+		/// <inheritdoc />
+		public override string NamedPrefix => "@";
+
+		/// <inheritdoc />
+		public override bool UseNamedPrefixInParameter => true;
+
+		/// <inheritdoc />
+		public override bool UseNamedPrefixInSql => true;
+	}
+}