SeaQLgh-516: use into_sub_query_expr instead of From

alphavector · Apr 27, 2023 · e5f0b64 · e5f0b64
1 parent bdd64a0
commit e5f0b64
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/src/expr.rs b/src/expr.rs
@@ -37,6 +37,10 @@ pub enum SimpleExpr {
     Constant(Value),
 }
 
+pub trait IntoSimpleExpr {
+    fn into_sub_query_expr(self) -> SimpleExpr;
+}
+
 pub(crate) mod private {
     use crate::{BinOper, LikeExpr, SimpleExpr, UnOper};
 
@@ -2163,12 +2167,6 @@ impl Expression for SimpleExpr {
     }
 }
 
-impl From<SelectStatement> for SimpleExpr {
-    fn from(sel: SelectStatement) -> Self {
-        SimpleExpr::SubQuery(None, Box::new(sel.into_sub_query_statement()))
-    }
-}
-
 impl SimpleExpr {
     /// Negates an expression with `NOT`.
     ///

diff --git a/src/func.rs b/src/func.rs
@@ -411,7 +411,7 @@ impl Func {
     ///             .from(Char::Table)
     ///             .expr(Func::max(Expr::col(Char::SizeW)))
     ///             .take()
-    ///             .into(),
+    ///             .into_sub_query_expr(),
     ///         Expr::col(Char::SizeH).into(),
     ///         Expr::val(12).into(),
     ///     ]))

diff --git a/src/query/select.rs b/src/query/select.rs
@@ -2317,3 +2317,9 @@ impl ConditionalStatement for SelectStatement {
         self
     }
 }
+
+impl IntoSimpleExpr for SelectStatement {
+    fn into_sub_query_expr(self) -> SimpleExpr {
+        SimpleExpr::SubQuery(None, Box::new(self.into_sub_query_statement()))
+    }
+}
diff --git a/tests/mysql/query.rs b/tests/mysql/query.rs
@@ -1012,8 +1012,8 @@ fn select_coalesce() {
             Query::select()
                 .from(Char::Table)
                 .expr(Func::max(Expr::col(Character::Id)))
-                .to_owned()
-                .into(),
+                .take()
+                .into_sub_query_expr(),
             1.into(),
             Value::Bool(None).into(),
         ]))
@@ -1304,7 +1304,7 @@ fn insert_coalesce() {
                 .from(Glyph::Table)
                 .expr(Func::max(Expr::col(Glyph::Aspect)))
                 .take()
-                .into(),
+                .into_sub_query_expr(),
                 1.into(),
                 Value::Bool(None).into(),
             ])

diff --git a/tests/postgres/query.rs b/tests/postgres/query.rs
@@ -1103,8 +1103,8 @@ fn select_coalesce() {
             Query::select()
                 .from(Char::Table)
                 .expr(Func::count(Expr::col(Character::Id)))
-                .to_owned()
-                .into(),
+                .take()
+                .into_sub_query_expr(),
             1.into(),
             Value::Bool(None).into(),
         ]))
@@ -1429,7 +1429,7 @@ fn insert_coalesce() {
                            .from(Glyph::Table)
                            .expr(Func::max(Expr::col(Glyph::Aspect)))
                            .take()
-                           .into(),
+                           .into_sub_query_expr(),
                            1.into(),
                            Value::Bool(None).into(),
                        ])

diff --git a/tests/sqlite/query.rs b/tests/sqlite/query.rs
@@ -1049,7 +1049,7 @@ fn select_coalesce() {
                 .from(Char::Table)
                 .expr(Func::max(Expr::col(Character::Id)))
                 .to_owned()
-                .into(),
+                .into_sub_query_expr(),
             1.into(),
             Value::Bool(None).into(),
         ]))
@@ -1365,7 +1365,7 @@ fn insert_coalesce() {
                            .from(Glyph::Table)
                            .expr(Func::max(Expr::col(Glyph::Aspect)))
                            .take()
-                           .into(),
+                           .into_sub_query_expr(),
                            1.into(),
                            Value::Bool(None).into(),
                        ])