NH-2290 Invalid hql parenthesis expansion in generated sql

Author: oskarb

releasenotes.txt

@@ -1,5 +1,13 @@
 Build 3.4.0.CR1
 =============================
+** Known BREAKING CHANGES from NH3.3.0.GA to NH3.4.0.GA
+
+    ##### Possible Breaking Changes #####
+        * [NH-2290] Invalid hql parenthesis expansion in generated sql
+            Unary minus before parentheses in HQL lost the parentheses when translated
+			to SQL and therefore the wrong value was returned. This use of unary minus is now
+			implemented in the mathematically correct way.
+
 
 ** Sub-task
     * [NH-3434] - Need to be sure NH-3428 is resolved in 3.Next.  

src/NHibernate.Test/Hql/Ast/HqlFixture.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Collections;
 using NHibernate.Criterion;
 using NHibernate.Engine.Query;
@@ -310,5 +311,29 @@ public void InsertIntoFromSelect_WithSelectClauseParameters()
 				}
 			}
 		}
+
+
+		[Test]
+		public void UnaryMinusBeforeParenthesesHandledCorrectly()
+		{
+			using (ISession s = OpenSession())
+			using (ITransaction txn = s.BeginTransaction())
+			{
+				s.Save(new Animal {Description = "cat1", BodyWeight = 1});
+
+				// NH-2290: Unary minus before parentheses wasn't handled correctly (this query returned 0).
+				int actual = s.CreateQuery("select -(1+1) from Animal as h")
+					.List<int>().Single();
+				Assert.That(actual, Is.EqualTo(-2));
+
+				// This was the workaround, which of course should still work.
+				int actualWorkaround = s.CreateQuery("select -1*(1+1) from Animal as h")
+					.List<int>().Single();
+				Assert.That(actualWorkaround, Is.EqualTo(-2));
+
+				s.CreateQuery("delete from Animal").ExecuteUpdate();
+				txn.Commit();
+			}
+		}
 	}
 }

src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 Hql.g 2014-08-03 13:32:00
+// $ANTLR 3.5.0.2 Hql.g 2014-08-03 16:52:01
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 Hql.g 2014-08-03 13:32:00
+// $ANTLR 3.5.0.2 Hql.g 2014-08-03 16:52:01
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 HqlSqlWalker.g 2014-08-03 13:32:01
+// $ANTLR 3.5.0.2 HqlSqlWalker.g 2014-08-03 16:52:02
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/Generated/SqlGenerator.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 SqlGenerator.g 2014-08-03 13:32:03
+// $ANTLR 3.5.0.2 SqlGenerator.g 2014-08-03 16:52:04
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219
@@ -5717,7 +5717,7 @@ private TreeRuleReturnScope<IASTNode> constant()
 	partial void EnterRule_arithmeticExpr();
 	partial void LeaveRule_arithmeticExpr();
 	// $ANTLR start "arithmeticExpr"
-	// SqlGenerator.g:293:1: arithmeticExpr : ( additiveExpr | bitwiseExpr | multiplicativeExpr | ^( UNARY_MINUS expr ) | caseExpr );
+	// SqlGenerator.g:293:1: arithmeticExpr : ( additiveExpr | bitwiseExpr | multiplicativeExpr | ^( UNARY_MINUS nestedExprAfterMinusDiv ) | caseExpr );
 	[GrammarRule("arithmeticExpr")]
 	private void arithmeticExpr()
 	{
@@ -5728,7 +5728,7 @@ private void arithmeticExpr()
 		DebugLocation(293, 1);
 		try
 		{
-			// SqlGenerator.g:294:2: ( additiveExpr | bitwiseExpr | multiplicativeExpr | ^( UNARY_MINUS expr ) | caseExpr )
+			// SqlGenerator.g:294:2: ( additiveExpr | bitwiseExpr | multiplicativeExpr | ^( UNARY_MINUS nestedExprAfterMinusDiv ) | caseExpr )
 			int alt55=5;
 			try { DebugEnterDecision(55, false);
 			switch (input.LA(1))
@@ -5814,7 +5814,7 @@ private void arithmeticExpr()
 				break;
 			case 4:
 				DebugEnterAlt(4);
-				// SqlGenerator.g:298:4: ^( UNARY_MINUS expr )
+				// SqlGenerator.g:298:4: ^( UNARY_MINUS nestedExprAfterMinusDiv )
 				{
 				DebugLocation(298, 4);
 				DebugLocation(298, 6);
@@ -5828,8 +5828,8 @@ private void arithmeticExpr()
 
 				Match(input, TokenTypes.Down, null); if (state.failed) return;
 				DebugLocation(298, 32);
-				PushFollow(Follow._expr_in_arithmeticExpr1659);
-				expr();
+				PushFollow(Follow._nestedExprAfterMinusDiv_in_arithmeticExpr1659);
+				nestedExprAfterMinusDiv();
 				PopFollow();
 				if (state.failed) return;
 
@@ -8407,7 +8407,7 @@ private static class Follow
 		public static readonly BitSet _bitwiseExpr_in_arithmeticExpr1643 = new BitSet(new ulong[]{0x2UL});
 		public static readonly BitSet _multiplicativeExpr_in_arithmeticExpr1648 = new BitSet(new ulong[]{0x2UL});
 		public static readonly BitSet _UNARY_MINUS_in_arithmeticExpr1655 = new BitSet(new ulong[]{0x4UL});
-		public static readonly BitSet _expr_in_arithmeticExpr1659 = new BitSet(new ulong[]{0x8UL});
+		public static readonly BitSet _nestedExprAfterMinusDiv_in_arithmeticExpr1659 = new BitSet(new ulong[]{0x8UL});
 		public static readonly BitSet _caseExpr_in_arithmeticExpr1665 = new BitSet(new ulong[]{0x2UL});
 		public static readonly BitSet _PLUS_in_additiveExpr1677 = new BitSet(new ulong[]{0x4UL});
 		public static readonly BitSet _expr_in_additiveExpr1679 = new BitSet(new ulong[]{0x8801003140ED150UL,0x561444C01F814010UL,0x208080UL});

src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.g

@@ -295,7 +295,7 @@ arithmeticExpr
 	| bitwiseExpr
 	| multiplicativeExpr
 //	| ^(CONCAT { Out("("); } expr ( { Out("||"); } expr )+ { Out(")"); } )
-	| ^(UNARY_MINUS { Out("-"); } expr)
+	| ^(UNARY_MINUS { Out("-"); } nestedExprAfterMinusDiv)
 	| caseExpr
 	;