add more tests + cs

diesel-rs · May 25, 2023 · 630731d · 630731d
1 parent 1de31ad
commit 630731d
Show file tree

Hide file tree

Showing 4 changed files with 150 additions and 109 deletions.
diff --git a/diesel/src/pg/query_builder/distinct_on.rs b/diesel/src/pg/query_builder/distinct_on.rs
@@ -18,14 +18,14 @@ pub struct DistinctOnClause<T>(pub(crate) T);
 impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for NoOrderClause {}
 impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for OrderClause<(T,)> {}
 impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for OrderClause<T> where T: crate::Column {}
-impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for OrderClause<crate::helper_types::Desc<T>>
-    where
-        T: crate::Column,
-{}
-impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for OrderClause<crate::helper_types::Asc<T>>
-    where
-        T: crate::Column,
-{}
+impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for OrderClause<crate::helper_types::Desc<T>> where
+    T: crate::Column
+{
+}
+impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for OrderClause<crate::helper_types::Asc<T>> where
+    T: crate::Column
+{
+}
 macro_rules! valid_ordering {
     (@skip: ($ST1: ident, $($ST:ident,)*), $T1:ident, ) => {};
     (@skip: ($ST1: ident, $($ST:ident,)*), $T1:ident, $($T:ident,)+) => {

diff --git a/diesel_compile_tests/tests/fail/distinct_on_requires_matching_order_clause.rs b/diesel_compile_tests/tests/fail/distinct_on_requires_matching_order_clause.rs
@@ -42,6 +42,33 @@ fn main() {
         .then_order_by(users::id)
         .distinct_on(users::name);
 
+    // same as above, with asc/desc
+    let _ = users::table
+        .order_by(users::name.asc())
+        .distinct_on(users::name)
+        .into_boxed();
+    let _ = users::table
+        .order_by((users::name.asc(), users::id.desc()))
+        .distinct_on(users::name)
+        .into_boxed();
+    let _ = users::table
+        .order_by((users::name.asc(), users::id.desc()))
+        .distinct_on((users::name, users::id))
+        .into_boxed();
+    let _ = users::table
+        .order_by((users::name.asc(), users::id.desc()))
+        .distinct_on((users::name, users::id, users::hair_color))
+        .into_boxed();
+    let _ = users::table
+        .order_by((users::name.asc(), users::id.desc(), users::hair_color))
+        .distinct_on((users::name, users::id))
+        .into_boxed();
+    let _ = users::table
+        .order_by(users::name.asc())
+        .then_order_by(users::id)
+        .distinct_on(users::name)
+        .into_boxed();
+
     // verify that this all works with boxed queries
     let _ = users::table.distinct_on(users::name).into_boxed();
     let _ = users::table