From 20c66b2f059824a2148c2b9fd064cf9dc5c956af Mon Sep 17 00:00:00 2001
From: Billy Chan <ccw.billy.123@gmail.com>
Date: Thu, 21 Oct 2021 15:50:18 +0800
Subject: [PATCH] Refactoring

---
 src/query/insert.rs | 2 +-
 src/query/select.rs | 5 ++---
 src/query/update.rs | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/query/insert.rs b/src/query/insert.rs
index f7f7c7d3..3a7c91d6 100644
--- a/src/query/insert.rs
+++ b/src/query/insert.rs
@@ -136,7 +136,7 @@ where
                 columns.push(col);
                 let val = av.into_value().unwrap();
                 let expr = if let Some(enum_name) = enum_name {
-                    Func::cast_as(val, Alias::new(&enum_name))
+                    Func::cast_as(val, Alias::new(enum_name))
                 } else {
                     Expr::val(val).into()
                 };
diff --git a/src/query/select.rs b/src/query/select.rs
index 5a2e0cdc..0f2db65b 100644
--- a/src/query/select.rs
+++ b/src/query/select.rs
@@ -120,12 +120,11 @@ where
                 let col_def = col.def();
                 let enum_name = col_def.get_column_type().get_enum_name();
                 let col_expr = Expr::tbl(table.clone(), col);
-                let col_expr = if let Some(_) = enum_name {
+                if enum_name.is_some() {
                     Func::cast_expr_as(col_expr, Alias::new("text"))
                 } else {
                     col_expr.into()
-                };
-                col_expr
+                }
             })
             .collect()
     }
diff --git a/src/query/update.rs b/src/query/update.rs
index 2f9bdb3b..a881ad11 100644
--- a/src/query/update.rs
+++ b/src/query/update.rs
@@ -110,7 +110,7 @@ where
             if av.is_set() {
                 let val = av.into_value().unwrap();
                 let expr = if let Some(enum_name) = enum_name {
-                    Func::cast_as(val, Alias::new(&enum_name))
+                    Func::cast_as(val, Alias::new(enum_name))
                 } else {
                     Expr::val(val).into()
                 };