starlitcanopy/simple-sql-parser
1
Fork 0
Code Activity

renames OrderField->SortSpec, InThing->InPredValue

Browse source
This commit is contained in:
Jake Wheat 2013-12-18 16:27:06 +02:00
parent b89f2a011c
commit b631497a04
8 changed files with 40 additions and 40 deletions

2
tools/Language/SQL/SimpleSQL/FullQueries.lhs
View file

@ -33,7 +33,7 @@ Some tests for parsing full queries.
> ,qeGroupBy = [SimpleGroup $ Iden "a"]
> ,qeHaving = Just $ BinOp (App "count" [NumLit "1"])
> ">" (NumLit "5")
> ,qeOrderBy = [OrderField (Iden "s") Asc NullsOrderDefault]
> ,qeOrderBy = [SortSpec (Iden "s") Asc NullsOrderDefault]
> }
> )
> ]

16
tools/Language/SQL/SimpleSQL/QueryExprComponents.lhs
View file

@ -89,22 +89,22 @@ 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 [OrderField (Iden "a") Asc NullsOrderDefault])
> ,ms [SortSpec (Iden "a") Asc NullsOrderDefault])
> ,("select a from t order by a, b"
> ,ms [OrderField (Iden "a") Asc NullsOrderDefault
> ,OrderField (Iden "b") Asc NullsOrderDefault])
> ,ms [SortSpec (Iden "a") Asc NullsOrderDefault
> ,SortSpec (Iden "b") Asc NullsOrderDefault])
> ,("select a from t order by a asc"
> ,ms [OrderField (Iden "a") Asc NullsOrderDefault])
> ,ms [SortSpec (Iden "a") Asc NullsOrderDefault])
> ,("select a from t order by a desc, b desc"
> ,ms [OrderField (Iden "a") Desc NullsOrderDefault
> ,OrderField (Iden "b") Desc NullsOrderDefault])
> ,ms [SortSpec (Iden "a") Desc NullsOrderDefault
> ,SortSpec (Iden "b") Desc NullsOrderDefault])
> ,("select a from t order by a desc nulls first, b desc nulls last"
> ,ms [OrderField (Iden "a") Desc NullsFirst
> ,OrderField (Iden "b") Desc NullsLast])
> ,ms [SortSpec (Iden "a") Desc NullsFirst
> ,SortSpec (Iden "b") Desc NullsLast])
> ]
> where

22
tools/Language/SQL/SimpleSQL/ScalarExprs.lhs
View file

@ -322,7 +322,7 @@ target_string
> ,("sum(a order by a)"
> ,AggregateApp "sum" Nothing [Iden "a"]
> [OrderField (Iden "a") Asc NullsOrderDefault])
> [SortSpec (Iden "a") Asc NullsOrderDefault])
> ,("sum(all a)"
> ,AggregateApp "sum" (Just All) [Iden "a"] [])
@ -344,46 +344,46 @@ target_string
> ,("sum(a) over (order by b)"
> ,WindowApp "sum" [Iden "a"] []
> [OrderField (Iden "b") Asc NullsOrderDefault] Nothing)
> [SortSpec (Iden "b") Asc NullsOrderDefault] Nothing)
> ,("sum(a) over (order by b desc,c)"
> ,WindowApp "sum" [Iden "a"] []
> [OrderField (Iden "b") Desc NullsOrderDefault
> ,OrderField (Iden "c") Asc NullsOrderDefault] Nothing)
> [SortSpec (Iden "b") Desc NullsOrderDefault
> ,SortSpec (Iden "c") Asc NullsOrderDefault] Nothing)
> ,("sum(a) over (partition by b order by c)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
> [OrderField (Iden "c") Asc NullsOrderDefault] Nothing)
> [SortSpec (Iden "c") Asc NullsOrderDefault] Nothing)
> ,("sum(a) over (partition by b order by c range unbounded preceding)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
> [OrderField (Iden "c") Asc NullsOrderDefault]
> [SortSpec (Iden "c") Asc NullsOrderDefault]
> $ Just $ FrameFrom FrameRange UnboundedPreceding)
> ,("sum(a) over (partition by b order by c range 5 preceding)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
> [OrderField (Iden "c") Asc NullsOrderDefault]
> [SortSpec (Iden "c") Asc 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"]
> [OrderField (Iden "c") Asc NullsOrderDefault]
> [SortSpec (Iden "c") Asc NullsOrderDefault]
> $ Just $ FrameFrom FrameRange Current)
> ,("sum(a) over (partition by b order by c rows 5 following)"
> ,WindowApp "sum" [Iden "a"] [Iden "b"]
> [OrderField (Iden "c") Asc NullsOrderDefault]
> [SortSpec (Iden "c") Asc 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"]
> [OrderField (Iden "c") Asc NullsOrderDefault]
> [SortSpec (Iden "c") Asc 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"]
> [OrderField (Iden "c") Asc NullsOrderDefault]
> [SortSpec (Iden "c") Asc NullsOrderDefault]
> $ Just $ FrameBetween FrameRange
> (Preceding (NumLit "5"))
> (Following (NumLit "5")))