[Nhibernate-commit] SF.net SVN: nhibernate:[3935] trunk/nhibernate/src/NHibernate

[<te...@us...>]

Revision: 3935
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3935&view=rev
Author:   tehlike
Date:     2008-11-27 19:58:01 +0000 (Thu, 27 Nov 2008)

Log Message:
-----------
Fix NH-1578

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Criterion/NotExpression.cs
    trunk/nhibernate/src/NHibernate.Test/ExpressionTest/NotExpressionFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Criterion/NotExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/NotExpression.cs	2008-11-26 22:38:49 UTC (rev 3934)
+++ trunk/nhibernate/src/NHibernate/Criterion/NotExpression.cs	2008-11-27 19:58:01 UTC (rev 3935)
@@ -28,24 +28,10 @@
 		{
 			//TODO: set default capacity
 			SqlStringBuilder builder = new SqlStringBuilder();
-
-			bool needsParens = criteriaQuery.Factory.Dialect is MySQLDialect;
-			if (needsParens)
-			{
-				builder.Add("not (");
-			}
-			else
-			{
-				builder.Add("not ");
-			}
-
+			builder.Add("not (");
 			builder.Add(_criterion.ToSqlString(criteria, criteriaQuery, enabledFilters));
+			builder.Add(")");
 
-			if (needsParens)
-			{
-				builder.Add(")");
-			}
-
 			return builder.ToSqlString();
 		}
 
@@ -56,7 +42,7 @@
 
 		public override string ToString()
 		{
-			return "not " + _criterion.ToString();
+			return string.Format("not ({0})", _criterion.ToString());
 		}
 
 		public override IProjection[] GetProjections()

Modified: trunk/nhibernate/src/NHibernate.Test/ExpressionTest/NotExpressionFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/ExpressionTest/NotExpressionFixture.cs	2008-11-26 22:38:49 UTC (rev 3934)
+++ trunk/nhibernate/src/NHibernate.Test/ExpressionTest/NotExpressionFixture.cs	2008-11-27 19:58:01 UTC (rev 3935)
@@ -23,12 +23,8 @@
 			CreateObjects(typeof(Simple), session);
 			SqlString sqlString = notExpression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
 
-			string expectedSql = dialect is MySQLDialect ?
-			                     "not (sql_alias.address = ?)" :
-			                     "not sql_alias.address = ?";
-
+			string expectedSql = "not (sql_alias.address = ?)";
 			CompareSqlStrings(sqlString, expectedSql, 1);
-
 			session.Close();
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.