Adding GroupBy<TJoined>() and Having<TJoined>().

Author: stefanmielke

DataCore.Test/QueryTestGroupBy.cs

@@ -36,5 +36,18 @@ public void CanAggregateGroupBy()
 
             Assert.AreEqual("TestClass.Id, TestClass.FloatNumber, TestClass.Name", query.SqlGroupBy);
         }
+
+        [Test]
+        public void CanAggregateGroupByOther()
+        {
+            var query = new Query<TestClass>(new Translator());
+            query.Join<TestClass2>((t, t2) => t.TestClass2Id == t2.Id);
+
+            query.GroupBy(t => t.Id);
+            query.GroupBy(t => new { Number = t.FloatNumber, t.Name });
+            query.GroupBy<TestClass2>(t2 => t2.Id);
+
+            Assert.AreEqual("TestClass.Id, TestClass.FloatNumber, TestClass.Name, TestClass2.Id", query.SqlGroupBy);
+        }
     }
 }

DataCore.Test/QueryTestHaving.cs

@@ -34,5 +34,24 @@ public void CanGenerateHavingWithManyArgumentsAggregated()
             Assert.AreEqual(0, query.Parameters.GetValues()["@p0"]);
             Assert.AreEqual("test", query.Parameters.GetValues()["@p1"]);
         }
+        
+        [Test]
+        public void CanGenerateHavingWithJoinedTable()
+        {
+            var query = new Query<TestClass>(new Translator()).Having<TestClass2>(t => t.Id > 0);
+
+            Assert.AreEqual("(TestClass2.Id > @p0)", query.SqlHaving);
+            Assert.AreEqual(0, query.Parameters.GetValues()["@p0"]);
+        }
+
+        [Test]
+        public void CanGenerateHavingWithJoinedTableAndManyArgumentsAggregated()
+        {
+            var query = new Query<TestClass>(new Translator()).Having<TestClass2>(t => t.Id > 0).Having(t => t.Name == "test");
+
+            Assert.AreEqual("((TestClass2.Id > @p0)) AND ((TestClass.Name = @p1))", query.SqlHaving);
+            Assert.AreEqual(0, query.Parameters.GetValues()["@p0"]);
+            Assert.AreEqual("test", query.Parameters.GetValues()["@p1"]);
+        }
     }
 }

DataCore/Query.cs

@@ -350,6 +350,22 @@ public Query<T> Having(Expression<Func<T, bool>> clause)
             return this;
         }
 
+        public Query<T> Having<TJoined>(Expression<Func<TJoined, bool>> clause)
+        {
+            var query = GetQueryFromClause(clause);
+
+            SqlHaving = string.IsNullOrEmpty(SqlHaving) ? query : string.Concat("(", SqlHaving, ") AND (", query, ")");
+
+            return this;
+        }
+
+        public Query<T> GroupBy<TJoined>(Expression<Func<TJoined, dynamic>> clause)
+        {
+            SqlGroupBy = ExpressionHelper.FormatStringFromArguments(_translator, clause, SqlGroupBy, Parameters);
+
+            return this;
+        }
+
         public Query<T> GroupBy(Expression<Func<T, dynamic>> clause)
         {
             SqlGroupBy = ExpressionHelper.FormatStringFromArguments(_translator, clause, SqlGroupBy, Parameters);

README.md

@@ -112,6 +112,16 @@ var result = db.Select(query);
 var query = db.From<User>().GroupBy(u => u.Name).Having(u => u.Age.Sum() > 100).Count();
 var result = db.Select(query);
 ```
+```csharp
+var query = db.From<User>()
+              .LeftJoin<Address>((u, a) => u.Id == a.UserId)
+              .GroupBy(u => u.Name)
+              .GroupBy<Address>(a => a.Street)
+              .Having(u => u.Age.Sum() > 100)
+              .Having<Address>(a => a.Sum.Number.Count() > 2)
+              .Count();
+var result = db.Select(query);
+```
 
 ### Select Columns