From db363eac0a1c1b85ec1d9a9d62e7db3e9001c7c4 Mon Sep 17 00:00:00 2001 From: Elrendio Date: Mon, 14 Aug 2023 18:57:24 +0200 Subject: [PATCH 1/3] Add type alias OrderBy --- diesel/src/lib.rs | 5 +++++ "\303\240" | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 "\303\240" diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs index f6ec5ba35713..dff8dfbba3cf 100644 --- a/diesel/src/lib.rs +++ b/diesel/src/lib.rs @@ -398,6 +398,11 @@ pub mod helper_types { /// Represents the return type of [`.order(ordering)`](crate::prelude::QueryDsl::order) pub type Order = >::Output; + /// Represents the return type of [`.order_by(ordering)`](crate::prelude::QueryDsl::order_by) + /// + /// Type alias of [Order] + pub type OrderBy = Order; + /// Represents the return type of [`.then_order_by(ordering)`](crate::prelude::QueryDsl::then_order_by) pub type ThenOrderBy = >::Output; diff --git "a/\303\240" "b/\303\240" new file mode 100644 index 000000000000..5fc99fc12f7d --- /dev/null +++ "b/\303\240" @@ -0,0 +1,10 @@ +Add type alias OrderBy +% Please enter the commit message for your changes. Lines starting +% with '%' will be ignored, and an empty message aborts the commit. +% +% On branch FIX-MissingTypeAliasOrderByForAutoType +% Your branch is up to date with 'fork/FIX-MissingTypeAliasOrderByForAutoType'. +% +% Changes to be committed: +% modified: diesel/src/lib.rs +% From 86c424b8d664f525e953227412691c7319aad4a5 Mon Sep 17 00:00:00 2001 From: Elrendio Date: Mon, 14 Aug 2023 19:00:27 +0200 Subject: [PATCH 2/3] use OrderBy --- diesel/src/query_dsl/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diesel/src/query_dsl/mod.rs b/diesel/src/query_dsl/mod.rs index a8c7eab5b0a8..d8fc1e2772c5 100644 --- a/diesel/src/query_dsl/mod.rs +++ b/diesel/src/query_dsl/mod.rs @@ -789,7 +789,7 @@ pub trait QueryDsl: Sized { } /// Alias for `order` - fn order_by(self, expr: Expr) -> Order + fn order_by(self, expr: Expr) -> OrderBy where Expr: Expression, Self: methods::OrderDsl, From e88f31e60686747bc9f1e53a6b84b803bdbc4648 Mon Sep 17 00:00:00 2001 From: Elrendio Date: Mon, 14 Aug 2023 19:02:45 +0200 Subject: [PATCH 3/3] remove useless file --- "\303\240" | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 "\303\240" diff --git "a/\303\240" "b/\303\240" deleted file mode 100644 index 5fc99fc12f7d..000000000000 --- "a/\303\240" +++ /dev/null @@ -1,10 +0,0 @@ -Add type alias OrderBy -% Please enter the commit message for your changes. Lines starting -% with '%' will be ignored, and an empty message aborts the commit. -% -% On branch FIX-MissingTypeAliasOrderByForAutoType -% Your branch is up to date with 'fork/FIX-MissingTypeAliasOrderByForAutoType'. -% -% Changes to be committed: -% modified: diesel/src/lib.rs -%