From 3df87a3cf9d0deff6d7df5ae2dd59cc46caed5e2 Mon Sep 17 00:00:00 2001
From: Jake Wheat <jakewheatmail@gmail.com>
Date: Fri, 18 Apr 2014 11:18:21 +0300
Subject: [PATCH] change set quantifier and sort direction to represent default
separately
---
Language/SQL/SimpleSQL/Parser.lhs | 14 +++++-----
Language/SQL/SimpleSQL/Pretty.lhs | 17 +++++++-----
Language/SQL/SimpleSQL/Syntax.lhs | 10 +++----
TODO | 1 +
tools/Language/SQL/SimpleSQL/FullQueries.lhs | 2 +-
.../SQL/SimpleSQL/QueryExprComponents.lhs | 16 ++++++------
tools/Language/SQL/SimpleSQL/SQL2003.lhs | 18 ++++++-------
tools/Language/SQL/SimpleSQL/ValueExprs.lhs | 26 +++++++++----------
8 files changed, 55 insertions(+), 49 deletions(-)
diff --git a/Language/SQL/SimpleSQL/Parser.lhs b/Language/SQL/SimpleSQL/Parser.lhs
index 7781d71..092064d 100644
--- a/Language/SQL/SimpleSQL/Parser.lhs
+++ b/Language/SQL/SimpleSQL/Parser.lhs
@@ -184,11 +184,11 @@ aggregate([all|distinct] args [order by orderitems])
> aggOrApp :: Name -> Parser ValueExpr
> aggOrApp n =
> makeApp n
-> <$> parens ((,,) <$> duplicates
+> <$> parens ((,,) <$> (fromMaybe SQDefault <$> duplicates)
> <*> choice [commaSep valueExpr]
> <*> (optionMaybe orderBy))
> where
-> makeApp i (Nothing,es,Nothing) = App i es
+> makeApp i (SQDefault,es,Nothing) = App i es
> makeApp i (d,es,od) = AggregateApp i d es (fromMaybe [] od)
> duplicates :: Parser (Maybe SetQuantifier)
@@ -602,7 +602,7 @@ TODO: carefully review the precedences and associativities.
> ,"is unknown"
> ,"is not unknown"]
> -- have to use try with inSuffix because of a conflict
-> -- with 'in' in position function
+> -- with 'in' in position function, and not between
> -- between also has a try in it to deal with 'not'
> -- ambiguity
> ++ [E.Postfix $ try inSuffix,E.Postfix betweenSuffix]
@@ -780,8 +780,8 @@ pretty trivial.
> where
> ob = SortSpec
> <$> valueExpr
-> <*> option Asc (choice [Asc <$ keyword_ "asc"
-> ,Desc <$ keyword_ "desc"])
+> <*> option DirDefault (choice [Asc <$ keyword_ "asc"
+> ,Desc <$ keyword_ "desc"])
> <*> option NullsOrderDefault
> (keyword_ "nulls" >>
> choice [NullsFirst <$ keyword "first"
@@ -833,7 +833,7 @@ and union, etc..
> where
> select = keyword_ "select" >>
> mkSelect
-> <$> (fromMaybe All <$> duplicates)
+> <$> (fromMaybe SQDefault <$> duplicates)
> <*> selectList
> <*> optionMaybe tableExpression
> mkSelect d sl Nothing =
@@ -877,7 +877,7 @@ be in the public syntax?
> [Union <$ keyword_ "union"
> ,Intersect <$ keyword_ "intersect"
> ,Except <$ keyword_ "except"] <?> "set operator")
-> <*> (fromMaybe Distinct <$> duplicates)
+> <*> (fromMaybe SQDefault <$> duplicates)
> <*> option Respectively
> (Corresponding <$ keyword_ "corresponding")
> <*> queryExpr)
diff --git a/Language/SQL/SimpleSQL/Pretty.lhs b/Language/SQL/SimpleSQL/Pretty.lhs
index 92eb5bd..20715fb 100644
--- a/Language/SQL/SimpleSQL/Pretty.lhs
+++ b/Language/SQL/SimpleSQL/Pretty.lhs
@@ -54,9 +54,9 @@ which have been changed to try to improve the layout of the output.
> valueExpr (AggregateApp f d es od) =
> name f
> <> parens ((case d of
-> Just Distinct -> text "distinct"
-> Just All -> text "all"
-> Nothing -> empty)
+> Distinct -> text "distinct"
+> All -> text "all"
+> SQDefault -> empty)
> <+> commaSep (map valueExpr es)
> <+> orderBy od)
@@ -214,7 +214,8 @@ which have been changed to try to improve the layout of the output.
> queryExpr (Select d sl fr wh gb hv od off fe) =
> sep [text "select"
> ,case d of
-> All -> empty
+> SQDefault -> empty
+> All -> text "all"
> Distinct -> text "distinct"
> ,nest 7 $ sep [selectList sl]
> ,from fr
@@ -233,8 +234,9 @@ which have been changed to try to improve the layout of the output.
> Intersect -> "intersect"
> Except -> "except")
> <+> case d of
+> SQDefault -> empty
> All -> text "all"
-> Distinct -> empty -- text "distinct"
+> Distinct -> text "distinct"
> <+> case c of
> Corresponding -> text "corresponding"
> Respectively -> empty
@@ -320,7 +322,10 @@ which have been changed to try to improve the layout of the output.
> where
> f (SortSpec e d n) =
> valueExpr e
-> <+> (if d == Asc then empty else text "desc")
+> <+> (case d of
+> Asc -> text "asc"
+> Desc -> text "desc"
+> DirDefault -> empty)
> <+> (case n of
> NullsOrderDefault -> empty
> NullsFirst -> text "nulls" <+> text "first"
diff --git a/Language/SQL/SimpleSQL/Syntax.lhs b/Language/SQL/SimpleSQL/Syntax.lhs
index e2aec93..c6560d2 100644
--- a/Language/SQL/SimpleSQL/Syntax.lhs
+++ b/Language/SQL/SimpleSQL/Syntax.lhs
@@ -71,7 +71,7 @@
> -- order by, to regular function application
> | AggregateApp
> {aggName :: Name -- ^ aggregate function name
-> ,aggDistinct :: Maybe SetQuantifier -- ^ distinct
+> ,aggDistinct :: SetQuantifier -- ^ distinct
> ,aggArgs :: [ValueExpr]-- ^ args
> ,aggOrderBy :: [SortSpec] -- ^ order by
> }
@@ -265,7 +265,7 @@ I'm not sure if this is valid syntax or not.
> -- expr values a little easier. It is defined like this:
> --
> -- > makeSelect :: QueryExpr
-> -- > makeSelect = Select {qeSetQuantifier = All
+> -- > makeSelect = Select {qeSetQuantifier = SQDefault
> -- > ,qeSelectList = []
> -- > ,qeFrom = []
> -- > ,qeWhere = Nothing
@@ -276,7 +276,7 @@ I'm not sure if this is valid syntax or not.
> -- > ,qeFetchFirst = Nothing}
> makeSelect :: QueryExpr
-> makeSelect = Select {qeSetQuantifier = All
+> makeSelect = Select {qeSetQuantifier = SQDefault
> ,qeSelectList = []
> ,qeFrom = []
> ,qeWhere = Nothing
@@ -290,10 +290,10 @@ I'm not sure if this is valid syntax or not.
> -- | Represents the Distinct or All keywords, which can be used
> -- before a select list, in an aggregate/window function
> -- application, or in a query expression set operator.
-> data SetQuantifier = Distinct | All deriving (Eq,Show,Read,Data,Typeable)
+> data SetQuantifier = SQDefault | Distinct | All deriving (Eq,Show,Read,Data,Typeable)
> -- | The direction for a column in order by.
-> data Direction = Asc | Desc deriving (Eq,Show,Read,Data,Typeable)
+> data Direction = DirDefault | Asc | Desc deriving (Eq,Show,Read,Data,Typeable)
> -- | Query expression set operators.
> data CombineOp = Union | Except | Intersect deriving (Eq,Show,Read,Data,Typeable)
> -- | Corresponding, an option for the set operators.
diff --git a/TODO b/TODO
index 03db888..6095dad 100644
--- a/TODO
+++ b/TODO
@@ -114,6 +114,7 @@ multi word type names: left factor
quantified comparison: left factor with normal comparison
multi word operator names in expressions
hardcode all the symbols in the symbol parser/split?
+left factor the not in 'not in' and 'not between', maybe others
future big feature summary:
diff --git a/tools/Language/SQL/SimpleSQL/FullQueries.lhs b/tools/Language/SQL/SimpleSQL/FullQueries.lhs
index 59473fd..ba0367c 100644
--- a/tools/Language/SQL/SimpleSQL/FullQueries.lhs
+++ b/tools/Language/SQL/SimpleSQL/FullQueries.lhs
@@ -33,7 +33,7 @@ Some tests for parsing full queries.
> ,qeGroupBy = [SimpleGroup $ Iden "a"]
> ,qeHaving = Just $ BinOp (App "count" [NumLit "1"])
> ">" (NumLit "5")
-> ,qeOrderBy = [SortSpec (Iden "s") Asc NullsOrderDefault]
+> ,qeOrderBy = [SortSpec (Iden "s") DirDefault NullsOrderDefault]
> }
> )
> ]
diff --git a/tools/Language/SQL/SimpleSQL/QueryExprComponents.lhs b/tools/Language/SQL/SimpleSQL/QueryExprComponents.lhs
index 5c756f4..811eedb 100644
--- a/tools/Language/SQL/SimpleSQL/QueryExprComponents.lhs
+++ b/tools/Language/SQL/SimpleSQL/QueryExprComponents.lhs
@@ -30,7 +30,7 @@ These are a few misc tests which don't fit anywhere else.
> duplicates :: TestItem
> duplicates = Group "duplicates" $ map (uncurry TestQueryExpr)
-> [("select a from t" ,ms All)
+> [("select a from t" ,ms SQDefault)
> ,("select all a from t" ,ms All)
> ,("select distinct a from t", ms Distinct)
> ]
@@ -96,11 +96,11 @@ These are a few misc tests which don't fit anywhere else.
> orderBy :: TestItem
> orderBy = Group "orderBy" $ map (uncurry TestQueryExpr)
> [("select a from t order by a"
-> ,ms [SortSpec (Iden "a") Asc NullsOrderDefault])
+> ,ms [SortSpec (Iden "a") DirDefault NullsOrderDefault])
> ,("select a from t order by a, b"
-> ,ms [SortSpec (Iden "a") Asc NullsOrderDefault
-> ,SortSpec (Iden "b") Asc NullsOrderDefault])
+> ,ms [SortSpec (Iden "a") DirDefault NullsOrderDefault
+> ,SortSpec (Iden "b") DirDefault NullsOrderDefault])
> ,("select a from t order by a asc"
> ,ms [SortSpec (Iden "a") Asc NullsOrderDefault])
@@ -144,10 +144,10 @@ These are a few misc tests which don't fit anywhere else.
> combos :: TestItem
> combos = Group "combos" $ map (uncurry TestQueryExpr)
> [("select a from t union select b from u"
-> ,CombineQueryExpr ms1 Union Distinct Respectively ms2)
+> ,CombineQueryExpr ms1 Union SQDefault Respectively ms2)
> ,("select a from t intersect select b from u"
-> ,CombineQueryExpr ms1 Intersect Distinct Respectively ms2)
+> ,CombineQueryExpr ms1 Intersect SQDefault Respectively ms2)
> ,("select a from t except all select b from u"
> ,CombineQueryExpr ms1 Except All Respectively ms2)
@@ -160,8 +160,8 @@ These are a few misc tests which don't fit anywhere else.
> -- TODO: union should be left associative. I think the others also
> -- so this needs to be fixed (new optionSuffix variation which
> -- handles this)
-> ,CombineQueryExpr ms1 Union Distinct Respectively
-> (CombineQueryExpr ms1 Union Distinct Respectively ms1))
+> ,CombineQueryExpr ms1 Union SQDefault Respectively
+> (CombineQueryExpr ms1 Union SQDefault Respectively ms1))
> ]
> where
> ms1 = makeSelect
diff --git a/tools/Language/SQL/SimpleSQL/SQL2003.lhs b/tools/Language/SQL/SimpleSQL/SQL2003.lhs
index 755194d..8fc670c 100644
--- a/tools/Language/SQL/SimpleSQL/SQL2003.lhs
+++ b/tools/Language/SQL/SimpleSQL/SQL2003.lhs
@@ -1794,7 +1794,7 @@ operator is ||, same as the string concatenation operator.
> ,ArrayCtor (makeSelect
> {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple "t"]
-> ,qeOrderBy = [SortSpec (Iden "a") Asc NullsOrderDefault] }))
+> ,qeOrderBy = [SortSpec (Iden "a") DirDefault NullsOrderDefault] }))
> ]
== 6.37 <multiset value expression> (p286)
@@ -2911,22 +2911,22 @@ TODO: review sort specifications
> sortSpecificationList :: TestItem
> sortSpecificationList = Group "sort specification list" $ map (uncurry TestQueryExpr)
> [("select * from t order by a"
-> ,qe {qeOrderBy = [SortSpec (Iden "a") Asc NullsOrderDefault]})
+> ,qe {qeOrderBy = [SortSpec (Iden "a") DirDefault NullsOrderDefault]})
> ,("select * from t order by a,b"
-> ,qe {qeOrderBy = [SortSpec (Iden "a") Asc NullsOrderDefault
-> ,SortSpec (Iden "b") Asc NullsOrderDefault]})
+> ,qe {qeOrderBy = [SortSpec (Iden "a") DirDefault NullsOrderDefault
+> ,SortSpec (Iden "b") DirDefault NullsOrderDefault]})
> ,("select * from t order by a asc,b"
> ,qe {qeOrderBy = [SortSpec (Iden "a") Asc NullsOrderDefault
-> ,SortSpec (Iden "b") Asc NullsOrderDefault]})
+> ,SortSpec (Iden "b") DirDefault NullsOrderDefault]})
> ,("select * from t order by a desc,b"
> ,qe {qeOrderBy = [SortSpec (Iden "a") Desc NullsOrderDefault
-> ,SortSpec (Iden "b") Asc NullsOrderDefault]})
+> ,SortSpec (Iden "b") DirDefault NullsOrderDefault]})
> ,("select * from t order by a collate x desc,b"
> ,qe {qeOrderBy = [SortSpec (Collate (Iden "a") "x") Desc NullsOrderDefault
-> ,SortSpec (Iden "b") Asc NullsOrderDefault]})
+> ,SortSpec (Iden "b") DirDefault NullsOrderDefault]})
> ,("select * from t order by 1,2"
-> ,qe {qeOrderBy = [SortSpec (NumLit "1") Asc NullsOrderDefault
-> ,SortSpec (NumLit "2") Asc NullsOrderDefault]})
+> ,qe {qeOrderBy = [SortSpec (NumLit "1") DirDefault NullsOrderDefault
+> ,SortSpec (NumLit "2") DirDefault NullsOrderDefault]})
> ]
> where
> qe = makeSelect
diff --git a/tools/Language/SQL/SimpleSQL/ValueExprs.lhs b/tools/Language/SQL/SimpleSQL/ValueExprs.lhs
index 40f3663..e4b1c2b 100644
--- a/tools/Language/SQL/SimpleSQL/ValueExprs.lhs
+++ b/tools/Language/SQL/SimpleSQL/ValueExprs.lhs
@@ -330,14 +330,14 @@ target_string
> [("count(*)",App "count" [Star])
> ,("sum(a order by a)"
-> ,AggregateApp "sum" Nothing [Iden "a"]
-> [SortSpec (Iden "a") Asc NullsOrderDefault])
+> ,AggregateApp "sum" SQDefault [Iden "a"]
+> [SortSpec (Iden "a") DirDefault NullsOrderDefault])
> ,("sum(all a)"
-> ,AggregateApp "sum" (Just All) [Iden "a"] [])
+> ,AggregateApp "sum" All [Iden "a"] [])
> ,("count(distinct a)"
-> ,AggregateApp "count" (Just Distinct) [Iden "a"] [])
+> ,AggregateApp "count" Distinct [Iden "a"] [])
> ]
> windowFunctions :: TestItem
@@ -353,46 +353,46 @@ target_string
> ,("sum(a) over (order by b)"
> ,WindowApp "sum" [Iden "a"] []
-> [SortSpec (Iden "b") Asc NullsOrderDefault] Nothing)
+> [SortSpec (Iden "b") DirDefault NullsOrderDefault] Nothing)
> ,("sum(a) over (order by b desc,c)"
> ,WindowApp "sum" [Iden "a"] []
> [SortSpec (Iden "b") Desc NullsOrderDefault
-> ,SortSpec (Iden "c") Asc NullsOrderDefault] Nothing)
+> ,SortSpec (Iden "c") DirDefault NullsOrderDefault] Nothing)
> ,("sum(a) over (partition by b order by c)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
-> [SortSpec (Iden "c") Asc NullsOrderDefault] Nothing)
+> [SortSpec (Iden "c") DirDefault NullsOrderDefault] Nothing)
> ,("sum(a) over (partition by b order by c range unbounded preceding)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
-> [SortSpec (Iden "c") Asc NullsOrderDefault]
+> [SortSpec (Iden "c") DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRange UnboundedPreceding)
> ,("sum(a) over (partition by b order by c range 5 preceding)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
-> [SortSpec (Iden "c") Asc NullsOrderDefault]
+> [SortSpec (Iden "c") DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRange $ Preceding (NumLit "5"))
> ,("sum(a) over (partition by b order by c range current row)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
-> [SortSpec (Iden "c") Asc NullsOrderDefault]
+> [SortSpec (Iden "c") DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRange Current)
> ,("sum(a) over (partition by b order by c rows 5 following)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
-> [SortSpec (Iden "c") Asc NullsOrderDefault]
+> [SortSpec (Iden "c") DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRows $ Following (NumLit "5"))
> ,("sum(a) over (partition by b order by c range unbounded following)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
-> [SortSpec (Iden "c") Asc NullsOrderDefault]
+> [SortSpec (Iden "c") DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRange UnboundedFollowing)
> ,("sum(a) over (partition by b order by c \n\
> \range between 5 preceding and 5 following)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
-> [SortSpec (Iden "c") Asc NullsOrderDefault]
+> [SortSpec (Iden "c") DirDefault NullsOrderDefault]
> $ Just $ FrameBetween FrameRange
> (Preceding (NumLit "5"))
> (Following (NumLit "5")))