Fixes ThatRendle#288

ThatRendle · ThatRendle · commit 3ea81b89037d · 2013-05-21T13:51:30.000+01:00
diff --git a/Simple.Data/SimpleQuery.cs b/Simple.Data/SimpleQuery.cs
@@ -369,16 +369,21 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
             }
             if (binder.Name.Equals("having", StringComparison.OrdinalIgnoreCase))
             {
-                var expression = args.SingleOrDefault() as SimpleExpression;
-                if (expression != null)
+                SimpleExpression expression;
+                try
                 {
-                    result = new SimpleQuery(this, _clauses.Append(new HavingClause(expression)));
-                    return true;
+                    expression = args.SingleOrDefault() as SimpleExpression;
                 }
-                else
+                catch (InvalidOperationException)
                 {
                     throw new ArgumentException("Having requires an expression");
                 }
+                if (expression != null)
+                {
+                    result = new SimpleQuery(this, _clauses.Append(new HavingClause(expression)));
+                    return true;
+                }
+                throw new ArgumentException("Having requires an expression");
             }
             if (binder.Name.StartsWith("with", StringComparison.OrdinalIgnoreCase) && !binder.Name.Equals("WithTotalCount", StringComparison.OrdinalIgnoreCase))
             {

Original file line number	Diff line number	Diff line change
`@@ -369,16 +369,21 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o`
`369`	`369`	`}`
`370`	`370`	`if (binder.Name.Equals("having", StringComparison.OrdinalIgnoreCase))`
`371`	`371`	`{`
`372`		`- var expression = args.SingleOrDefault() as SimpleExpression;`
`373`		`- if (expression != null)`
	`372`	`+ SimpleExpression expression;`
	`373`	`+ try`
`374`	`374`	`{`
`375`		`- result = new SimpleQuery(this, _clauses.Append(new HavingClause(expression)));`
`376`		`- return true;`
	`375`	`+ expression = args.SingleOrDefault() as SimpleExpression;`
`377`	`376`	`}`
`378`		`- else`
	`377`	`+ catch (InvalidOperationException)`
`379`	`378`	`{`
`380`	`379`	`throw new ArgumentException("Having requires an expression");`
`381`	`380`	`}`
	`381`	`+ if (expression != null)`
	`382`	`+ {`
	`383`	`+ result = new SimpleQuery(this, _clauses.Append(new HavingClause(expression)));`
	`384`	`+ return true;`
	`385`	`+ }`
	`386`	`+ throw new ArgumentException("Having requires an expression");`
`382`	`387`	`}`
`383`	`388`	`if (binder.Name.StartsWith("with", StringComparison.OrdinalIgnoreCase) && !binder.Name.Equals("WithTotalCount", StringComparison.OrdinalIgnoreCase))`
`384`	`389`	`{`