NH-3973 - Remove enabledFilter parameter from IProjection.ToSqlString and ICriterion.ToSqlString methods

src/NHibernate.Test/Criteria/AddNumberProjection.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NHibernate.Engine;
 using NHibernate.Criterion;
@@ -26,7 +25,7 @@ public override bool IsAggregate
 			get { return false; }
 		}
 
-		public override SqlString ToSqlString(ICriteria criteria, int position, ICriteriaQuery criteriaQuery, IDictionary<string, IFilter> enabledFilters)
+		public override SqlString ToSqlString(ICriteria criteria, int position, ICriteriaQuery criteriaQuery)
 		{
 			string[] projection = criteriaQuery.GetColumnsUsingProjection(criteria, propertyName);
 
@@ -56,7 +55,7 @@ public override bool IsGrouped
 			get { return false; }
 		}
 
-		public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery, IDictionary<string, IFilter> enabledFilters)
+		public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
 			throw new InvalidOperationException("not a grouping projection");
 		}

src/NHibernate.Test/ExpressionTest/BetweenExpressionFixture.cs

@@ -1,7 +1,6 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -16,7 +15,7 @@ public void BetweenSqlStringTest()
 
 			CreateObjects(typeof(Simple), session);
 			ICriterion betweenExpression = Expression.Between("Count", 5, 10);
-			SqlString sqlString = betweenExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = betweenExpression.ToSqlString(criteria, criteriaQuery);
 
 			string expectedSql = "sql_alias.count_ between ? and ?";
 			CompareSqlStrings(sqlString, expectedSql, 2);

src/NHibernate.Test/ExpressionTest/InExpressionFixture.cs

@@ -2,7 +2,6 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 using System.Linq;
 
@@ -22,7 +21,7 @@ public void InSqlStringTest()
 			ICriterion inExpression = Expression.In("Count", new int[] { 3, 4, 5 });
 
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = inExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = inExpression.ToSqlString(criteria, criteriaQuery);
 
 			string expectedSql = "sql_alias.count_ in (?, ?, ?)";
 
@@ -37,7 +36,7 @@ public void InEmptyList()
 			ISession session = factory.OpenSession();
 			InExpression expression = new InExpression("Count", new object[0]);
 			CreateObjects(typeof(Simple), session);
-			SqlString sql = expression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sql = expression.ToSqlString(criteria, criteriaQuery);
 			Assert.AreEqual("1=0", sql.ToString());
 			session.Close();
 		}
@@ -56,7 +55,7 @@ public void InSqlFunctionTest()
 						Projections.Constant(1),
 						Projections.Constant(1)),
 					new object[] { "A", "B" });
-				var sql = inExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+				var sql = inExpression.ToSqlString(criteria, criteriaQuery);
 
 				// Allow some dialectal differences in function name and parameter style.
 				Assert.That(sql.ToString(),

src/NHibernate.Test/ExpressionTest/InsensitiveLikeExpressionFixture.cs

@@ -4,7 +4,6 @@
 using NHibernate.Engine;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -23,7 +22,7 @@ public void InsentitiveLikeSqlStringTest()
 			ICriterion expression = Expression.InsensitiveLike("Address", "12 Adress");
 
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, criteriaQuery);
 
 			string expectedSql = "lower(sql_alias.address) like ?";
 			if ((factory as ISessionFactoryImplementor).Dialect is PostgreSQLDialect)

src/NHibernate.Test/ExpressionTest/JunctionFixture.cs

@@ -2,7 +2,6 @@
 using NHibernate.Engine;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -35,7 +34,7 @@ public void SqlString()
 			using (ISession session = factory.OpenSession())
 			{
 				CreateObjects(typeof(Simple), session);
-				sqlString = _conjunction.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+				sqlString = _conjunction.ToSqlString(criteria, criteriaQuery);
 			}
 
 			string expectedSql = "(sql_alias.address is null and sql_alias.count_ between ? and ?)";

src/NHibernate.Test/ExpressionTest/LogicalExpressionFixture.cs

@@ -2,7 +2,6 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -26,7 +25,7 @@ public void LogicalSqlStringTest()
 				Expression.Or(Expression.IsNull("Address"), Expression.Between("Count", 5, 10));
 
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = orExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = orExpression.ToSqlString(criteria, criteriaQuery);
 
 			string expectedSql = "(sql_alias.address is null or sql_alias.count_ between ? and ?)";
 

src/NHibernate.Test/ExpressionTest/NotExpressionFixture.cs

@@ -2,7 +2,6 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -21,7 +20,7 @@ public void NotSqlStringTest()
 			ICriterion notExpression = Expression.Not(Expression.Eq("Address", "12 Adress"));
 
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = notExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = notExpression.ToSqlString(criteria, criteriaQuery);
 
 			string expectedSql = "not (sql_alias.address = ?)";
 			CompareSqlStrings(sqlString, expectedSql, 1);

src/NHibernate.Test/ExpressionTest/NotNullExpressionFixture.cs

@@ -1,7 +1,6 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -20,7 +19,7 @@ public void NotNullSqlStringTest()
 			ICriterion notNullExpression = Expression.IsNotNull("Address");
 
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = notNullExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = notNullExpression.ToSqlString(criteria, criteriaQuery);
 
 			string expectedSql = "sql_alias.address is not null";
 			CompareSqlStrings(sqlString, expectedSql, 0);

src/NHibernate.Test/ExpressionTest/NullExpressionFixture.cs

