Add more tests

Address comments

Remove incorrect tests

Author: 0xPoe

diesel/src/query_dsl/having_dsl.rs

@@ -1,5 +1,9 @@
-use crate::dsl::Having;
-use crate::query_source::*;
+use crate::dsl;
+use crate::expression::Expression;
+use crate::expression::TypedExpressionType;
+use crate::expression::ValidGrouping;
+use crate::query_builder::{AsQuery, SelectStatement};
+use crate::query_source::Table;
 
 /// The `having` method
 ///
@@ -13,17 +17,19 @@ pub trait HavingDsl<Predicate> {
     type Output;
 
     /// See the trait documentation.
-    fn having(self, predicate: Predicate) -> Self::Output;
+    fn having(self, predicate: Predicate) -> dsl::Having<Self, Predicate>;
 }
 
 impl<T, Predicate> HavingDsl<Predicate> for T
 where
-    T: Table,
-    T::Query: HavingDsl<Predicate>,
+    T: Table + AsQuery<Query = SelectStatement<T>>,
+    SelectStatement<T>: HavingDsl<Predicate>,
+    T::DefaultSelection: Expression<SqlType = T::SqlType> + ValidGrouping<()>,
+    T::SqlType: TypedExpressionType,
 {
-    type Output = Having<T::Query, Predicate>;
+    type Output = dsl::Having<SelectStatement<T>, Predicate>;
 
-    fn having(self, predicate: Predicate) -> Self::Output {
+    fn having(self, predicate: Predicate) -> dsl::Having<Self, Predicate> {
         self.as_query().having(predicate)
     }
 }

diesel_tests/tests/having.rs

@@ -59,6 +59,37 @@ fn simple_having_with_group_by() {
     assert_eq!(expected_data, data);
 }
 
+#[test]
+fn boxed_simple_having_with_group_by() {
+    let connection = connection();
+    connection
+        .execute("INSERT INTO users (id, name) VALUES (1, 'Sean'), (2, 'Tess')")
+        .unwrap();
+    connection
+        .execute(
+            "INSERT INTO posts (id, user_id, title) VALUES (1, 1, 'Hi Sean'), (2, 2, 'Hi Tess')",
+        )
+        .unwrap();
+    connection
+        .execute(
+            "INSERT INTO comments (id, post_id, text) VALUES (1, 1, 'Comment for Hi Sean'), \
+        (2, 2, 'Comment for Hi Tess'), (3, 2, 'Another comment for Hi Tess')",
+        )
+        .unwrap();
+
+    let source = users::table
+        .inner_join(posts::table.inner_join(comments::table))
+        .group_by((users::id, posts::id))
+        .having(diesel::dsl::count(comments::id).eq(2))
+        .select((users::name, posts::title))
+        .into_boxed();
+
+    let expected_data = vec![("Tess".to_string(), "Hi Tess".to_string())];
+    let data: Vec<(String, String)> = source.load(&connection).unwrap();
+
+    assert_eq!(expected_data, data);
+}
+
 #[test]
 fn multi_condition_having_with_group_by() {
     let connection = connection();
@@ -89,3 +120,35 @@ fn multi_condition_having_with_group_by() {
 
     assert_eq!(expected_data, data);
 }
+
+#[test]
+fn boxed_multi_condition_having_with_group_by() {
+    let connection = connection();
+    connection
+        .execute("INSERT INTO users (id, name) VALUES (1, 'Sean'), (2, 'Tess'), (3, 'Nick')")
+        .unwrap();
+    connection
+        .execute(
+            "INSERT INTO posts (id, user_id, title) VALUES (1, 1, 'Hi Sean'), (2, 2, 'Hi Tess'), (3, 3, 'Hi Nick')",
+        )
+        .unwrap();
+    connection
+        .execute(
+            "INSERT INTO comments (id, post_id, text) VALUES (1, 1, 'Comment for Hi Sean'), \
+        (2, 2, 'Comment for Hi Tess'), (3, 2, 'Another comment for Hi Tess'), \
+        (4, 3, 'Comment for Hi Nick'), (5, 3, 'Another comment for Hi Nick')",
+        )
+        .unwrap();
+
+    let source = users::table
+        .inner_join(posts::table.inner_join(comments::table))
+        .group_by((users::id, posts::id))
+        .having(diesel::dsl::count(comments::id).eq(2).and(users::id.eq(3)))
+        .select((users::id, users::name, posts::title))
+        .into_boxed();
+
+    let expected_data = vec![(3, "Nick".to_string(), "Hi Nick".to_string())];
+    let data: Vec<(i32, String, String)> = source.load(&connection).unwrap();
+
+    assert_eq!(expected_data, data);
+}