Added Firebird Bitwise operations

Author: amroel

src/NHibernate/Dialect/BitwiseFunctionOperation.cs

@@ -0,0 +1,96 @@
+using System.Collections;
+using NHibernate.Dialect.Function;
+using NHibernate.Engine;
+using NHibernate.SqlCommand;
+using NHibernate.Type;
+
+namespace NHibernate.Dialect
+{
+	public class BitwiseFunctionOperation : ISQLFunction
+	{
+		private readonly string _functionName;
+		private SqlStringBuilder _sqlBuffer;
+		private Queue _args;
+
+		public BitwiseFunctionOperation(string functionName)
+		{
+			_functionName = functionName;			
+		}
+
+		#region ISQLFunction Members
+
+		public IType ReturnType(IType columnType, IMapping mapping)
+		{
+			return NHibernateUtil.Int64;
+		}
+
+		public bool HasArguments
+		{
+			get { return true; }
+		}
+
+		public bool HasParenthesesIfNoArguments
+		{
+			get { return true; }
+		}
+
+		public SqlString Render(IList args, ISessionFactoryImplementor factory)
+		{
+			Prepare(args);
+
+			Function(); 
+			OpenParens(); 
+			Arguments(); 
+			CloseParens();
+
+			return _sqlBuffer.ToSqlString();
+		}
+
+		#endregion
+
+		private void Prepare(IList args)
+		{
+			_sqlBuffer = new SqlStringBuilder();
+			_args = new Queue();
+			foreach (var arg in args)
+			{
+				if (!IsParens(arg.ToString()))
+					_args.Enqueue(arg);
+			}
+		}
+
+		private static bool IsParens(string candidate)
+		{
+			return candidate == "(" || candidate == ")";
+		}
+
+		private void Function()
+		{
+			_sqlBuffer.Add(_functionName);
+		}
+
+		private void OpenParens()
+		{
+			_sqlBuffer.Add("(");
+		}
+
+		private void Arguments()
+		{
+			while (_args.Count > 0)
+			{
+				var arg = _args.Dequeue();
+				if (arg is Parameter || arg is SqlString)
+					_sqlBuffer.AddObject(arg);
+				else
+					_sqlBuffer.Add(arg.ToString());
+				if (_args.Count > 0)
+					_sqlBuffer.Add(", ");
+			}
+		}
+
+		private void CloseParens()
+		{
+			_sqlBuffer.Add(")");
+		}
+	}
+}

src/NHibernate/Dialect/NativeBitwiseOperation.cs renamed to src/NHibernate/Dialect/BitwiseNativeOperation.cs

@@ -8,13 +8,13 @@
 namespace NHibernate.Dialect
 {
 	[Serializable]
-	public class NativeBitwiseOperation : ISQLFunction
+	public class BitwiseNativeOperation : ISQLFunction
 	{
 		private readonly string _sqlToken;
         private Queue _args;
 		private SqlStringBuilder _sqlBuffer;
 
-		public NativeBitwiseOperation(string sqlToken)
+		public BitwiseNativeOperation(string sqlToken)
 		{
 			_sqlToken = sqlToken;
 		}

src/NHibernate/Dialect/Dialect.cs

@@ -113,11 +113,11 @@ protected Dialect()
 			RegisterFunction("month", new SQLFunctionTemplate(NHibernateUtil.Int32, "extract(month from ?1)"));
 			RegisterFunction("year", new SQLFunctionTemplate(NHibernateUtil.Int32, "extract(year from ?1)"));
 
-			//RegisterFunction("band", new SQLFunctionTemplate(NHibernateUtil.Int64, "?1 & ?2"));
-			RegisterFunction("band", new NativeBitwiseOpetration("&"));
-			RegisterFunction("bor", new NativeBitwiseOpetration("|"));
-			RegisterFunction("bxor", new NativeBitwiseOpetration("^"));
-			RegisterFunction("bnot", new NativeBitwiseOpetration("~"));
+			// Bitwise operations
+			RegisterFunction("band", new BitwiseNativeOperation("&"));
+			RegisterFunction("bor", new BitwiseNativeOperation("|"));
+			RegisterFunction("bxor", new BitwiseNativeOperation("^"));
+			RegisterFunction("bnot", new BitwiseNativeOperation("~"));
 
 			RegisterFunction("str", new SQLFunctionTemplate(NHibernateUtil.String, "cast(?1 as char)"));
 

src/NHibernate/Dialect/FirebirdDialect.cs

@@ -322,6 +322,11 @@ private void OverrideStandardHQLFunctions()
 			RegisterFunction("str", new SQLFunctionTemplate(NHibernateUtil.String, "cast(?1 as VARCHAR(255))"));
 			RegisterFunction("sysdate", new CastedFunction("today", NHibernateUtil.Date));
 			RegisterFunction("date", new SQLFunctionTemplate(NHibernateUtil.Date, "cast(?1 as date)"));
+			// Bitwise operations
+			RegisterFunction("band", new BitwiseFunctionOperation("bin_and"));
+			RegisterFunction("bor", new BitwiseFunctionOperation("bin_or"));
+			RegisterFunction("bxor", new BitwiseFunctionOperation("bin_xor"));
+			RegisterFunction("bnot", new BitwiseFunctionOperation("bin_not"));
 		}
 
 		private void RegisterFirebirdServerEmbeddedFunctions()
@@ -349,9 +354,6 @@ private void RegisterExternalFbAndIbStandardUDFs()
 		private void RegisterMathematicalFunctions()
 		{
 			RegisterFunction("abs", new StandardSQLFunction("abs", NHibernateUtil.Double));
-			RegisterFunction("bin_and", new StandardSQLFunction("bin_and", NHibernateUtil.Int32));
-			RegisterFunction("bin_or", new StandardSQLFunction("bin_or", NHibernateUtil.Int32));
-			RegisterFunction("bin_xor", new StandardSQLFunction("bin_xor", NHibernateUtil.Int32));
 			RegisterFunction("ceiling", new StandardSQLFunction("ceiling", NHibernateUtil.Double));
 			RegisterFunction("div", new StandardSQLFunction("div", NHibernateUtil.Double));
 			RegisterFunction("dpower", new StandardSQLFunction("dpower", NHibernateUtil.Double));

src/NHibernate/NHibernate.csproj

@@ -137,6 +137,7 @@
     <Compile Include="Connection\DriverConnectionProvider.cs" />
     <Compile Include="Connection\IConnectionProvider.cs" />
     <Compile Include="Connection\UserSuppliedConnectionProvider.cs" />
+    <Compile Include="Dialect\BitwiseFunctionOperation.cs" />
     <Compile Include="Dialect\DB2Dialect.cs" />
     <Compile Include="Dialect\Dialect.cs" />
     <Compile Include="Dialect\FirebirdDialect.cs" />
@@ -156,7 +157,7 @@
     <Compile Include="Dialect\MySQL55InnoDBDialect.cs" />
     <Compile Include="Dialect\MySQL5InnoDBDialect.cs" />
     <Compile Include="Dialect\MySQLDialect.cs" />
-    <Compile Include="Dialect\NativeBitwiseOperation.cs" />
+    <Compile Include="Dialect\BitwiseNativeOperation.cs" />
     <Compile Include="Dialect\PostgreSQLDialect.cs" />
     <Compile Include="Dialect\Schema\PostgreSQLMetadata.cs" />
     <Compile Include="Dialect\Schema\SchemaHelper.cs" />