@@ -2,7 +2,6 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -21,7 +20,7 @@ public void NullSqlStringTest()
 			ICriterion expression = Expression.IsNull("Address");
 
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, criteriaQuery);
 
 			string expectedSql = "sql_alias.address is null";
 			CompareSqlStrings(sqlString, expectedSql, 0);

src/NHibernate.Test/ExpressionTest/Projection/ProjectionFixture.cs

@@ -7,8 +7,7 @@
 
 namespace NHibernate.Test.ExpressionTest.Projection
 {
-	using Util;
-    using NHibernate.Dialect.Function;
+	using NHibernate.Dialect.Function;
 
 	[TestFixture]
 	public class ProjectionFixture : BaseExpressionFixture
@@ -19,7 +18,7 @@ public void RowCountTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.RowCount();
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string,IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "count(*) as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -34,7 +33,7 @@ public void AvgTest()
 			IType nhType = NHibernateUtil.GuessType(typeof (double));
 			SqlType[] sqlTypes = nhType.SqlTypes(this.factoryImpl);
 			string sqlTypeString = factoryImpl.Dialect.GetCastTypeName(sqlTypes[0]);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = string.Format("avg(cast(sql_alias.Pay as {0})) as y0_",sqlTypeString);
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -46,7 +45,7 @@ public void MaxTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.Max("Pay");
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "max(sql_alias.Pay) as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -58,7 +57,7 @@ public void MinTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.Min("Pay");
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "min(sql_alias.Pay) as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -70,7 +69,7 @@ public void CountTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.Count("Pay");
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "count(sql_alias.Pay) as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -82,7 +81,7 @@ public void CountDistinctTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.CountDistinct("Pay");
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "count(distinct sql_alias.Pay) as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -95,7 +94,7 @@ public void NvlTest()
 			IProjection expression = Projections.SqlFunction(new NvlFunction(),
 			                                                 NHibernateUtil.String, Projections.Property("Name"), Projections.Property("Address"));
 			CreateObjects(typeof (Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "nvl(sql_alias.Name, sql_alias.address) as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -107,7 +106,7 @@ public void DistinctTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.Distinct(Projections.Property("Pay"));
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "distinct sql_alias.Pay as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -119,10 +118,10 @@ public void GroupPropertyTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.GroupProperty("Pay");
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "sql_alias.Pay as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
-			SqlString groupSql = expression.ToGroupSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString groupSql = expression.ToGroupSqlString(criteria, criteriaQuery);
 			string expectedGroupSql = "sql_alias.Pay";
 			CompareSqlStrings(groupSql, expectedGroupSql);
 			session.Close();
@@ -134,7 +133,7 @@ public void IdTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.Id();
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "sql_alias.id_ as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -146,7 +145,7 @@ public void PropertyTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.Property("Pay");
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "sql_alias.Pay as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -161,7 +160,7 @@ public void SqlGroupProjectionTest()
 			                                                        new IType[] {NHibernateUtil.Double}
 				);
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "count(Pay)";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -175,7 +174,7 @@ public void SqlProjectionTest()
 			                                                   new string[] {"CountOfPay"}, new
 			                                                                                	IType[] {NHibernateUtil.Double});
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "count(Pay)";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();
@@ -187,7 +186,7 @@ public void SumTest()
 			ISession session = factory.OpenSession();
 			IProjection expression = Projections.Sum("Pay");
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, 0, criteriaQuery);
 			string expectedSql = "sum(sql_alias.Pay) as y0_";
 			CompareSqlStrings(sqlString, expectedSql, 0);
 			session.Close();

src/NHibernate.Test/ExpressionTest/PropertyExpressionFixture.cs

@@ -2,7 +2,6 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -26,7 +25,7 @@ public void SqlStringTest()
 			ICriterion expression = Expression.EqProperty("Address", "Name");
 
 			CreateObjects(typeof(Simple), session);
-			SqlString sqlString = expression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+			SqlString sqlString = expression.ToSqlString(criteria, criteriaQuery);
 
 			string expectedSql = "sql_alias.address = sql_alias.Name";
 

src/NHibernate.Test/ExpressionTest/SQLExpressionFixture.cs

@@ -1,7 +1,6 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ExpressionTest
@@ -17,7 +16,7 @@ public void StraightSqlTest()
 				ICriterion sqlExpression = Expression.Sql("{alias}.address is not null");
 
 				CreateObjects(typeof(Simple), session);
-				SqlString sqlString = sqlExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+				SqlString sqlString = sqlExpression.ToSqlString(criteria, criteriaQuery);
 
 				string expectedSql = "sql_alias.address is not null";
 
@@ -33,7 +32,7 @@ public void NoParamsSqlStringTest()
 				ICriterion sqlExpression = Expression.Sql(new SqlString("{alias}.address is not null"));
 
 				CreateObjects(typeof(Simple), session);
-				SqlString sqlString = sqlExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+				SqlString sqlString = sqlExpression.ToSqlString(criteria, criteriaQuery);
 
 				string expectedSql = "sql_alias.address is not null";
 
@@ -56,7 +55,7 @@ public void WithParameterTest()
 				ICriterion sqlExpression = Expression.Sql(builder.ToSqlString(), "some address", NHibernateUtil.String);
 
 				CreateObjects(typeof(Simple), session);
-				SqlString sqlString = sqlExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+				SqlString sqlString = sqlExpression.ToSqlString(criteria, criteriaQuery);
 
 				CompareSqlStrings(sqlString, expectedSql, 1);
 			}