整理代码

chusql-server/src/ChuSQL/Server/Backend.hs

@@ -76,8 +76,7 @@ data Backend = Backend
 columnsFromStatement :: Database -> Statement -> [String]
 columnsFromStatement db stmt = case prepare db stmt of
     Right (SelectDistinct q) -> columnsFromStatement db q
-    Right (Select cols _ _ _ _ _) -> cols
-    Right (SelectExpr items _ _ _ _ _) -> map fst items
+    Right (Select items _ _ _ _ _) -> map fst items
     Right ShowDomains -> ["domain", "base_type"]
     _ -> []
 
@@ -331,9 +330,6 @@ statementTables :: Statement -> [Text]
 statementTables stmt = nub (case stmt of
     SelectDistinct q -> statementTables q
     Select{} ->
-        tableRefsOf (selectFrom stmt)
-            ++ concatMap exprTables (maybe [] (: []) (selectWhere stmt) ++ map Col (selectCols stmt ++ selectGroupBy stmt ++ map fst (selectOrderBy stmt)))
-    SelectExpr{} ->
         tableRefsOf (selectFrom stmt)
             ++ concatMap exprTables (maybe [] (: []) (selectWhere stmt) ++ map snd (selectItems stmt) ++ map Col (selectGroupBy stmt ++ map fst (selectOrderBy stmt)))
     Insert table _ rows -> T.pack table : concatMap exprTables (concat rows)

chusql-server/src/ChuSQL/Server/Privileges.hs

@@ -199,8 +199,7 @@ reconcileObjects service = withTables service (catalog (OA.objectReconcile (pvBa
 requiredActions :: Statement -> Maybe [(Text, Text)]
 requiredActions statement = case statement of
     SelectDistinct q -> requiredActions q
-    Select{} -> Just (selectNeeds (selectFrom statement) (maybe [] (: []) (selectWhere statement)))
-    SelectExpr{} -> Just (selectNeeds (selectFrom statement) (maybe [] (: []) (selectWhere statement) ++ map snd (selectItems statement)))
+    Select{} -> Just (selectNeeds (selectFrom statement) (maybe [] (: []) (selectWhere statement) ++ map snd (selectItems statement)))
     Insert table _ rows -> Just ((T.pack table, "insert") : selectsOf (concat rows))
     Update table assignments condition -> Just ((T.pack table, "update") : selectsOf (map snd assignments ++ maybe [] (: []) condition))
     Delete table condition -> Just ((T.pack table, "delete") : selectsOf (maybe [] (: []) condition))

chusql-server/src/ChuSQL/Server/Session.hs

@@ -328,7 +328,6 @@ transactionData :: Statement -> Bool
 transactionData statement = case statement of
     SelectDistinct q -> transactionData q
     Select{} -> True
-    SelectExpr{} -> True
     Insert{} -> True
     Update{} -> True
     Delete{} -> True