move this into pg-only land

diesel-rs · Nov 16, 2017 · 290221a · 290221a
1 parent a01b020
commit 290221a
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 70 deletions.
diff --git a/diesel/src/expression/functions/mod.rs b/diesel/src/expression/functions/mod.rs
@@ -1,6 +1,3 @@
-use std::marker::PhantomData;
-use expression::{AppearsOnTable, Expression, IntoSingleTypeExpressionList, SelectableExpression};
-
 #[macro_export]
 #[doc(hidden)]
 macro_rules! sql_function_body {
@@ -202,68 +199,6 @@ macro_rules! no_arg_sql_function {
     };
 }
 
-#[derive(Debug)]
-pub struct Array<T, ST> {
-    elements: T,
-    _marker: PhantomData<ST>,
-}
-
-pub fn array<ST, T>(elements: T) -> Array<T::Expression, ST>
-where
-    T: IntoSingleTypeExpressionList<ST>,
-{
-    Array {
-        elements: elements.into_single_type_expression_list(),
-        _marker: PhantomData,
-    }
-}
-
-impl<T, ST> Expression for Array<T, ST>
-where
-    T: Expression,
-{
-    type SqlType = ::pg::types::sql_types::Array<ST>;
-}
-
-use query_builder::{AstPass, QueryFragment};
-use backend::Backend;
-
-impl<T, ST, DB> QueryFragment<DB> for Array<T, ST>
-where
-    DB: Backend,
-    for<'a> (&'a T): QueryFragment<DB>,
-{
-    fn walk_ast(&self, mut out: AstPass<DB>) -> ::result::QueryResult<()> {
-        out.push_sql("ARRAY[");
-        QueryFragment::walk_ast(&(&self.elements,), out.reborrow())?;
-        out.push_sql("]");
-        Ok(())
-    }
-}
-
-impl_query_id!(Array<T, ST>);
-
-impl<T, ST, QS> SelectableExpression<QS> for Array<T, ST>
-where
-    T: SelectableExpression<QS>,
-    Array<T, ST>: AppearsOnTable<QS>,
-{
-}
-
-impl<T, ST, QS> AppearsOnTable<QS> for Array<T, ST>
-where
-    T: AppearsOnTable<QS>,
-    Array<T, ST>: Expression,
-{
-}
-
-impl<T, ST> ::expression::NonAggregate for Array<T, ST>
-where
-    T: ::expression::NonAggregate,
-    Array<T, ST>: Expression,
-{
-}
-
 pub mod aggregate_ordering;
 pub mod aggregate_folding;
 pub mod date_and_time;
diff --git a/diesel/src/expression/mod.rs b/diesel/src/expression/mod.rs
@@ -63,11 +63,6 @@ pub mod dsl {
 
     #[cfg(feature = "postgres")]
     pub use pg::expression::dsl::*;
-
-    #[cfg(feature = "postgres")]
-    #[doc(inline)]
-    pub use super::functions::array;
-
 }
 
 #[doc(inline)]

diff --git a/diesel/src/pg/expression/array.rs b/diesel/src/pg/expression/array.rs
@@ -0,0 +1,64 @@
+use std::marker::PhantomData;
+use expression::{AppearsOnTable, Expression, IntoSingleTypeExpressionList, SelectableExpression};
+
+#[derive(Debug)]
+pub struct Array<T, ST> {
+    elements: T,
+    _marker: PhantomData<ST>,
+}
+
+pub fn array<ST, T>(elements: T) -> Array<T::Expression, ST>
+where
+    T: IntoSingleTypeExpressionList<ST>,
+{
+    Array {
+        elements: elements.into_single_type_expression_list(),
+        _marker: PhantomData,
+    }
+}
+
+impl<T, ST> Expression for Array<T, ST>
+where
+    T: Expression,
+{
+    type SqlType = ::pg::types::sql_types::Array<ST>;
+}
+
+use query_builder::{AstPass, QueryFragment};
+use backend::Backend;
+
+impl<T, ST, DB> QueryFragment<DB> for Array<T, ST>
+where
+    DB: Backend,
+    for<'a> (&'a T): QueryFragment<DB>,
+{
+    fn walk_ast(&self, mut out: AstPass<DB>) -> ::result::QueryResult<()> {
+        out.push_sql("ARRAY[");
+        QueryFragment::walk_ast(&(&self.elements,), out.reborrow())?;
+        out.push_sql("]");
+        Ok(())
+    }
+}
+
+impl_query_id!(Array<T, ST>);
+
+impl<T, ST, QS> SelectableExpression<QS> for Array<T, ST>
+where
+    T: SelectableExpression<QS>,
+    Array<T, ST>: AppearsOnTable<QS>,
+{
+}
+
+impl<T, ST, QS> AppearsOnTable<QS> for Array<T, ST>
+where
+    T: AppearsOnTable<QS>,
+    Array<T, ST>: Expression,
+{
+}
+
+impl<T, ST> ::expression::NonAggregate for Array<T, ST>
+where
+    T: ::expression::NonAggregate,
+    Array<T, ST>: Expression,
+{
+}
diff --git a/diesel/src/pg/expression/mod.rs b/diesel/src/pg/expression/mod.rs
@@ -1,5 +1,7 @@
 #[doc(hidden)]
 pub mod array_comparison;
+#[doc(hidden)]
+pub mod array;
 pub mod expression_methods;
 pub mod extensions;
 #[doc(hidden)]
@@ -16,5 +18,8 @@ pub mod dsl {
     #[doc(inline)]
     pub use super::array_comparison::{all, any};
 
+    #[doc(inline)]
+    pub use super::array::array;
+
     pub use super::extensions::*;
 }