Merge pull request diesel-rs#1680 from diesel-rs/sg-aggregate

Eijebong · web-flow · commit b4810bc101da · 2018-05-05T02:26:24.000+02:00
`max` and `min` are aggregate functions
diff --git a/diesel/src/expression/functions/aggregate_ordering.rs b/diesel/src/expression/functions/aggregate_ordering.rs
@@ -16,6 +16,7 @@ sql_function! {
     /// #     let connection = establish_connection();
     /// assert_eq!(Ok(Some(8)), animals.select(max(legs)).first(&connection));
     /// # }
+    #[aggregate]
     fn max<ST: SqlOrd + IntoNullable>(expr: ST) -> ST::Nullable;
 }
 
@@ -35,5 +36,6 @@ sql_function! {
     /// #     let connection = establish_connection();
     /// assert_eq!(Ok(Some(4)), animals.select(min(legs)).first(&connection));
     /// # }
+    #[aggregate]
     fn min<ST: SqlOrd + IntoNullable>(expr: ST) -> ST::Nullable;
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ sql_function! {`
`16`	`16`	`/// # let connection = establish_connection();`
`17`	`17`	`/// assert_eq!(Ok(Some(8)), animals.select(max(legs)).first(&connection));`
`18`	`18`	`/// # }`
	`19`	`+ #[aggregate]`
`19`	`20`	`fn max<ST: SqlOrd + IntoNullable>(expr: ST) -> ST::Nullable;`
`20`	`21`	`}`
`21`	`22`
`@@ -35,5 +36,6 @@ sql_function! {`
`35`	`36`	`/// # let connection = establish_connection();`
`36`	`37`	`/// assert_eq!(Ok(Some(4)), animals.select(min(legs)).first(&connection));`
`37`	`38`	`/// # }`
	`39`	`+ #[aggregate]`
`38`	`40`	`fn min<ST: SqlOrd + IntoNullable>(expr: ST) -> ST::Nullable;`
`39`	`41`	`}`