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

refactor the identifier syntax

Browse source
This commit is contained in:
Jake Wheat 2016-02-12 14:13:47 +02:00
parent 52f035b718
commit aa5c2e89c7
16 changed files with 830 additions and 826 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Language/SQL/SimpleSQL/Lex.lhs
View file

@ -46,16 +46,11 @@ parsec
> -- > --
> = Symbol String > = Symbol String
> >
> -- | This is an identifier or keyword. > -- | This is an identifier or keyword. The first field is
> -- > -- the quotes used, or nothing if no quotes were used. The quotes
> | Identifier String > -- can be " or u& or something dialect specific like []
> > | Identifier (Maybe (String,String)) String
> -- | This is a quoted identifier, the quotes can be " or u&,
> -- etc. or something dialect specific like []
> -- the first two fields are the start and end quotes
> | QuotedIdentifier String -- start quote
> String -- end quote
> String -- content
> -- | This is a host param symbol, e.g. :param > -- | This is a host param symbol, e.g. :param
> | HostParam String > | HostParam String
> >
@ -88,10 +83,13 @@ parsec
> -- print them, should should get back exactly the same string > -- print them, should should get back exactly the same string
> prettyToken :: Dialect -> Token -> String > prettyToken :: Dialect -> Token -> String
> prettyToken _ (Symbol s) = s > prettyToken _ (Symbol s) = s
> prettyToken _ (Identifier t) = t > prettyToken _ (Identifier Nothing t) = t
> prettyToken _ (QuotedIdentifier q1 q2 t) = > prettyToken _ (Identifier (Just (q1,q2)) t) =
> q1 ++ > q1 ++
> -- todo: a bit hacky, do a better design > -- todo: a bit hacky, do a better design
> -- the dialect will know how to escape and unescape
> -- contents, but the parser here also needs to know
> -- about parsing escaped quotes
> (if '"' `elem` q1 then doubleChars '"' t else t) > (if '"' `elem` q1 then doubleChars '"' t else t)
> ++ q2 > ++ q2
> --prettyToken _ (UQIdentifier t) = > --prettyToken _ (UQIdentifier t) =
@ -179,14 +177,14 @@ u&"unicode quoted identifier"
> identifier :: Dialect -> Parser Token > identifier :: Dialect -> Parser Token
> identifier d = > identifier d =
> choice > choice
> [QuotedIdentifier "\"" "\"" <$> qiden > [Identifier (Just ("\"","\"")) <$> qiden
> -- try is used here to avoid a conflict with identifiers > -- try is used here to avoid a conflict with identifiers
> -- and quoted strings which also start with a 'u' > -- and quoted strings which also start with a 'u'
> ,QuotedIdentifier "u&\"" "\"" <$> (try (string "u&") *> qiden) > ,Identifier (Just ("u&\"","\"")) <$> (try (string "u&") *> qiden)
> ,QuotedIdentifier "U&\"" "\"" <$> (try (string "U&") *> qiden) > ,Identifier (Just ("U&\"","\"")) <$> (try (string "U&") *> qiden)
> ,Identifier <$> identifierString > ,Identifier Nothing <$> identifierString
> -- todo: dialect protection > -- todo: dialect protection
> ,QuotedIdentifier "`" "`" <$> mySqlQIden > ,Identifier (Just ("`","`")) <$> mySqlQIden
> ] > ]
> where > where
> qiden = char '"' *> qidenSuffix "" > qiden = char '"' *> qidenSuffix ""

59
Language/SQL/SimpleSQL/Parse.lhs
View file

@ -330,9 +330,7 @@ u&"example quoted"
> name :: Parser Name > name :: Parser Name
> name = do > name = do
> d <- getState > d <- getState
> choice [Name <$> identifierTok (blacklist d) Nothing > uncurry Name <$> identifierTok (blacklist d)
> ,(\(s,e,t) -> QuotedName s e t) <$> qidentifierTok
> ]
todo: replace (:[]) with a named function all over todo: replace (:[]) with a named function all over
@ -506,7 +504,7 @@ factoring in this function, and it is a little dense.
> -- this parser handles the fixed set of multi word > -- this parser handles the fixed set of multi word
> -- type names, plus all the type names which are > -- type names, plus all the type names which are
> -- reserved words > -- reserved words
> reservedTypeNames = (:[]) . Name . unwords <$> makeKeywordTree > reservedTypeNames = (:[]) . Name Nothing . unwords <$> makeKeywordTree
> ["double precision" > ["double precision"
> ,"character varying" > ,"character varying"
> ,"char varying" > ,"char varying"
@ -598,7 +596,7 @@ value expression parens, row ctor and scalar subquery
> ,ctor <$> commaSep1 valueExpr] > ,ctor <$> commaSep1 valueExpr]
> where > where
> ctor [a] = Parens a > ctor [a] = Parens a
> ctor as = SpecialOp [Name "rowctor"] as > ctor as = SpecialOp [Name Nothing "rowctor"] as
== case, cast, exists, unique, array/multiset constructor, interval == case, cast, exists, unique, array/multiset constructor, interval
@ -643,7 +641,7 @@ subquery expression:
> arrayCtor = keyword_ "array" >> > arrayCtor = keyword_ "array" >>
> choice > choice
> [ArrayCtor <$> parens queryExpr > [ArrayCtor <$> parens queryExpr
> ,Array (Iden [Name "array"]) <$> brackets (commaSep valueExpr)] > ,Array (Iden [Name Nothing "array"]) <$> brackets (commaSep valueExpr)]
As far as I can tell, table(query expr) is just syntax sugar for As far as I can tell, table(query expr) is just syntax sugar for
multiset(query expr). It must be there for compatibility or something. multiset(query expr). It must be there for compatibility or something.
@ -689,7 +687,7 @@ this. also fix the monad -> applicative
> q <- optionMaybe intervalQualifier > q <- optionMaybe intervalQualifier
> mkIt s lit q) > mkIt s lit q)
> where > where
> mkIt Nothing val Nothing = pure $ TypedLit (TypeName [Name "interval"]) val > mkIt Nothing val Nothing = pure $ TypedLit (TypeName [Name Nothing "interval"]) val
> mkIt s val (Just (a,b)) = pure $ IntervalLit s val a b > mkIt s val (Just (a,b)) = pure $ IntervalLit s val a b
> mkIt (Just {}) _val Nothing = fail "cannot use sign without interval qualifier" > mkIt (Just {}) _val Nothing = fail "cannot use sign without interval qualifier"
@ -718,7 +716,7 @@ all the value expressions which start with an identifier
> -- this is a special case because set is a reserved keyword > -- this is a special case because set is a reserved keyword
> -- and the names parser won't parse it > -- and the names parser won't parse it
> multisetSetFunction = > multisetSetFunction =
> App [Name "set"] . (:[]) <$> > App [Name Nothing "set"] . (:[]) <$>
> (try (keyword_ "set" *> openParen) > (try (keyword_ "set" *> openParen)
> *> valueExpr <* closeParen) > *> valueExpr <* closeParen)
@ -750,7 +748,7 @@ operatorname(firstArg keyword0 arg0 keyword1 arg1 etc.)
> -- check we haven't parsed the first > -- check we haven't parsed the first
> -- keyword as an identifier > -- keyword as an identifier
> case (e,kws) of > case (e,kws) of
> (Iden [Name i], (k,_):_) > (Iden [Name Nothing i], (k,_):_)
> | map toLower i == k -> > | map toLower i == k ->
> fail $ "cannot use keyword here: " ++ i > fail $ "cannot use keyword here: " ++ i
> _ -> return () > _ -> return ()
@ -761,7 +759,7 @@ operatorname(firstArg keyword0 arg0 keyword1 arg1 etc.)
> SOKMandatory -> Just <$> pfa > SOKMandatory -> Just <$> pfa
> as <- mapM parseArg kws > as <- mapM parseArg kws
> void closeParen > void closeParen
> pure $ SpecialOpK [Name opName] fa $ catMaybes as > pure $ SpecialOpK [Name Nothing opName] fa $ catMaybes as
> where > where
> parseArg (nm,mand) = > parseArg (nm,mand) =
> let p = keyword_ nm >> valueExpr > let p = keyword_ nm >> valueExpr
@ -833,7 +831,7 @@ in the source
> ,"trailing" <$ keyword_ "trailing" > ,"trailing" <$ keyword_ "trailing"
> ,"both" <$ keyword_ "both"] > ,"both" <$ keyword_ "both"]
> mkTrim fa ch fr = > mkTrim fa ch fr =
> SpecialOpK [Name "trim"] Nothing > SpecialOpK [Name Nothing "trim"] Nothing
> $ catMaybes [Just (fa,StringLit "'" "'" ch) > $ catMaybes [Just (fa,StringLit "'" "'" ch)
> ,Just ("from", fr)] > ,Just ("from", fr)]
@ -959,7 +957,7 @@ and operator. This is the call to valueExprB.
> betweenSuffix :: Parser (ValueExpr -> ValueExpr) > betweenSuffix :: Parser (ValueExpr -> ValueExpr)
> betweenSuffix = > betweenSuffix =
> makeOp <$> Name <$> opName > makeOp <$> Name Nothing <$> opName
> <*> valueExprB > <*> valueExprB
> <*> (keyword_ "and" *> valueExprB) > <*> (keyword_ "and" *> valueExprB)
> where > where
@ -979,7 +977,7 @@ a = any (select * from t)
> q <- parens queryExpr > q <- parens queryExpr
> pure $ \v -> QuantifiedComparison v [c] cq q > pure $ \v -> QuantifiedComparison v [c] cq q
> where > where
> comp = Name <$> choice (map symbol > comp = Name Nothing <$> choice (map symbol
> ["=", "<>", "<=", "<", ">", ">="]) > ["=", "<>", "<=", "<", ">", ">="])
> compQuan = choice > compQuan = choice
> [CPAny <$ keyword_ "any" > [CPAny <$ keyword_ "any"
@ -1009,7 +1007,10 @@ a match (select a from t)
It is going to be really difficult to support an arbitrary character It is going to be really difficult to support an arbitrary character
for the escape now there is a separate lexer ... for the escape now there is a separate lexer ...
> escapeSuffix :: Parser (ValueExpr -> ValueExpr) TODO: this needs fixing. Escape is only part of other nodes, and not a
separate suffix.
> {-escapeSuffix :: Parser (ValueExpr -> ValueExpr)
> escapeSuffix = do > escapeSuffix = do
> ctor <- choice > ctor <- choice
> [Escape <$ keyword_ "escape" > [Escape <$ keyword_ "escape"
@ -1023,6 +1024,7 @@ for the escape now there is a separate lexer ...
> oneOnly c = case c of > oneOnly c = case c of
> [c'] -> return c' > [c'] -> return c'
> _ -> fail "escape char must be single char" > _ -> fail "escape char must be single char"
> -}
=== collate === collate
@ -1060,7 +1062,6 @@ messages, but both of these are too important.
> ,[binarySym "." E.AssocLeft] > ,[binarySym "." E.AssocLeft]
> ,[postfix' arraySuffix > ,[postfix' arraySuffix
> ,postfix' escapeSuffix
> ,postfix' collateSuffix] > ,postfix' collateSuffix]
> ,[prefixSym "+", prefixSym "-"] > ,[prefixSym "+", prefixSym "-"]
@ -1129,14 +1130,14 @@ messages, but both of these are too important.
> binaryKeywords p = > binaryKeywords p =
> E.Infix (do > E.Infix (do
> o <- try p > o <- try p
> pure (\a b -> BinOp a [Name $ unwords o] b)) > pure (\a b -> BinOp a [Name Nothing $ unwords o] b))
> E.AssocNone > E.AssocNone
> postfixKeywords p = > postfixKeywords p =
> postfix' $ do > postfix' $ do
> o <- try p > o <- try p
> pure $ PostfixOp [Name $ unwords o] > pure $ PostfixOp [Name Nothing $ unwords o]
> binary p nm assoc = > binary p nm assoc =
> E.Infix (p >> pure (\a b -> BinOp a [Name nm] b)) assoc > E.Infix (p >> pure (\a b -> BinOp a [Name Nothing nm] b)) assoc
> multisetBinOp = E.Infix (do > multisetBinOp = E.Infix (do
> keyword_ "multiset" > keyword_ "multiset"
> o <- choice [Union <$ keyword_ "union" > o <- choice [Union <$ keyword_ "union"
@ -1147,7 +1148,7 @@ messages, but both of these are too important.
> E.AssocLeft > E.AssocLeft
> prefixKeyword nm = prefix (keyword_ nm) nm > prefixKeyword nm = prefix (keyword_ nm) nm
> prefixSym nm = prefix (symbol_ nm) nm > prefixSym nm = prefix (symbol_ nm) nm
> prefix p nm = prefix' (p >> pure (PrefixOp [Name nm])) > prefix p nm = prefix' (p >> pure (PrefixOp [Name Nothing nm]))
> -- hack from here > -- hack from here
> -- http://stackoverflow.com/questions/10475337/parsec-expr-repeated-prefix-postfix-operator-not-supported > -- http://stackoverflow.com/questions/10475337/parsec-expr-repeated-prefix-postfix-operator-not-supported
> -- not implemented properly yet > -- not implemented properly yet
@ -1996,17 +1997,17 @@ It is only allowed when all the strings are quoted with ' atm.
> (Just s, L.Symbol p) | s == p -> Just p > (Just s, L.Symbol p) | s == p -> Just p
> _ -> Nothing) > _ -> Nothing)
> identifierTok :: [String] -> Maybe String -> Parser String > identifierTok :: [String] -> Parser (Maybe (String,String), String)
> identifierTok blackList kw = mytoken (\tok -> > identifierTok blackList = mytoken (\tok ->
> case (kw,tok) of > case tok of
> (Nothing, L.Identifier p) | map toLower p `notElem` blackList -> Just p > L.Identifier q p | map toLower p `notElem` blackList -> Just (q,p)
> (Just k, L.Identifier p) | k == map toLower p -> Just p
> _ -> Nothing) > _ -> Nothing)
> qidentifierTok :: Parser (String,String,String) > unquotedIdentifierTok :: [String] -> Maybe String -> Parser String
> qidentifierTok = mytoken (\tok -> > unquotedIdentifierTok blackList kw = mytoken (\tok ->
> case tok of > case (kw,tok) of
> L.QuotedIdentifier s e t -> Just (s,e,t) > (Nothing, L.Identifier Nothing p) | map toLower p `notElem` blackList -> Just p
> (Just k, L.Identifier Nothing p) | k == map toLower p -> Just p
> _ -> Nothing) > _ -> Nothing)
> mytoken :: (L.Token -> Maybe a) -> Parser a > mytoken :: (L.Token -> Maybe a) -> Parser a
@ -2052,7 +2053,7 @@ todo: work out the symbol parsing better
= helper functions = helper functions
> keyword :: String -> Parser String > keyword :: String -> Parser String
> keyword k = identifierTok [] (Just k) <?> k > keyword k = unquotedIdentifierTok [] (Just k) <?> k
helper function to improve error messages helper function to improve error messages

23
Language/SQL/SimpleSQL/Pretty.lhs
View file

@ -100,13 +100,13 @@ which have been changed to try to improve the layout of the output.
> fpd (Preceding e) = valueExpr d e <+> text "preceding" > fpd (Preceding e) = valueExpr d e <+> text "preceding"
> fpd (Following e) = valueExpr d e <+> text "following" > fpd (Following e) = valueExpr d e <+> text "following"
> valueExpr dia (SpecialOp nm [a,b,c]) | nm `elem` [[Name "between"] > valueExpr dia (SpecialOp nm [a,b,c]) | nm `elem` [[Name Nothing "between"]
> ,[Name "not between"]] = > ,[Name Nothing "not between"]] =
> sep [valueExpr dia a > sep [valueExpr dia a
> ,names nm <+> valueExpr dia b > ,names nm <+> valueExpr dia b
> ,nest (length (unnames nm) + 1) $ text "and" <+> valueExpr dia c] > ,nest (length (unnames nm) + 1) $ text "and" <+> valueExpr dia c]
> valueExpr d (SpecialOp [Name "rowctor"] as) = > valueExpr d (SpecialOp [Name Nothing "rowctor"] as) =
> parens $ commaSep $ map (valueExpr d) as > parens $ commaSep $ map (valueExpr d) as
> valueExpr d (SpecialOp nm es) = > valueExpr d (SpecialOp nm es) =
@ -119,7 +119,8 @@ which have been changed to try to improve the layout of the output.
> valueExpr d (PrefixOp f e) = names f <+> valueExpr d e > valueExpr d (PrefixOp f e) = names f <+> valueExpr d e
> valueExpr d (PostfixOp f e) = valueExpr d e <+> names f > valueExpr d (PostfixOp f e) = valueExpr d e <+> names f
> valueExpr d e@(BinOp _ op _) | op `elem` [[Name "and"], [Name "or"]] = > valueExpr d e@(BinOp _ op _) | op `elem` [[Name Nothing "and"]
> ,[Name Nothing "or"]] =
> -- special case for and, or, get all the ands so we can vcat them > -- special case for and, or, get all the ands so we can vcat them
> -- nicely > -- nicely
> case ands e of > case ands e of
@ -130,7 +131,7 @@ which have been changed to try to improve the layout of the output.
> ands (BinOp a op' b) | op == op' = ands a ++ ands b > ands (BinOp a op' b) | op == op' = ands a ++ ands b
> ands x = [x] > ands x = [x]
> -- special case for . we don't use whitespace > -- special case for . we don't use whitespace
> valueExpr d (BinOp e0 [Name "."] e1) = > valueExpr d (BinOp e0 [Name Nothing "."] e1) =
> valueExpr d e0 <> text "." <> valueExpr d e1 > valueExpr d e0 <> text "." <> valueExpr d e1
> valueExpr d (BinOp e0 f e1) = > valueExpr d (BinOp e0 f e1) =
> valueExpr d e0 <+> names f <+> valueExpr d e1 > valueExpr d e0 <+> names f <+> valueExpr d e1
@ -211,11 +212,11 @@ which have been changed to try to improve the layout of the output.
> Distinct -> text "distinct" > Distinct -> text "distinct"
> ,valueExpr d b] > ,valueExpr d b]
> valueExpr d (Escape v e) = > {-valueExpr d (Escape v e) =
> valueExpr d v <+> text "escape" <+> text [e] > valueExpr d v <+> text "escape" <+> text [e]
> valueExpr d (UEscape v e) = > valueExpr d (UEscape v e) =
> valueExpr d v <+> text "uescape" <+> text [e] > valueExpr d v <+> text "uescape" <+> text [e]-}
> valueExpr d (Collate v c) = > valueExpr d (Collate v c) =
> valueExpr d v <+> text "collate" <+> names c > valueExpr d v <+> text "collate" <+> names c
@ -239,8 +240,8 @@ which have been changed to try to improve the layout of the output.
> unname :: Name -> String > unname :: Name -> String
> unname (Name n) = n > unname (Name Nothing n) = n
> unname (QuotedName s e n) = > unname (Name (Just (s,e)) n) =
> s ++ (if '"' `elem` s then doubleUpDoubleQuotes n else n) ++ e > s ++ (if '"' `elem` s then doubleUpDoubleQuotes n else n) ++ e
> unnames :: [Name] -> String > unnames :: [Name] -> String
@ -248,8 +249,8 @@ which have been changed to try to improve the layout of the output.
> name :: Name -> Doc > name :: Name -> Doc
> name (Name n) = text n > name (Name Nothing n) = text n
> name (QuotedName s e n) = > name (Name (Just (s,e)) n) =
> text s <> text (if '"' `elem` s then doubleUpDoubleQuotes n else n) <> text e > text s <> text (if '"' `elem` s then doubleUpDoubleQuotes n else n) <> text e
> names :: [Name] -> Doc > names :: [Name] -> Doc

14
Language/SQL/SimpleSQL/Syntax.lhs
View file

@ -206,8 +206,8 @@
todo: special syntax for like, similar with escape - escape cannot go todo: special syntax for like, similar with escape - escape cannot go
in other places in other places
> | Escape ValueExpr Char > -- | Escape ValueExpr Char
> | UEscape ValueExpr Char > -- | UEscape ValueExpr Char
> | Collate ValueExpr [Name] > | Collate ValueExpr [Name]
> | MultisetBinOp ValueExpr CombineOp SetQuantifier ValueExpr > | MultisetBinOp ValueExpr CombineOp SetQuantifier ValueExpr
> | MultisetCtor [ValueExpr] > | MultisetCtor [ValueExpr]
@ -217,9 +217,13 @@ in other places
> deriving (Eq,Show,Read,Data,Typeable) > deriving (Eq,Show,Read,Data,Typeable)
> -- | Represents an identifier name, which can be quoted or unquoted. > -- | Represents an identifier name, which can be quoted or unquoted.
> data Name = Name String > -- examples:
> | QuotedName String String String > --
> -- ^ quoted name, the fields are start quote, end quote and the string itself, these will usually be ", others are possible e.g. `something` is parsed to QuotedName "`" "`" "something, and $a$ test $a$ is parsed to QuotedName "$a$" "$a$" " test " > -- * test -> Name Nothing "test"
> -- * "test" -> Name (Just "\"","\"") "test"
> -- * `something` -> Name (Just ("`","`") "something"
> -- * [ms] -> Name (Just ("[","]") "ms"
> data Name = Name (Maybe (String,String)) String
> deriving (Eq,Show,Read,Data,Typeable) > deriving (Eq,Show,Read,Data,Typeable)
> -- | Represents a type name, used in casts. > -- | Represents a type name, used in casts.

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

@ -11,8 +11,8 @@ Some tests for parsing full queries.
> fullQueriesTests = Group "queries" $ map (uncurry (TestQueryExpr ansi2011)) > fullQueriesTests = Group "queries" $ map (uncurry (TestQueryExpr ansi2011))
> [("select count(*) from t" > [("select count(*) from t"
> ,makeSelect > ,makeSelect
> {qeSelectList = [(App [Name "count"] [Star], Nothing)] > {qeSelectList = [(App [Name Nothing "count"] [Star], Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> } > }
> ) > )
@ -23,17 +23,17 @@ Some tests for parsing full queries.
> \ having count(1) > 5\n\ > \ having count(1) > 5\n\
> \ order by s" > \ order by s"
> ,makeSelect > ,makeSelect
> {qeSelectList = [(Iden [Name "a"], Nothing) > {qeSelectList = [(Iden [Name Nothing "a"], Nothing)
> ,(App [Name "sum"] > ,(App [Name Nothing "sum"]
> [BinOp (Iden [Name "c"]) > [BinOp (Iden [Name Nothing "c"])
> [Name "+"] (Iden [Name "d"])] > [Name Nothing "+"] (Iden [Name Nothing "d"])]
> ,Just $ Name "s")] > ,Just $ Name Nothing "s")]
> ,qeFrom = [TRSimple [Name "t"], TRSimple [Name "u"]] > ,qeFrom = [TRSimple [Name Nothing "t"], TRSimple [Name Nothing "u"]]
> ,qeWhere = Just $ BinOp (Iden [Name "a"]) [Name ">"] (NumLit "5") > ,qeWhere = Just $ BinOp (Iden [Name Nothing "a"]) [Name Nothing ">"] (NumLit "5")
> ,qeGroupBy = [SimpleGroup $ Iden [Name "a"]] > ,qeGroupBy = [SimpleGroup $ Iden [Name Nothing "a"]]
> ,qeHaving = Just $ BinOp (App [Name "count"] [NumLit "1"]) > ,qeHaving = Just $ BinOp (App [Name Nothing "count"] [NumLit "1"])
> [Name ">"] (NumLit "5") > [Name Nothing ">"] (NumLit "5")
> ,qeOrderBy = [SortSpec (Iden [Name "s"]) DirDefault NullsOrderDefault] > ,qeOrderBy = [SortSpec (Iden [Name Nothing "s"]) DirDefault NullsOrderDefault]
> } > }
> ) > )
> ] > ]

28
tools/Language/SQL/SimpleSQL/GroupBy.lhs
View file

@ -17,19 +17,19 @@ Here are the tests for the group by component of query exprs
> simpleGroupBy :: TestItem > simpleGroupBy :: TestItem
> simpleGroupBy = Group "simpleGroupBy" $ map (uncurry (TestQueryExpr ansi2011)) > simpleGroupBy = Group "simpleGroupBy" $ map (uncurry (TestQueryExpr ansi2011))
> [("select a,sum(b) from t group by a" > [("select a,sum(b) from t group by a"
> ,makeSelect {qeSelectList = [(Iden [Name "a"],Nothing) > ,makeSelect {qeSelectList = [(Iden [Name Nothing "a"],Nothing)
> ,(App [Name "sum"] [Iden [Name "b"]],Nothing)] > ,(App [Name Nothing "sum"] [Iden [Name Nothing "b"]],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeGroupBy = [SimpleGroup $ Iden [Name "a"]] > ,qeGroupBy = [SimpleGroup $ Iden [Name Nothing "a"]]
> }) > })
> ,("select a,b,sum(c) from t group by a,b" > ,("select a,b,sum(c) from t group by a,b"
> ,makeSelect {qeSelectList = [(Iden [Name "a"],Nothing) > ,makeSelect {qeSelectList = [(Iden [Name Nothing "a"],Nothing)
> ,(Iden [Name "b"],Nothing) > ,(Iden [Name Nothing "b"],Nothing)
> ,(App [Name "sum"] [Iden [Name "c"]],Nothing)] > ,(App [Name Nothing "sum"] [Iden [Name Nothing "c"]],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeGroupBy = [SimpleGroup $ Iden [Name "a"] > ,qeGroupBy = [SimpleGroup $ Iden [Name Nothing "a"]
> ,SimpleGroup $ Iden [Name "b"]] > ,SimpleGroup $ Iden [Name Nothing "b"]]
> }) > })
> ] > ]
@ -41,15 +41,15 @@ sure which sql version they were introduced, 1999 or 2003 I think).
> [("select * from t group by ()", ms [GroupingParens []]) > [("select * from t group by ()", ms [GroupingParens []])
> ,("select * from t group by grouping sets ((), (a))" > ,("select * from t group by grouping sets ((), (a))"
> ,ms [GroupingSets [GroupingParens [] > ,ms [GroupingSets [GroupingParens []
> ,GroupingParens [SimpleGroup $ Iden [Name "a"]]]]) > ,GroupingParens [SimpleGroup $ Iden [Name Nothing "a"]]]])
> ,("select * from t group by cube(a,b)" > ,("select * from t group by cube(a,b)"
> ,ms [Cube [SimpleGroup $ Iden [Name "a"], SimpleGroup $ Iden [Name "b"]]]) > ,ms [Cube [SimpleGroup $ Iden [Name Nothing "a"], SimpleGroup $ Iden [Name Nothing "b"]]])
> ,("select * from t group by rollup(a,b)" > ,("select * from t group by rollup(a,b)"
> ,ms [Rollup [SimpleGroup $ Iden [Name "a"], SimpleGroup $ Iden [Name "b"]]]) > ,ms [Rollup [SimpleGroup $ Iden [Name Nothing "a"], SimpleGroup $ Iden [Name Nothing "b"]]])
> ] > ]
> where > where
> ms g = makeSelect {qeSelectList = [(Star,Nothing)] > ms g = makeSelect {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeGroupBy = g} > ,qeGroupBy = g}
> randomGroupBy :: TestItem > randomGroupBy :: TestItem

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

@ -17,16 +17,16 @@ Test for the lexer
> ++ map (\s -> (s,[Symbol s])) [">=","<=","!=","<>","||"] > ++ map (\s -> (s,[Symbol s])) [">=","<=","!=","<>","||"]
> ++ (let idens = ["a", "_a", "test", "table", "Stuff", "STUFF"] > ++ (let idens = ["a", "_a", "test", "table", "Stuff", "STUFF"]
> -- simple identifiers > -- simple identifiers
> in map (\i -> (i, [Identifier i])) idens > in map (\i -> (i, [Identifier Nothing i])) idens
> ++ map (\i -> ("\"" ++ i ++ "\"", [QuotedIdentifier "\"" "\"" i])) idens > ++ map (\i -> ("\"" ++ i ++ "\"", [Identifier (Just ("\"","\"")) i])) idens
> -- todo: in order to make lex . pretty id, need to > -- todo: in order to make lex . pretty id, need to
> -- preserve the case of the u > -- preserve the case of the u
> ++ map (\i -> ("u&\"" ++ i ++ "\"", [QuotedIdentifier "u&\"" "\"" i])) idens > ++ map (\i -> ("u&\"" ++ i ++ "\"", [Identifier (Just ("u&\"","\"")) i])) idens
> -- host param > -- host param
> ++ map (\i -> (':':i, [HostParam i])) idens > ++ map (\i -> (':':i, [HostParam i])) idens
> ) > )
> -- quoted identifiers with embedded double quotes > -- quoted identifiers with embedded double quotes
> ++ [("\"normal \"\" iden\"", [QuotedIdentifier "\"" "\"" "normal \" iden"])] > ++ [("\"normal \"\" iden\"", [Identifier (Just ("\"","\"")) "normal \" iden"])]
> -- strings > -- strings
> ++ [("'string'", [SqlString "'" "'" "string"]) > ++ [("'string'", [SqlString "'" "'" "string"])
> ,("'normal '' quote'", [SqlString "'" "'" "normal ' quote"]) > ,("'normal '' quote'", [SqlString "'" "'" "normal ' quote"])
@ -82,7 +82,7 @@ number number (todo: double check more carefully)
> ,Group "adhoc lexer tests" $ > ,Group "adhoc lexer tests" $
> map (uncurry $ LexerTest ansi2011) > map (uncurry $ LexerTest ansi2011)
> [("", []) > [("", [])
> ,("-- line com\nstuff", [LineComment "-- line com\n",Identifier "stuff"]) > ,("-- line com\nstuff", [LineComment "-- line com\n",Identifier Nothing "stuff"])
> ] > ]
> ] > ]
@ -121,11 +121,11 @@ number number (todo: double check more carefully)
> ,(isHostParam, isNumber) > ,(isHostParam, isNumber)
> ,(isMinus, isLineComment) > ,(isMinus, isLineComment)
> ] > ]
> isIdentifier (Identifier _) = True > isIdentifier (Identifier Nothing _) = True
> isIdentifier _ = False > isIdentifier _ = False
> isDQIdentifier (QuotedIdentifier "\"" _ _) = True > isDQIdentifier (Identifier (Just ("\"",_)) _) = True
> isDQIdentifier _ = False > isDQIdentifier _ = False
> isCQIdentifier (QuotedIdentifier (x:_) _ _) | isAlpha x = True > isCQIdentifier (Identifier (Just ((x:_),_)) _) | isAlpha x = True
> isCQIdentifier _ = False > isCQIdentifier _ = False
> isCsString (SqlString (x:_) _ _) | isAlpha x = True > isCsString (SqlString (x:_) _ _) | isAlpha x = True
> isCsString _ = False > isCsString _ = False

4
tools/Language/SQL/SimpleSQL/MySQL.lhs
View file

@ -19,7 +19,7 @@ limit syntax
> backtickQuotes :: TestItem > backtickQuotes :: TestItem
> backtickQuotes = Group "backtickQuotes" (map (uncurry (TestValueExpr mysql)) > backtickQuotes = Group "backtickQuotes" (map (uncurry (TestValueExpr mysql))
> [("`test`", Iden [QuotedName "`" "`" "test"]) > [("`test`", Iden [Name (Just ("`","`")) "test"])
> ] > ]
> ++ [ParseValueExprFails ansi2011 "`test`"] > ++ [ParseValueExprFails ansi2011 "`test`"]
> ) > )
@ -36,5 +36,5 @@ limit syntax
> where > where
> sel = makeSelect > sel = makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> } > }

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

@ -36,8 +36,8 @@ These are a few misc tests which don't fit anywhere else.
> where > where
> ms d = makeSelect > ms d = makeSelect
> {qeSetQuantifier = d > {qeSetQuantifier = d
> ,qeSelectList = [(Iden [Name "a"],Nothing)] > ,qeSelectList = [(Iden [Name Nothing "a"],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]} > ,qeFrom = [TRSimple [Name Nothing "t"]]}
> selectLists :: TestItem > selectLists :: TestItem
> selectLists = Group "selectLists" $ map (uncurry (TestQueryExpr ansi2011)) > selectLists = Group "selectLists" $ map (uncurry (TestQueryExpr ansi2011))
@ -45,29 +45,29 @@ These are a few misc tests which don't fit anywhere else.
> makeSelect {qeSelectList = [(NumLit "1",Nothing)]}) > makeSelect {qeSelectList = [(NumLit "1",Nothing)]})
> ,("select a" > ,("select a"
> ,makeSelect {qeSelectList = [(Iden [Name "a"],Nothing)]}) > ,makeSelect {qeSelectList = [(Iden [Name Nothing "a"],Nothing)]})
> ,("select a,b" > ,("select a,b"
> ,makeSelect {qeSelectList = [(Iden [Name "a"],Nothing) > ,makeSelect {qeSelectList = [(Iden [Name Nothing "a"],Nothing)
> ,(Iden [Name "b"],Nothing)]}) > ,(Iden [Name Nothing "b"],Nothing)]})
> ,("select 1+2,3+4" > ,("select 1+2,3+4"
> ,makeSelect {qeSelectList = > ,makeSelect {qeSelectList =
> [(BinOp (NumLit "1") [Name "+"] (NumLit "2"),Nothing) > [(BinOp (NumLit "1") [Name Nothing "+"] (NumLit "2"),Nothing)
> ,(BinOp (NumLit "3") [Name "+"] (NumLit "4"),Nothing)]}) > ,(BinOp (NumLit "3") [Name Nothing "+"] (NumLit "4"),Nothing)]})
> ,("select a as a, /*comment*/ b as b" > ,("select a as a, /*comment*/ b as b"
> ,makeSelect {qeSelectList = [(Iden [Name "a"], Just $ Name "a") > ,makeSelect {qeSelectList = [(Iden [Name Nothing "a"], Just $ Name Nothing "a")
> ,(Iden [Name "b"], Just $ Name "b")]}) > ,(Iden [Name Nothing "b"], Just $ Name Nothing "b")]})
> ,("select a a, b b" > ,("select a a, b b"
> ,makeSelect {qeSelectList = [(Iden [Name "a"], Just $ Name "a") > ,makeSelect {qeSelectList = [(Iden [Name Nothing "a"], Just $ Name Nothing "a")
> ,(Iden [Name "b"], Just $ Name "b")]}) > ,(Iden [Name Nothing "b"], Just $ Name Nothing "b")]})
> ,("select a + b * c" > ,("select a + b * c"
> ,makeSelect {qeSelectList = > ,makeSelect {qeSelectList =
> [(BinOp (Iden [Name "a"]) [Name "+"] > [(BinOp (Iden [Name Nothing "a"]) [Name Nothing "+"]
> (BinOp (Iden [Name "b"]) [Name "*"] (Iden [Name "c"])) > (BinOp (Iden [Name Nothing "b"]) [Name Nothing "*"] (Iden [Name Nothing "c"]))
> ,Nothing)]}) > ,Nothing)]})
> ] > ]
@ -75,47 +75,47 @@ These are a few misc tests which don't fit anywhere else.
> whereClause :: TestItem > whereClause :: TestItem
> whereClause = Group "whereClause" $ map (uncurry (TestQueryExpr ansi2011)) > whereClause = Group "whereClause" $ map (uncurry (TestQueryExpr ansi2011))
> [("select a from t where a = 5" > [("select a from t where a = 5"
> ,makeSelect {qeSelectList = [(Iden [Name "a"],Nothing)] > ,makeSelect {qeSelectList = [(Iden [Name Nothing "a"],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeWhere = Just $ BinOp (Iden [Name "a"]) [Name "="] (NumLit "5")}) > ,qeWhere = Just $ BinOp (Iden [Name Nothing "a"]) [Name Nothing "="] (NumLit "5")})
> ] > ]
> having :: TestItem > having :: TestItem
> having = Group "having" $ map (uncurry (TestQueryExpr ansi2011)) > having = Group "having" $ map (uncurry (TestQueryExpr ansi2011))
> [("select a,sum(b) from t group by a having sum(b) > 5" > [("select a,sum(b) from t group by a having sum(b) > 5"
> ,makeSelect {qeSelectList = [(Iden [Name "a"],Nothing) > ,makeSelect {qeSelectList = [(Iden [Name Nothing "a"],Nothing)
> ,(App [Name "sum"] [Iden [Name "b"]],Nothing)] > ,(App [Name Nothing "sum"] [Iden [Name Nothing "b"]],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeGroupBy = [SimpleGroup $ Iden [Name "a"]] > ,qeGroupBy = [SimpleGroup $ Iden [Name Nothing "a"]]
> ,qeHaving = Just $ BinOp (App [Name "sum"] [Iden [Name "b"]]) > ,qeHaving = Just $ BinOp (App [Name Nothing "sum"] [Iden [Name Nothing "b"]])
> [Name ">"] (NumLit "5") > [Name Nothing ">"] (NumLit "5")
> }) > })
> ] > ]
> orderBy :: TestItem > orderBy :: TestItem
> orderBy = Group "orderBy" $ map (uncurry (TestQueryExpr ansi2011)) > orderBy = Group "orderBy" $ map (uncurry (TestQueryExpr ansi2011))
> [("select a from t order by a" > [("select a from t order by a"
> ,ms [SortSpec (Iden [Name "a"]) DirDefault NullsOrderDefault]) > ,ms [SortSpec (Iden [Name Nothing "a"]) DirDefault NullsOrderDefault])
> ,("select a from t order by a, b" > ,("select a from t order by a, b"
> ,ms [SortSpec (Iden [Name "a"]) DirDefault NullsOrderDefault > ,ms [SortSpec (Iden [Name Nothing "a"]) DirDefault NullsOrderDefault
> ,SortSpec (Iden [Name "b"]) DirDefault NullsOrderDefault]) > ,SortSpec (Iden [Name Nothing "b"]) DirDefault NullsOrderDefault])
> ,("select a from t order by a asc" > ,("select a from t order by a asc"
> ,ms [SortSpec (Iden [Name "a"]) Asc NullsOrderDefault]) > ,ms [SortSpec (Iden [Name Nothing "a"]) Asc NullsOrderDefault])
> ,("select a from t order by a desc, b desc" > ,("select a from t order by a desc, b desc"
> ,ms [SortSpec (Iden [Name "a"]) Desc NullsOrderDefault > ,ms [SortSpec (Iden [Name Nothing "a"]) Desc NullsOrderDefault
> ,SortSpec (Iden [Name "b"]) Desc NullsOrderDefault]) > ,SortSpec (Iden [Name Nothing "b"]) Desc NullsOrderDefault])
> ,("select a from t order by a desc nulls first, b desc nulls last" > ,("select a from t order by a desc nulls first, b desc nulls last"
> ,ms [SortSpec (Iden [Name "a"]) Desc NullsFirst > ,ms [SortSpec (Iden [Name Nothing "a"]) Desc NullsFirst
> ,SortSpec (Iden [Name "b"]) Desc NullsLast]) > ,SortSpec (Iden [Name Nothing "b"]) Desc NullsLast])
> ] > ]
> where > where
> ms o = makeSelect {qeSelectList = [(Iden [Name "a"],Nothing)] > ms o = makeSelect {qeSelectList = [(Iden [Name Nothing "a"],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeOrderBy = o} > ,qeOrderBy = o}
> offsetFetch :: TestItem > offsetFetch :: TestItem
@ -136,8 +136,8 @@ These are a few misc tests which don't fit anywhere else.
> ] > ]
> where > where
> ms o l = makeSelect > ms o l = makeSelect
> {qeSelectList = [(Iden [Name "a"],Nothing)] > {qeSelectList = [(Iden [Name Nothing "a"],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeOffset = o > ,qeOffset = o
> ,qeFetchFirst = l} > ,qeFetchFirst = l}
@ -165,33 +165,33 @@ These are a few misc tests which don't fit anywhere else.
> ] > ]
> where > where
> ms1 = makeSelect > ms1 = makeSelect
> {qeSelectList = [(Iden [Name "a"],Nothing)] > {qeSelectList = [(Iden [Name Nothing "a"],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]} > ,qeFrom = [TRSimple [Name Nothing "t"]]}
> ms2 = makeSelect > ms2 = makeSelect
> {qeSelectList = [(Iden [Name "b"],Nothing)] > {qeSelectList = [(Iden [Name Nothing "b"],Nothing)]
> ,qeFrom = [TRSimple [Name "u"]]} > ,qeFrom = [TRSimple [Name Nothing "u"]]}
> withQueries :: TestItem > withQueries :: TestItem
> withQueries = Group "with queries" $ map (uncurry (TestQueryExpr ansi2011)) > withQueries = Group "with queries" $ map (uncurry (TestQueryExpr ansi2011))
> [("with u as (select a from t) select a from u" > [("with u as (select a from t) select a from u"
> ,With False [(Alias (Name "u") Nothing, ms1)] ms2) > ,With False [(Alias (Name Nothing "u") Nothing, ms1)] ms2)
> ,("with u(b) as (select a from t) select a from u" > ,("with u(b) as (select a from t) select a from u"
> ,With False [(Alias (Name "u") (Just [Name "b"]), ms1)] ms2) > ,With False [(Alias (Name Nothing "u") (Just [Name Nothing "b"]), ms1)] ms2)
> ,("with x as (select a from t),\n\ > ,("with x as (select a from t),\n\
> \ u as (select a from x)\n\ > \ u as (select a from x)\n\
> \select a from u" > \select a from u"
> ,With False [(Alias (Name "x") Nothing, ms1), (Alias (Name "u") Nothing,ms3)] ms2) > ,With False [(Alias (Name Nothing "x") Nothing, ms1), (Alias (Name Nothing "u") Nothing,ms3)] ms2)
> ,("with recursive u as (select a from t) select a from u" > ,("with recursive u as (select a from t) select a from u"
> ,With True [(Alias (Name "u") Nothing, ms1)] ms2) > ,With True [(Alias (Name Nothing "u") Nothing, ms1)] ms2)
> ] > ]
> where > where
> ms c t = makeSelect > ms c t = makeSelect
> {qeSelectList = [(Iden [Name c],Nothing)] > {qeSelectList = [(Iden [Name Nothing c],Nothing)]
> ,qeFrom = [TRSimple [Name t]]} > ,qeFrom = [TRSimple [Name Nothing t]]}
> ms1 = ms "a" "t" > ms1 = ms "a" "t"
> ms2 = ms "a" "u" > ms2 = ms "a" "u"
> ms3 = ms "a" "x" > ms3 = ms "a" "x"
@ -205,5 +205,5 @@ These are a few misc tests which don't fit anywhere else.
> tables :: TestItem > tables :: TestItem
> tables = Group "tables" $ map (uncurry (TestQueryExpr ansi2011)) > tables = Group "tables" $ map (uncurry (TestQueryExpr ansi2011))
> [("table tbl", Table [Name "tbl"]) > [("table tbl", Table [Name Nothing "tbl"])
> ] > ]

118
tools/Language/SQL/SimpleSQL/SQL2011AccessControl.lhs
View file

@ -76,125 +76,125 @@ grant, etc
> (TestStatement ansi2011 > (TestStatement ansi2011
> "grant all privileges on tbl1 to role1" > "grant all privileges on tbl1 to role1"
> $ GrantPrivilege [PrivAll] > $ GrantPrivilege [PrivAll]
> (PrivTable [Name "tbl1"]) > (PrivTable [Name Nothing "tbl1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant all privileges on tbl1 to role1,role2" > "grant all privileges on tbl1 to role1,role2"
> $ GrantPrivilege [PrivAll] > $ GrantPrivilege [PrivAll]
> (PrivTable [Name "tbl1"]) > (PrivTable [Name Nothing "tbl1"])
> [Name "role1",Name "role2"] WithoutGrantOption) > [Name Nothing "role1",Name Nothing "role2"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant all privileges on tbl1 to role1 with grant option" > "grant all privileges on tbl1 to role1 with grant option"
> $ GrantPrivilege [PrivAll] > $ GrantPrivilege [PrivAll]
> (PrivTable [Name "tbl1"]) > (PrivTable [Name Nothing "tbl1"])
> [Name "role1"] WithGrantOption) > [Name Nothing "role1"] WithGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant all privileges on table tbl1 to role1" > "grant all privileges on table tbl1 to role1"
> $ GrantPrivilege [PrivAll] > $ GrantPrivilege [PrivAll]
> (PrivTable [Name "tbl1"]) > (PrivTable [Name Nothing "tbl1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant all privileges on domain mydom to role1" > "grant all privileges on domain mydom to role1"
> $ GrantPrivilege [PrivAll] > $ GrantPrivilege [PrivAll]
> (PrivDomain [Name "mydom"]) > (PrivDomain [Name Nothing "mydom"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant all privileges on type t1 to role1" > "grant all privileges on type t1 to role1"
> $ GrantPrivilege [PrivAll] > $ GrantPrivilege [PrivAll]
> (PrivType [Name "t1"]) > (PrivType [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant all privileges on sequence s1 to role1" > "grant all privileges on sequence s1 to role1"
> $ GrantPrivilege [PrivAll] > $ GrantPrivilege [PrivAll]
> (PrivSequence [Name "s1"]) > (PrivSequence [Name Nothing "s1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant select on table t1 to role1" > "grant select on table t1 to role1"
> $ GrantPrivilege [PrivSelect []] > $ GrantPrivilege [PrivSelect []]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant select(a,b) on table t1 to role1" > "grant select(a,b) on table t1 to role1"
> $ GrantPrivilege [PrivSelect [Name "a", Name "b"]] > $ GrantPrivilege [PrivSelect [Name Nothing "a", Name Nothing "b"]]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant delete on table t1 to role1" > "grant delete on table t1 to role1"
> $ GrantPrivilege [PrivDelete] > $ GrantPrivilege [PrivDelete]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant insert on table t1 to role1" > "grant insert on table t1 to role1"
> $ GrantPrivilege [PrivInsert []] > $ GrantPrivilege [PrivInsert []]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant insert(a,b) on table t1 to role1" > "grant insert(a,b) on table t1 to role1"
> $ GrantPrivilege [PrivInsert [Name "a", Name "b"]] > $ GrantPrivilege [PrivInsert [Name Nothing "a", Name Nothing "b"]]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant update on table t1 to role1" > "grant update on table t1 to role1"
> $ GrantPrivilege [PrivUpdate []] > $ GrantPrivilege [PrivUpdate []]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant update(a,b) on table t1 to role1" > "grant update(a,b) on table t1 to role1"
> $ GrantPrivilege [PrivUpdate [Name "a", Name "b"]] > $ GrantPrivilege [PrivUpdate [Name Nothing "a", Name Nothing "b"]]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant references on table t1 to role1" > "grant references on table t1 to role1"
> $ GrantPrivilege [PrivReferences []] > $ GrantPrivilege [PrivReferences []]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant references(a,b) on table t1 to role1" > "grant references(a,b) on table t1 to role1"
> $ GrantPrivilege [PrivReferences [Name "a", Name "b"]] > $ GrantPrivilege [PrivReferences [Name Nothing "a", Name Nothing "b"]]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant usage on table t1 to role1" > "grant usage on table t1 to role1"
> $ GrantPrivilege [PrivUsage] > $ GrantPrivilege [PrivUsage]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant trigger on table t1 to role1" > "grant trigger on table t1 to role1"
> $ GrantPrivilege [PrivTrigger] > $ GrantPrivilege [PrivTrigger]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant execute on specific function f to role1" > "grant execute on specific function f to role1"
> $ GrantPrivilege [PrivExecute] > $ GrantPrivilege [PrivExecute]
> (PrivFunction [Name "f"]) > (PrivFunction [Name Nothing "f"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant select,delete on table t1 to role1" > "grant select,delete on table t1 to role1"
> $ GrantPrivilege [PrivSelect [], PrivDelete] > $ GrantPrivilege [PrivSelect [], PrivDelete]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] WithoutGrantOption) > [Name Nothing "role1"] WithoutGrantOption)
skipping for now: skipping for now:
@ -219,7 +219,7 @@ functions, etc., by argument types since they can be overloaded
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create role rolee" > "create role rolee"
> $ CreateRole (Name "rolee")) > $ CreateRole (Name Nothing "rolee"))
12.5 <grant role statement> 12.5 <grant role statement>
@ -235,16 +235,16 @@ functions, etc., by argument types since they can be overloaded
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant role1 to public" > "grant role1 to public"
> $ GrantRole [Name "role1"] [Name "public"] WithoutAdminOption) > $ GrantRole [Name Nothing "role1"] [Name Nothing "public"] WithoutAdminOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant role1,role2 to role3,role4" > "grant role1,role2 to role3,role4"
> $ GrantRole [Name "role1",Name "role2"] > $ GrantRole [Name Nothing "role1",Name Nothing "role2"]
> [Name "role3", Name "role4"] WithoutAdminOption) > [Name Nothing "role3", Name Nothing "role4"] WithoutAdminOption)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "grant role1 to role3 with admin option" > "grant role1 to role3 with admin option"
> $ GrantRole [Name "role1"] [Name "role3"] WithAdminOption) > $ GrantRole [Name Nothing "role1"] [Name Nothing "role3"] WithAdminOption)
12.6 <drop role statement> 12.6 <drop role statement>
@ -254,7 +254,7 @@ functions, etc., by argument types since they can be overloaded
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop role rolee" > "drop role rolee"
> $ DropRole (Name "rolee")) > $ DropRole (Name Nothing "rolee"))
12.7 <revoke statement> 12.7 <revoke statement>
@ -277,14 +277,14 @@ functions, etc., by argument types since they can be overloaded
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "revoke select on t1 from role1" > "revoke select on t1 from role1"
> $ RevokePrivilege NoGrantOptionFor [PrivSelect []] > $ RevokePrivilege NoGrantOptionFor [PrivSelect []]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1"] DefaultDropBehaviour) > [Name Nothing "role1"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "revoke grant option for select on t1 from role1,role2 cascade" > "revoke grant option for select on t1 from role1,role2 cascade"
> $ RevokePrivilege GrantOptionFor [PrivSelect []] > $ RevokePrivilege GrantOptionFor [PrivSelect []]
> (PrivTable [Name "t1"]) > (PrivTable [Name Nothing "t1"])
> [Name "role1",Name "role2"] Cascade) > [Name Nothing "role1",Name Nothing "role2"] Cascade)
<revoke role statement> ::= <revoke role statement> ::=
@ -298,18 +298,18 @@ functions, etc., by argument types since they can be overloaded
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "revoke role1 from role2" > "revoke role1 from role2"
> $ RevokeRole NoAdminOptionFor [Name "role1"] > $ RevokeRole NoAdminOptionFor [Name Nothing "role1"]
> [Name "role2"] DefaultDropBehaviour) > [Name Nothing "role2"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "revoke role1,role2 from role3,role4" > "revoke role1,role2 from role3,role4"
> $ RevokeRole NoAdminOptionFor [Name "role1",Name "role2"] > $ RevokeRole NoAdminOptionFor [Name Nothing "role1",Name Nothing "role2"]
> [Name "role3",Name "role4"] DefaultDropBehaviour) > [Name Nothing "role3",Name Nothing "role4"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "revoke admin option for role1 from role2 cascade" > "revoke admin option for role1 from role2 cascade"
> $ RevokeRole AdminOptionFor [Name "role1"] [Name "role2"] Cascade) > $ RevokeRole AdminOptionFor [Name Nothing "role1"] [Name Nothing "role2"] Cascade)
> ] > ]

6
tools/Language/SQL/SimpleSQL/SQL2011Bits.lhs
View file

@ -79,7 +79,7 @@ BEGIN is not in the standard!
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "savepoint difficult_bit" > "savepoint difficult_bit"
> $ Savepoint $ Name "difficult_bit") > $ Savepoint $ Name Nothing "difficult_bit")
17.6 <release savepoint statement> 17.6 <release savepoint statement>
@ -89,7 +89,7 @@ BEGIN is not in the standard!
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "release savepoint difficult_bit" > "release savepoint difficult_bit"
> $ ReleaseSavepoint $ Name "difficult_bit") > $ ReleaseSavepoint $ Name Nothing "difficult_bit")
17.7 <commit statement> 17.7 <commit statement>
@ -124,7 +124,7 @@ BEGIN is not in the standard!
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "rollback to savepoint difficult_bit" > "rollback to savepoint difficult_bit"
> $ Rollback $ Just $ Name "difficult_bit") > $ Rollback $ Just $ Name Nothing "difficult_bit")
19 Session management 19 Session management

68
tools/Language/SQL/SimpleSQL/SQL2011DataManipulation.lhs
View file

@ -109,19 +109,19 @@ Section 14 in Foundation
[ WHERE <search condition> ] [ WHERE <search condition> ]
> (TestStatement ansi2011 "delete from t" > (TestStatement ansi2011 "delete from t"
> $ Delete [Name "t"] Nothing Nothing) > $ Delete [Name Nothing "t"] Nothing Nothing)
> ,(TestStatement ansi2011 "delete from t as u" > ,(TestStatement ansi2011 "delete from t as u"
> $ Delete [Name "t"] (Just (Name "u")) Nothing) > $ Delete [Name Nothing "t"] (Just (Name Nothing "u")) Nothing)
> ,(TestStatement ansi2011 "delete from t where x = 5" > ,(TestStatement ansi2011 "delete from t where x = 5"
> $ Delete [Name "t"] Nothing > $ Delete [Name Nothing "t"] Nothing
> (Just $ BinOp (Iden [Name "x"]) [Name "="] (NumLit "5"))) > (Just $ BinOp (Iden [Name Nothing "x"]) [Name Nothing "="] (NumLit "5")))
> ,(TestStatement ansi2011 "delete from t as u where u.x = 5" > ,(TestStatement ansi2011 "delete from t as u where u.x = 5"
> $ Delete [Name "t"] (Just (Name "u")) > $ Delete [Name Nothing "t"] (Just (Name Nothing "u"))
> (Just $ BinOp (Iden [Name "u", Name "x"]) [Name "="] (NumLit "5"))) > (Just $ BinOp (Iden [Name Nothing "u", Name Nothing "x"]) [Name Nothing "="] (NumLit "5")))
14.10 <truncate table statement> 14.10 <truncate table statement>
@ -133,13 +133,13 @@ Section 14 in Foundation
| RESTART IDENTITY | RESTART IDENTITY
> ,(TestStatement ansi2011 "truncate table t" > ,(TestStatement ansi2011 "truncate table t"
> $ Truncate [Name "t"] DefaultIdentityRestart) > $ Truncate [Name Nothing "t"] DefaultIdentityRestart)
> ,(TestStatement ansi2011 "truncate table t continue identity" > ,(TestStatement ansi2011 "truncate table t continue identity"
> $ Truncate [Name "t"] ContinueIdentity) > $ Truncate [Name Nothing "t"] ContinueIdentity)
> ,(TestStatement ansi2011 "truncate table t restart identity" > ,(TestStatement ansi2011 "truncate table t restart identity"
> $ Truncate [Name "t"] RestartIdentity) > $ Truncate [Name Nothing "t"] RestartIdentity)
14.11 <insert statement> 14.11 <insert statement>
@ -176,35 +176,35 @@ Section 14 in Foundation
<column name list> <column name list>
> ,(TestStatement ansi2011 "insert into t select * from u" > ,(TestStatement ansi2011 "insert into t select * from u"
> $ Insert [Name "t"] Nothing > $ Insert [Name Nothing "t"] Nothing
> $ InsertQuery makeSelect > $ InsertQuery makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "u"]]}) > ,qeFrom = [TRSimple [Name Nothing "u"]]})
> ,(TestStatement ansi2011 "insert into t(a,b,c) select * from u" > ,(TestStatement ansi2011 "insert into t(a,b,c) select * from u"
> $ Insert [Name "t"] (Just [Name "a", Name "b", Name "c"]) > $ Insert [Name Nothing "t"] (Just [Name Nothing "a", Name Nothing "b", Name Nothing "c"])
> $ InsertQuery makeSelect > $ InsertQuery makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "u"]]}) > ,qeFrom = [TRSimple [Name Nothing "u"]]})
> ,(TestStatement ansi2011 "insert into t default values" > ,(TestStatement ansi2011 "insert into t default values"
> $ Insert [Name "t"] Nothing DefaultInsertValues) > $ Insert [Name Nothing "t"] Nothing DefaultInsertValues)
> ,(TestStatement ansi2011 "insert into t values(1,2)" > ,(TestStatement ansi2011 "insert into t values(1,2)"
> $ Insert [Name "t"] Nothing > $ Insert [Name Nothing "t"] Nothing
> $ InsertQuery $ Values [[NumLit "1", NumLit "2"]]) > $ InsertQuery $ Values [[NumLit "1", NumLit "2"]])
> ,(TestStatement ansi2011 "insert into t values (1,2),(3,4)" > ,(TestStatement ansi2011 "insert into t values (1,2),(3,4)"
> $ Insert [Name "t"] Nothing > $ Insert [Name Nothing "t"] Nothing
> $ InsertQuery $ Values [[NumLit "1", NumLit "2"] > $ InsertQuery $ Values [[NumLit "1", NumLit "2"]
> ,[NumLit "3", NumLit "4"]]) > ,[NumLit "3", NumLit "4"]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "insert into t values (default,null,array[],multiset[])" > "insert into t values (default,null,array[],multiset[])"
> $ Insert [Name "t"] Nothing > $ Insert [Name Nothing "t"] Nothing
> $ InsertQuery $ Values [[Iden [Name "default"] > $ InsertQuery $ Values [[Iden [Name Nothing "default"]
> ,Iden [Name "null"] > ,Iden [Name Nothing "null"]
> ,Array (Iden [Name "array"]) [] > ,Array (Iden [Name Nothing "array"]) []
> ,MultisetCtor []]]) > ,MultisetCtor []]])
@ -448,30 +448,30 @@ FROM CentralOfficeAccounts;
> ,(TestStatement ansi2011 "update t set a=b" > ,(TestStatement ansi2011 "update t set a=b"
> $ Update [Name "t"] Nothing > $ Update [Name Nothing "t"] Nothing
> [Set [Name "a"] (Iden [Name "b"])] Nothing) > [Set [Name Nothing "a"] (Iden [Name Nothing "b"])] Nothing)
> ,(TestStatement ansi2011 "update t set a=b, c=5" > ,(TestStatement ansi2011 "update t set a=b, c=5"
> $ Update [Name "t"] Nothing > $ Update [Name Nothing "t"] Nothing
> [Set [Name "a"] (Iden [Name "b"]) > [Set [Name Nothing "a"] (Iden [Name Nothing "b"])
> ,Set [Name "c"] (NumLit "5")] Nothing) > ,Set [Name Nothing "c"] (NumLit "5")] Nothing)
> ,(TestStatement ansi2011 "update t set a=b where a>5" > ,(TestStatement ansi2011 "update t set a=b where a>5"
> $ Update [Name "t"] Nothing > $ Update [Name Nothing "t"] Nothing
> [Set [Name "a"] (Iden [Name "b"])] > [Set [Name Nothing "a"] (Iden [Name Nothing "b"])]
> $ Just $ BinOp (Iden [Name "a"]) [Name ">"] (NumLit "5")) > $ Just $ BinOp (Iden [Name Nothing "a"]) [Name Nothing ">"] (NumLit "5"))
> ,(TestStatement ansi2011 "update t as u set a=b where u.a>5" > ,(TestStatement ansi2011 "update t as u set a=b where u.a>5"
> $ Update [Name "t"] (Just $ Name "u") > $ Update [Name Nothing "t"] (Just $ Name Nothing "u")
> [Set [Name "a"] (Iden [Name "b"])] > [Set [Name Nothing "a"] (Iden [Name Nothing "b"])]
> $ Just $ BinOp (Iden [Name "u",Name "a"]) > $ Just $ BinOp (Iden [Name Nothing "u",Name Nothing "a"])
> [Name ">"] (NumLit "5")) > [Name Nothing ">"] (NumLit "5"))
> ,(TestStatement ansi2011 "update t set (a,b)=(3,5)" > ,(TestStatement ansi2011 "update t set (a,b)=(3,5)"
> $ Update [Name "t"] Nothing > $ Update [Name Nothing "t"] Nothing
> [SetMultiple [[Name "a"],[Name "b"]] > [SetMultiple [[Name Nothing "a"],[Name Nothing "b"]]
> [NumLit "3", NumLit "5"]] Nothing) > [NumLit "3", NumLit "5"]] Nothing)

484
tools/Language/SQL/SimpleSQL/SQL2011Queries.lhs
View file

@ -523,7 +523,7 @@ ascii characters in strings and identifiers unless the current SQL
character set allows them. character set allows them.
> ,("_francais 'français'" > ,("_francais 'français'"
> ,TypedLit (TypeName [Name "_francais"]) "français") > ,TypedLit (TypeName [Name Nothing "_francais"]) "français")
> ] > ]
<national character string literal> ::= <national character string literal> ::=
@ -551,10 +551,10 @@ character set allows them.
> unicodeCharacterStringLiterals = Group "unicode character string literals" > unicodeCharacterStringLiterals = Group "unicode character string literals"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("U&'something'", StringLit "U&'" "'" "something") > [("U&'something'", StringLit "U&'" "'" "something")
> ,("u&'something' escape =" > {-,("u&'something' escape ="
> ,Escape (StringLit "u&'" "'" "something") '=') > ,Escape (StringLit "u&'" "'" "something") '=')
> ,("u&'something' uescape =" > ,("u&'something' uescape ="
> ,UEscape (StringLit "u&'" "'" "something") '=') > ,UEscape (StringLit "u&'" "'" "something") '=')-}
> ] > ]
TODO: unicode escape TODO: unicode escape
@ -571,7 +571,7 @@ TODO: unicode escape
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [--("B'101010'", CSStringLit "B" "101010") > [--("B'101010'", CSStringLit "B" "101010")
> ("X'7f7f7f'", StringLit "X'" "'" "7f7f7f") > ("X'7f7f7f'", StringLit "X'" "'" "7f7f7f")
> ,("X'7f7f7f' escape z", Escape (StringLit "X'" "'" "7f7f7f") 'z') > --,("X'7f7f7f' escape z", Escape (StringLit "X'" "'" "7f7f7f") 'z')
> ] > ]
<signed numeric literal> ::= [ <sign> ] <unsigned numeric literal> <signed numeric literal> ::= [ <sign> ] <unsigned numeric literal>
@ -610,19 +610,19 @@ TODO: unicode escape
> ,("11.11E+23", NumLit "11.11E+23") > ,("11.11E+23", NumLit "11.11E+23")
> ,("11.11E-23", NumLit "11.11E-23") > ,("11.11E-23", NumLit "11.11E-23")
> ,("+11E23", PrefixOp [Name "+"] $ NumLit "11E23") > ,("+11E23", PrefixOp [Name Nothing "+"] $ NumLit "11E23")
> ,("+11E+23", PrefixOp [Name "+"] $ NumLit "11E+23") > ,("+11E+23", PrefixOp [Name Nothing "+"] $ NumLit "11E+23")
> ,("+11E-23", PrefixOp [Name "+"] $ NumLit "11E-23") > ,("+11E-23", PrefixOp [Name Nothing "+"] $ NumLit "11E-23")
> ,("+11.11E23", PrefixOp [Name "+"] $ NumLit "11.11E23") > ,("+11.11E23", PrefixOp [Name Nothing "+"] $ NumLit "11.11E23")
> ,("+11.11E+23", PrefixOp [Name "+"] $ NumLit "11.11E+23") > ,("+11.11E+23", PrefixOp [Name Nothing "+"] $ NumLit "11.11E+23")
> ,("+11.11E-23", PrefixOp [Name "+"] $ NumLit "11.11E-23") > ,("+11.11E-23", PrefixOp [Name Nothing "+"] $ NumLit "11.11E-23")
> ,("-11E23", PrefixOp [Name "-"] $ NumLit "11E23") > ,("-11E23", PrefixOp [Name Nothing "-"] $ NumLit "11E23")
> ,("-11E+23", PrefixOp [Name "-"] $ NumLit "11E+23") > ,("-11E+23", PrefixOp [Name Nothing "-"] $ NumLit "11E+23")
> ,("-11E-23", PrefixOp [Name "-"] $ NumLit "11E-23") > ,("-11E-23", PrefixOp [Name Nothing "-"] $ NumLit "11E-23")
> ,("-11.11E23", PrefixOp [Name "-"] $ NumLit "11.11E23") > ,("-11.11E23", PrefixOp [Name Nothing "-"] $ NumLit "11.11E23")
> ,("-11.11E+23", PrefixOp [Name "-"] $ NumLit "11.11E+23") > ,("-11.11E+23", PrefixOp [Name Nothing "-"] $ NumLit "11.11E+23")
> ,("-11.11E-23", PrefixOp [Name "-"] $ NumLit "11.11E-23") > ,("-11.11E-23", PrefixOp [Name Nothing "-"] $ NumLit "11.11E-23")
> ,("11.11e23", NumLit "11.11e23") > ,("11.11e23", NumLit "11.11e23")
@ -705,7 +705,7 @@ TODO: unicode escape
> intervalLiterals :: TestItem > intervalLiterals :: TestItem
> intervalLiterals = Group "intervalLiterals literals" > intervalLiterals = Group "intervalLiterals literals"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("interval '1'", TypedLit (TypeName [Name "interval"]) "1") > [("interval '1'", TypedLit (TypeName [Name Nothing "interval"]) "1")
> ,("interval '1' day" > ,("interval '1' day"
> ,IntervalLit Nothing "1" (Itf "day" Nothing) Nothing) > ,IntervalLit Nothing "1" (Itf "day" Nothing) Nothing)
> ,("interval '1' day(3)" > ,("interval '1' day(3)"
@ -728,9 +728,9 @@ TODO: unicode escape
> booleanLiterals :: TestItem > booleanLiterals :: TestItem
> booleanLiterals = Group "boolean literals" > booleanLiterals = Group "boolean literals"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("true", Iden [Name "true"]) > [("true", Iden [Name Nothing "true"])
> ,("false", Iden [Name "false"]) > ,("false", Iden [Name Nothing "false"])
> ,("unknown", Iden [Name "unknown"]) > ,("unknown", Iden [Name Nothing "unknown"])
> ] > ]
== 5.4 Names and identifiers == 5.4 Names and identifiers
@ -748,15 +748,15 @@ Specify names.
> identifiers :: TestItem > identifiers :: TestItem
> identifiers = Group "identifiers" > identifiers = Group "identifiers"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("test",Iden [Name "test"]) > [("test",Iden [Name Nothing "test"])
> ,("_test",Iden [Name "_test"]) > ,("_test",Iden [Name Nothing "_test"])
> ,("t1",Iden [Name "t1"]) > ,("t1",Iden [Name Nothing "t1"])
> ,("a.b",Iden [Name "a", Name "b"]) > ,("a.b",Iden [Name Nothing "a", Name Nothing "b"])
> ,("a.b.c",Iden [Name "a", Name "b", Name "c"]) > ,("a.b.c",Iden [Name Nothing "a", Name Nothing "b", Name Nothing "c"])
> ,("\"quoted iden\"", Iden [QuotedName "\"" "\"" "quoted iden"]) > ,("\"quoted iden\"", Iden [Name (Just ("\"","\"")) "quoted iden"])
> ,("\"quoted \"\" iden\"", Iden [QuotedName "\"" "\"" "quoted \" iden"]) > ,("\"quoted \"\" iden\"", Iden [Name (Just ("\"","\"")) "quoted \" iden"])
> ,("U&\"quoted iden\"", Iden [QuotedName "U&\"" "\"" "quoted iden"]) > ,("U&\"quoted iden\"", Iden [Name (Just ("U&\"","\"")) "quoted iden"])
> ,("U&\"quoted \"\" iden\"", Iden [QuotedName "U&\"" "\"" "quoted \" iden"]) > ,("U&\"quoted \"\" iden\"", Iden [Name (Just ("U&\"","\"")) "quoted \" iden"])
> ] > ]
TODO: more identifiers, e.g. unicode escapes?, mixed quoted/unquoted TODO: more identifiers, e.g. unicode escapes?, mixed quoted/unquoted
@ -1034,7 +1034,7 @@ create a list of type name variations:
> makeMultiset (s,t) = (s ++ " multiset", MultisetTypeName t) > makeMultiset (s,t) = (s ++ " multiset", MultisetTypeName t)
> basicTypes = > basicTypes =
> -- example of every standard type name > -- example of every standard type name
> map (\t -> (t,TypeName [Name t])) > map (\t -> (t,TypeName [Name Nothing t]))
> ["binary" > ["binary"
> ,"binary varying" > ,"binary varying"
> ,"character" > ,"character"
@ -1078,92 +1078,92 @@ create a list of type name variations:
> ++ > ++
> [-- 1 single prec + 1 with multiname > [-- 1 single prec + 1 with multiname
> ("char(5)", PrecTypeName [Name "char"] 5) > ("char(5)", PrecTypeName [Name Nothing "char"] 5)
> ,("char varying(5)", PrecTypeName [Name "char varying"] 5) > ,("char varying(5)", PrecTypeName [Name Nothing "char varying"] 5)
> -- 1 scale > -- 1 scale
> ,("decimal(15,2)", PrecScaleTypeName [Name "decimal"] 15 2) > ,("decimal(15,2)", PrecScaleTypeName [Name Nothing "decimal"] 15 2)
> ,("char(3 octets)" > ,("char(3 octets)"
> ,PrecLengthTypeName [Name "char"] 3 Nothing (Just PrecOctets)) > ,PrecLengthTypeName [Name Nothing "char"] 3 Nothing (Just PrecOctets))
> ,("varchar(50 characters)" > ,("varchar(50 characters)"
> ,PrecLengthTypeName [Name "varchar"] 50 Nothing (Just PrecCharacters)) > ,PrecLengthTypeName [Name Nothing "varchar"] 50 Nothing (Just PrecCharacters))
> -- lob prec + with multiname > -- lob prec + with multiname
> ,("blob(3M)", PrecLengthTypeName [Name "blob"] 3 (Just PrecM) Nothing) > ,("blob(3M)", PrecLengthTypeName [Name Nothing "blob"] 3 (Just PrecM) Nothing)
> ,("blob(3T)", PrecLengthTypeName [Name "blob"] 3 (Just PrecT) Nothing) > ,("blob(3T)", PrecLengthTypeName [Name Nothing "blob"] 3 (Just PrecT) Nothing)
> ,("blob(3P)", PrecLengthTypeName [Name "blob"] 3 (Just PrecP) Nothing) > ,("blob(3P)", PrecLengthTypeName [Name Nothing "blob"] 3 (Just PrecP) Nothing)
> ,("blob(4M characters) " > ,("blob(4M characters) "
> ,PrecLengthTypeName [Name "blob"] 4 (Just PrecM) (Just PrecCharacters)) > ,PrecLengthTypeName [Name Nothing "blob"] 4 (Just PrecM) (Just PrecCharacters))
> ,("blob(6G octets) " > ,("blob(6G octets) "
> ,PrecLengthTypeName [Name "blob"] 6 (Just PrecG) (Just PrecOctets)) > ,PrecLengthTypeName [Name Nothing "blob"] 6 (Just PrecG) (Just PrecOctets))
> ,("national character large object(7K) " > ,("national character large object(7K) "
> ,PrecLengthTypeName [Name "national character large object"] > ,PrecLengthTypeName [Name Nothing "national character large object"]
> 7 (Just PrecK) Nothing) > 7 (Just PrecK) Nothing)
> -- 1 with and without tz > -- 1 with and without tz
> ,("time with time zone" > ,("time with time zone"
> ,TimeTypeName [Name "time"] Nothing True) > ,TimeTypeName [Name Nothing "time"] Nothing True)
> ,("datetime(3) without time zone" > ,("datetime(3) without time zone"
> ,TimeTypeName [Name "datetime"] (Just 3) False) > ,TimeTypeName [Name Nothing "datetime"] (Just 3) False)
> -- chars: (single/multiname) x prec x charset x collate > -- chars: (single/multiname) x prec x charset x collate
> -- 1111 > -- 1111
> ,("char varying(5) character set something collate something_insensitive" > ,("char varying(5) character set something collate something_insensitive"
> ,CharTypeName [Name "char varying"] (Just 5) > ,CharTypeName [Name Nothing "char varying"] (Just 5)
> [Name "something"] [Name "something_insensitive"]) > [Name Nothing "something"] [Name Nothing "something_insensitive"])
> -- 0111 > -- 0111
> ,("char(5) character set something collate something_insensitive" > ,("char(5) character set something collate something_insensitive"
> ,CharTypeName [Name "char"] (Just 5) > ,CharTypeName [Name Nothing "char"] (Just 5)
> [Name "something"] [Name "something_insensitive"]) > [Name Nothing "something"] [Name Nothing "something_insensitive"])
> -- 1011 > -- 1011
> ,("char varying character set something collate something_insensitive" > ,("char varying character set something collate something_insensitive"
> ,CharTypeName [Name "char varying"] Nothing > ,CharTypeName [Name Nothing "char varying"] Nothing
> [Name "something"] [Name "something_insensitive"]) > [Name Nothing "something"] [Name Nothing "something_insensitive"])
> -- 0011 > -- 0011
> ,("char character set something collate something_insensitive" > ,("char character set something collate something_insensitive"
> ,CharTypeName [Name "char"] Nothing > ,CharTypeName [Name Nothing "char"] Nothing
> [Name "something"] [Name "something_insensitive"]) > [Name Nothing "something"] [Name Nothing "something_insensitive"])
> -- 1101 > -- 1101
> ,("char varying(5) collate something_insensitive" > ,("char varying(5) collate something_insensitive"
> ,CharTypeName [Name "char varying"] (Just 5) > ,CharTypeName [Name Nothing "char varying"] (Just 5)
> [] [Name "something_insensitive"]) > [] [Name Nothing "something_insensitive"])
> -- 0101 > -- 0101
> ,("char(5) collate something_insensitive" > ,("char(5) collate something_insensitive"
> ,CharTypeName [Name "char"] (Just 5) > ,CharTypeName [Name Nothing "char"] (Just 5)
> [] [Name "something_insensitive"]) > [] [Name Nothing "something_insensitive"])
> -- 1001 > -- 1001
> ,("char varying collate something_insensitive" > ,("char varying collate something_insensitive"
> ,CharTypeName [Name "char varying"] Nothing > ,CharTypeName [Name Nothing "char varying"] Nothing
> [] [Name "something_insensitive"]) > [] [Name Nothing "something_insensitive"])
> -- 0001 > -- 0001
> ,("char collate something_insensitive" > ,("char collate something_insensitive"
> ,CharTypeName [Name "char"] Nothing > ,CharTypeName [Name Nothing "char"] Nothing
> [] [Name "something_insensitive"]) > [] [Name Nothing "something_insensitive"])
> -- 1110 > -- 1110
> ,("char varying(5) character set something" > ,("char varying(5) character set something"
> ,CharTypeName [Name "char varying"] (Just 5) > ,CharTypeName [Name Nothing "char varying"] (Just 5)
> [Name "something"] []) > [Name Nothing "something"] [])
> -- 0110 > -- 0110
> ,("char(5) character set something" > ,("char(5) character set something"
> ,CharTypeName [Name "char"] (Just 5) > ,CharTypeName [Name Nothing "char"] (Just 5)
> [Name "something"] []) > [Name Nothing "something"] [])
> -- 1010 > -- 1010
> ,("char varying character set something" > ,("char varying character set something"
> ,CharTypeName [Name "char varying"] Nothing > ,CharTypeName [Name Nothing "char varying"] Nothing
> [Name "something"] []) > [Name Nothing "something"] [])
> -- 0010 > -- 0010
> ,("char character set something" > ,("char character set something"
> ,CharTypeName [Name "char"] Nothing > ,CharTypeName [Name Nothing "char"] Nothing
> [Name "something"] []) > [Name Nothing "something"] [])
> -- 1100 > -- 1100
> ,("char varying character set something" > ,("char varying character set something"
> ,CharTypeName [Name "char varying"] Nothing > ,CharTypeName [Name Nothing "char varying"] Nothing
> [Name "something"] []) > [Name Nothing "something"] [])
> -- single row field, two row field > -- single row field, two row field
> ,("row(a int)", RowTypeName [(Name "a", TypeName [Name "int"])]) > ,("row(a int)", RowTypeName [(Name Nothing "a", TypeName [Name Nothing "int"])])
> ,("row(a int,b char)" > ,("row(a int,b char)"
> ,RowTypeName [(Name "a", TypeName [Name "int"]) > ,RowTypeName [(Name Nothing "a", TypeName [Name Nothing "int"])
> ,(Name "b", TypeName [Name "char"])]) > ,(Name Nothing "b", TypeName [Name Nothing "char"])])
> -- interval each type raw > -- interval each type raw
> ,("interval year" > ,("interval year"
> ,IntervalTypeName (Itf "year" Nothing) Nothing) > ,IntervalTypeName (Itf "year" Nothing) Nothing)
@ -1216,8 +1216,8 @@ Define a field of a row type.
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("cast('(1,2)' as row(a int,b char))" > [("cast('(1,2)' as row(a int,b char))"
> ,Cast (StringLit "'" "'" "(1,2)") > ,Cast (StringLit "'" "'" "(1,2)")
> $ RowTypeName [(Name "a", TypeName [Name "int"]) > $ RowTypeName [(Name Nothing "a", TypeName [Name Nothing "int"])
> ,(Name "b", TypeName [Name "char"])])] > ,(Name Nothing "b", TypeName [Name Nothing "char"])])]
== 6.3 <value expression primary> == 6.3 <value expression primary>
@ -1339,7 +1339,7 @@ Specify one or more values, host parameters, SQL parameters, dynamic parameters,
> ,"USER" > ,"USER"
> ,"VALUE"] > ,"VALUE"]
> where > where
> mkIden nm = (nm,Iden [Name nm]) > mkIden nm = (nm,Iden [Name Nothing nm])
TODO: add the missing bits TODO: add the missing bits
@ -1421,10 +1421,10 @@ Specify a value whose data type is to be inferred from its context.
> contextuallyTypedValueSpecification = > contextuallyTypedValueSpecification =
> Group "contextually typed value specification" > Group "contextually typed value specification"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("null", Iden [Name "null"]) > [("null", Iden [Name Nothing "null"])
> ,("array[]", Array (Iden [Name "array"]) []) > ,("array[]", Array (Iden [Name Nothing "array"]) [])
> ,("multiset[]", MultisetCtor []) > ,("multiset[]", MultisetCtor [])
> ,("default", Iden [Name "default"]) > ,("default", Iden [Name Nothing "default"])
> ] > ]
== 6.6 <identifier chain> == 6.6 <identifier chain>
@ -1439,7 +1439,7 @@ Disambiguate a <period>-separated chain of identifiers.
> identifierChain :: TestItem > identifierChain :: TestItem
> identifierChain = Group "identifier chain" > identifierChain = Group "identifier chain"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("a.b", Iden [Name "a",Name "b"])] > [("a.b", Iden [Name Nothing "a",Name Nothing "b"])]
== 6.7 <column reference> == 6.7 <column reference>
@ -1453,7 +1453,7 @@ Reference a column.
> columnReference :: TestItem > columnReference :: TestItem
> columnReference = Group "column reference" > columnReference = Group "column reference"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("module.a.b", Iden [Name "module",Name "a",Name "b"])] > [("module.a.b", Iden [Name Nothing "module",Name Nothing "a",Name Nothing "b"])]
== 6.8 <SQL parameter reference> == 6.8 <SQL parameter reference>
@ -1481,13 +1481,13 @@ Specify a value derived by the application of a function to an argument.
> \FROM Sales.SalesPerson\n\ > \FROM Sales.SalesPerson\n\
> \GROUP BY ROLLUP(SalesQuota);" > \GROUP BY ROLLUP(SalesQuota);"
> ,makeSelect > ,makeSelect
> {qeSelectList = [(Iden [Name "SalesQuota"],Nothing) > {qeSelectList = [(Iden [Name Nothing "SalesQuota"],Nothing)
> ,(App [Name "SUM"] [Iden [Name "SalesYTD"]] > ,(App [Name Nothing "SUM"] [Iden [Name Nothing "SalesYTD"]]
> ,Just (Name "TotalSalesYTD")) > ,Just (Name Nothing "TotalSalesYTD"))
> ,(App [Name "GROUPING"] [Iden [Name "SalesQuota"]] > ,(App [Name Nothing "GROUPING"] [Iden [Name Nothing "SalesQuota"]]
> ,Just (Name "Grouping"))] > ,Just (Name Nothing "Grouping"))]
> ,qeFrom = [TRSimple [Name "Sales",Name "SalesPerson"]] > ,qeFrom = [TRSimple [Name Nothing "Sales",Name Nothing "SalesPerson"]]
> ,qeGroupBy = [Rollup [SimpleGroup (Iden [Name "SalesQuota"])]]}) > ,qeGroupBy = [Rollup [SimpleGroup (Iden [Name Nothing "SalesQuota"])]]})
> ] > ]
== 6.10 <window function> == 6.10 <window function>
@ -1678,7 +1678,7 @@ Specify a data conversion.
> castSpecification = Group "cast specification" > castSpecification = Group "cast specification"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("cast(a as int)" > [("cast(a as int)"
> ,Cast (Iden [Name "a"]) (TypeName [Name "int"])) > ,Cast (Iden [Name Nothing "a"]) (TypeName [Name Nothing "int"]))
> ] > ]
== 6.14 <next value expression> == 6.14 <next value expression>
@ -1691,7 +1691,7 @@ Return the next value of a sequence generator.
> nextValueExpression :: TestItem > nextValueExpression :: TestItem
> nextValueExpression = Group "next value expression" > nextValueExpression = Group "next value expression"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("next value for a.b", NextValueFor [Name "a", Name "b"]) > [("next value for a.b", NextValueFor [Name Nothing "a", Name Nothing "b"])
> ] > ]
== 6.15 <field reference> == 6.15 <field reference>
@ -1705,9 +1705,9 @@ Reference a field of a row value.
> fieldReference = Group "field reference" > fieldReference = Group "field reference"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("f(something).a" > [("f(something).a"
> ,BinOp (App [Name "f"] [Iden [Name "something"]]) > ,BinOp (App [Name Nothing "f"] [Iden [Name Nothing "something"]])
> [Name "."] > [Name Nothing "."]
> (Iden [Name "a"])) > (Iden [Name Nothing "a"]))
> ] > ]
TODO: try all possible value expression syntax variations followed by TODO: try all possible value expression syntax variations followed by
@ -1829,15 +1829,15 @@ Return an element of an array.
> arrayElementReference = Group "array element reference" > arrayElementReference = Group "array element reference"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("something[3]" > [("something[3]"
> ,Array (Iden [Name "something"]) [NumLit "3"]) > ,Array (Iden [Name Nothing "something"]) [NumLit "3"])
> ,("(something(a))[x]" > ,("(something(a))[x]"
> ,Array (Parens (App [Name "something"] [Iden [Name "a"]])) > ,Array (Parens (App [Name Nothing "something"] [Iden [Name Nothing "a"]]))
> [Iden [Name "x"]]) > [Iden [Name Nothing "x"]])
> ,("(something(a))[x][y] " > ,("(something(a))[x][y] "
> ,Array ( > ,Array (
> Array (Parens (App [Name "something"] [Iden [Name "a"]])) > Array (Parens (App [Name Nothing "something"] [Iden [Name Nothing "a"]]))
> [Iden [Name "x"]]) > [Iden [Name Nothing "x"]])
> [Iden [Name "y"]]) > [Iden [Name Nothing "y"]])
> ] > ]
== 6.25 <multiset element reference> == 6.25 <multiset element reference>
@ -1852,7 +1852,7 @@ Return the sole element of a multiset of one element.
> multisetElementReference = Group "multisetElementReference" > multisetElementReference = Group "multisetElementReference"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("element(something)" > [("element(something)"
> ,App [Name "element"] [Iden [Name "something"]]) > ,App [Name Nothing "element"] [Iden [Name Nothing "something"]])
> ] > ]
== 6.26 <value expression> == 6.26 <value expression>
@ -1909,8 +1909,8 @@ Specify a numeric value.
> ,("-a", prefOp "-") > ,("-a", prefOp "-")
> ] > ]
> where > where
> binOp o = BinOp (Iden [Name "a"]) [Name o] (Iden [Name "b"]) > binOp o = BinOp (Iden [Name Nothing "a"]) [Name Nothing o] (Iden [Name Nothing "b"])
> prefOp o = PrefixOp [Name o] (Iden [Name "a"]) > prefOp o = PrefixOp [Name Nothing o] (Iden [Name Nothing "a"])
TODO: precedence and associativity tests (need to review all operators TODO: precedence and associativity tests (need to review all operators
for what precendence and associativity tests to write) for what precendence and associativity tests to write)
@ -2358,21 +2358,21 @@ Specify a boolean value.
> booleanValueExpression :: TestItem > booleanValueExpression :: TestItem
> booleanValueExpression = Group "booleab value expression" > booleanValueExpression = Group "booleab value expression"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("a or b", BinOp a [Name "or"] b) > [("a or b", BinOp a [Name Nothing "or"] b)
> ,("a and b", BinOp a [Name "and"] b) > ,("a and b", BinOp a [Name Nothing "and"] b)
> ,("not a", PrefixOp [Name "not"] a) > ,("not a", PrefixOp [Name Nothing "not"] a)
> ,("a is true", postfixOp "is true") > ,("a is true", postfixOp "is true")
> ,("a is false", postfixOp "is false") > ,("a is false", postfixOp "is false")
> ,("a is unknown", postfixOp "is unknown") > ,("a is unknown", postfixOp "is unknown")
> ,("a is not true", postfixOp "is not true") > ,("a is not true", postfixOp "is not true")
> ,("a is not false", postfixOp "is not false") > ,("a is not false", postfixOp "is not false")
> ,("a is not unknown", postfixOp "is not unknown") > ,("a is not unknown", postfixOp "is not unknown")
> ,("(a or b)", Parens $ BinOp a [Name "or"] b) > ,("(a or b)", Parens $ BinOp a [Name Nothing "or"] b)
> ] > ]
> where > where
> a = Iden [Name "a"] > a = Iden [Name Nothing "a"]
> b = Iden [Name "b"] > b = Iden [Name Nothing "b"]
> postfixOp nm = PostfixOp [Name nm] a > postfixOp nm = PostfixOp [Name Nothing nm] a
TODO: review if more tests are needed. Should at least have TODO: review if more tests are needed. Should at least have
precendence tests for mixed and, or and not without parens. precendence tests for mixed and, or and not without parens.
@ -2434,20 +2434,20 @@ Specify construction of an array.
> arrayValueConstructor = Group "array value constructor" > arrayValueConstructor = Group "array value constructor"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("array[1,2,3]" > [("array[1,2,3]"
> ,Array (Iden [Name "array"]) > ,Array (Iden [Name Nothing "array"])
> [NumLit "1", NumLit "2", NumLit "3"]) > [NumLit "1", NumLit "2", NumLit "3"])
> ,("array[a,b,c]" > ,("array[a,b,c]"
> ,Array (Iden [Name "array"]) > ,Array (Iden [Name Nothing "array"])
> [Iden [Name "a"], Iden [Name "b"], Iden [Name "c"]]) > [Iden [Name Nothing "a"], Iden [Name Nothing "b"], Iden [Name Nothing "c"]])
> ,("array(select * from t)" > ,("array(select * from t)"
> ,ArrayCtor (makeSelect > ,ArrayCtor (makeSelect
> {qeSelectList = [(Star,Nothing)] > {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]})) > ,qeFrom = [TRSimple [Name Nothing "t"]]}))
> ,("array(select * from t order by a)" > ,("array(select * from t order by a)"
> ,ArrayCtor (makeSelect > ,ArrayCtor (makeSelect
> {qeSelectList = [(Star,Nothing)] > {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeOrderBy = [SortSpec (Iden [Name "a"]) > ,qeOrderBy = [SortSpec (Iden [Name Nothing "a"])
> DirDefault NullsOrderDefault]})) > DirDefault NullsOrderDefault]}))
> ] > ]
@ -2472,15 +2472,15 @@ Specify a multiset value.
> multisetValueExpression = Group "multiset value expression" > multisetValueExpression = Group "multiset value expression"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("a multiset union b" > [("a multiset union b"
> ,MultisetBinOp (Iden [Name "a"]) Union SQDefault (Iden [Name "b"])) > ,MultisetBinOp (Iden [Name Nothing "a"]) Union SQDefault (Iden [Name Nothing "b"]))
> ,("a multiset union all b" > ,("a multiset union all b"
> ,MultisetBinOp (Iden [Name "a"]) Union All (Iden [Name "b"])) > ,MultisetBinOp (Iden [Name Nothing "a"]) Union All (Iden [Name Nothing "b"]))
> ,("a multiset union distinct b" > ,("a multiset union distinct b"
> ,MultisetBinOp (Iden [Name "a"]) Union Distinct (Iden [Name "b"])) > ,MultisetBinOp (Iden [Name Nothing "a"]) Union Distinct (Iden [Name Nothing "b"]))
> ,("a multiset except b" > ,("a multiset except b"
> ,MultisetBinOp (Iden [Name "a"]) Except SQDefault (Iden [Name "b"])) > ,MultisetBinOp (Iden [Name Nothing "a"]) Except SQDefault (Iden [Name Nothing "b"]))
> ,("a multiset intersect b" > ,("a multiset intersect b"
> ,MultisetBinOp (Iden [Name "a"]) Intersect SQDefault (Iden [Name "b"])) > ,MultisetBinOp (Iden [Name Nothing "a"]) Intersect SQDefault (Iden [Name Nothing "b"]))
> ] > ]
TODO: check precedence and associativity TODO: check precedence and associativity
@ -2501,7 +2501,7 @@ special case term.
> multisetValueFunction :: TestItem > multisetValueFunction :: TestItem
> multisetValueFunction = Group "multiset value function" > multisetValueFunction = Group "multiset value function"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("set(a)", App [Name "set"] [Iden [Name "a"]]) > [("set(a)", App [Name Nothing "set"] [Iden [Name Nothing "a"]])
> ] > ]
== 6.41 <multiset value constructor> == 6.41 <multiset value constructor>
@ -2529,14 +2529,14 @@ Specify construction of a multiset.
> multisetValueConstructor :: TestItem > multisetValueConstructor :: TestItem
> multisetValueConstructor = Group "multiset value constructor" > multisetValueConstructor = Group "multiset value constructor"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("multiset[a,b,c]", MultisetCtor[Iden [Name "a"] > [("multiset[a,b,c]", MultisetCtor[Iden [Name Nothing "a"]
> ,Iden [Name "b"], Iden [Name "c"]]) > ,Iden [Name Nothing "b"], Iden [Name Nothing "c"]])
> ,("multiset(select * from t)", MultisetQueryCtor qe) > ,("multiset(select * from t)", MultisetQueryCtor qe)
> ,("table(select * from t)", MultisetQueryCtor qe) > ,("table(select * from t)", MultisetQueryCtor qe)
> ] > ]
> where > where
> qe = makeSelect {qeSelectList = [(Star,Nothing)] > qe = makeSelect {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]} > ,qeFrom = [TRSimple [Name Nothing "t"]]}
= 7 Query expressions = 7 Query expressions
@ -2608,9 +2608,9 @@ Specify a value or list of values to be constructed into a row.
> rowValueConstructor = Group "row value constructor" > rowValueConstructor = Group "row value constructor"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("(a,b)" > [("(a,b)"
> ,SpecialOp [Name "rowctor"] [Iden [Name "a"], Iden [Name "b"]]) > ,SpecialOp [Name Nothing "rowctor"] [Iden [Name Nothing "a"], Iden [Name Nothing "b"]])
> ,("row(1)",App [Name "row"] [NumLit "1"]) > ,("row(1)",App [Name Nothing "row"] [NumLit "1"])
> ,("row(1,2)",App [Name "row"] [NumLit "1",NumLit "2"]) > ,("row(1,2)",App [Name Nothing "row"] [NumLit "1",NumLit "2"])
> ] > ]
== 7.2 <row value expression> == 7.2 <row value expression>
@ -2660,12 +2660,12 @@ Specify a set of <row value expression>s to be constructed into a table.
> $ map (uncurry (TestQueryExpr ansi2011)) > $ map (uncurry (TestQueryExpr ansi2011))
> [("values (1,2), (a+b,(select count(*) from t));" > [("values (1,2), (a+b,(select count(*) from t));"
> ,Values [[NumLit "1", NumLit "2"] > ,Values [[NumLit "1", NumLit "2"]
> ,[BinOp (Iden [Name "a"]) [Name "+"] > ,[BinOp (Iden [Name Nothing "a"]) [Name Nothing "+"]
> (Iden [Name "b"]) > (Iden [Name Nothing "b"])
> ,SubQueryExpr SqSq > ,SubQueryExpr SqSq
> (makeSelect > (makeSelect
> {qeSelectList = [(App [Name "count"] [Star],Nothing)] > {qeSelectList = [(App [Name Nothing "count"] [Star],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]})]]) > ,qeFrom = [TRSimple [Name Nothing "t"]]})]])
> ] > ]
== 7.4 <table expression> == 7.4 <table expression>
@ -2696,7 +2696,7 @@ Specify a table derived from one or more tables.
> [("select * from tbl1,tbl2" > [("select * from tbl1,tbl2"
> ,makeSelect > ,makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "tbl1"], TRSimple [Name "tbl2"]] > ,qeFrom = [TRSimple [Name Nothing "tbl1"], TRSimple [Name Nothing "tbl2"]]
> })] > })]
@ -2829,18 +2829,18 @@ TODO: only
> where > where
> sel = makeSelect > sel = makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]} > ,qeFrom = [TRSimple [Name Nothing "t"]]}
> af f s = s {qeFrom = map f (qeFrom s)} > af f s = s {qeFrom = map f (qeFrom s)}
> a s = af (\x -> TRAlias x $ Alias (Name "u") Nothing) s > a s = af (\x -> TRAlias x $ Alias (Name Nothing "u") Nothing) s
> sel1 = makeSelect > sel1 = makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRAlias (TRSimple [Name "t"]) > ,qeFrom = [TRAlias (TRSimple [Name Nothing "t"])
> $ Alias (Name "u") $ Just [Name "a", Name "b"]]} > $ Alias (Name Nothing "u") $ Just [Name Nothing "a", Name Nothing "b"]]}
> jsel = sel {qeFrom = > jsel = sel {qeFrom =
> [TRParens $ TRJoin (TRSimple [Name "a"]) > [TRParens $ TRJoin (TRSimple [Name Nothing "a"])
> False > False
> JInner > JInner
> (TRSimple [Name "b"]) > (TRSimple [Name Nothing "b"])
> Nothing]} > Nothing]}
== 7.7 <joined table> == 7.7 <joined table>
@ -2893,25 +2893,25 @@ Specify a table derived from a Cartesian product, inner join, or outer join.
> ,sel $ TRJoin a False JCross b Nothing) > ,sel $ TRJoin a False JCross b Nothing)
> ,("select * from a join b on true" > ,("select * from a join b on true"
> ,sel $ TRJoin a False JInner b > ,sel $ TRJoin a False JInner b
> (Just $ JoinOn $ Iden [Name "true"])) > (Just $ JoinOn $ Iden [Name Nothing "true"]))
> ,("select * from a join b using (c)" > ,("select * from a join b using (c)"
> ,sel $ TRJoin a False JInner b > ,sel $ TRJoin a False JInner b
> (Just $ JoinUsing [Name "c"])) > (Just $ JoinUsing [Name Nothing "c"]))
> ,("select * from a inner join b on true" > ,("select * from a inner join b on true"
> ,sel $ TRJoin a False JInner b > ,sel $ TRJoin a False JInner b
> (Just $ JoinOn $ Iden [Name "true"])) > (Just $ JoinOn $ Iden [Name Nothing "true"]))
> ,("select * from a left join b on true" > ,("select * from a left join b on true"
> ,sel $ TRJoin a False JLeft b > ,sel $ TRJoin a False JLeft b
> (Just $ JoinOn $ Iden [Name "true"])) > (Just $ JoinOn $ Iden [Name Nothing "true"]))
> ,("select * from a left outer join b on true" > ,("select * from a left outer join b on true"
> ,sel $ TRJoin a False JLeft b > ,sel $ TRJoin a False JLeft b
> (Just $ JoinOn $ Iden [Name "true"])) > (Just $ JoinOn $ Iden [Name Nothing "true"]))
> ,("select * from a right join b on true" > ,("select * from a right join b on true"
> ,sel $ TRJoin a False JRight b > ,sel $ TRJoin a False JRight b
> (Just $ JoinOn $ Iden [Name "true"])) > (Just $ JoinOn $ Iden [Name Nothing "true"]))
> ,("select * from a full join b on true" > ,("select * from a full join b on true"
> ,sel $ TRJoin a False JFull b > ,sel $ TRJoin a False JFull b
> (Just $ JoinOn $ Iden [Name "true"])) > (Just $ JoinOn $ Iden [Name Nothing "true"]))
> ,("select * from a natural join b" > ,("select * from a natural join b"
> ,sel $ TRJoin a True JInner b Nothing) > ,sel $ TRJoin a True JInner b Nothing)
> ,("select * from a natural inner join b" > ,("select * from a natural inner join b"
@ -2929,8 +2929,8 @@ Specify a table derived from a Cartesian product, inner join, or outer join.
> sel t = makeSelect > sel t = makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [t]} > ,qeFrom = [t]}
> a = TRSimple [Name "a"] > a = TRSimple [Name Nothing "a"]
> b = TRSimple [Name "b"] > b = TRSimple [Name Nothing "b"]
TODO: partitioned joins TODO: partitioned joins
@ -2949,8 +2949,8 @@ the result of the preceding <from clause>.
> [("select * from t where a = 5" > [("select * from t where a = 5"
> ,makeSelect > ,makeSelect
> {qeSelectList = [(Star,Nothing)] > {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeWhere = Just $ BinOp (Iden [Name "a"]) [Name "="] (NumLit "5")})] > ,qeWhere = Just $ BinOp (Iden [Name Nothing "a"]) [Name Nothing "="] (NumLit "5")})]
== 7.9 <group by clause> == 7.9 <group by clause>
@ -3007,40 +3007,40 @@ clause> to the result of the previously specified clause.
> groupByClause = Group "group by clause" > groupByClause = Group "group by clause"
> $ map (uncurry (TestQueryExpr ansi2011)) > $ map (uncurry (TestQueryExpr ansi2011))
> [("select a,sum(x) from t group by a" > [("select a,sum(x) from t group by a"
> ,qe [SimpleGroup $ Iden [Name "a"]]) > ,qe [SimpleGroup $ Iden [Name Nothing "a"]])
> ,("select a,sum(x) from t group by a collate c" > ,("select a,sum(x) from t group by a collate c"
> ,qe [SimpleGroup $ Collate (Iden [Name "a"]) [Name "c"]]) > ,qe [SimpleGroup $ Collate (Iden [Name Nothing "a"]) [Name Nothing "c"]])
> ,("select a,b,sum(x) from t group by a,b" > ,("select a,b,sum(x) from t group by a,b"
> ,qex [SimpleGroup $ Iden [Name "a"] > ,qex [SimpleGroup $ Iden [Name Nothing "a"]
> ,SimpleGroup $ Iden [Name "b"]]) > ,SimpleGroup $ Iden [Name Nothing "b"]])
> -- todo: group by set quantifier > -- todo: group by set quantifier
> --,("select a,sum(x) from t group by distinct a" > --,("select a,sum(x) from t group by distinct a"
> --,undefined) > --,undefined)
> --,("select a,sum(x) from t group by all a" > --,("select a,sum(x) from t group by all a"
> -- ,undefined) > -- ,undefined)
> ,("select a,b,sum(x) from t group by rollup(a,b)" > ,("select a,b,sum(x) from t group by rollup(a,b)"
> ,qex [Rollup [SimpleGroup $ Iden [Name "a"] > ,qex [Rollup [SimpleGroup $ Iden [Name Nothing "a"]
> ,SimpleGroup $ Iden [Name "b"]]]) > ,SimpleGroup $ Iden [Name Nothing "b"]]])
> ,("select a,b,sum(x) from t group by cube(a,b)" > ,("select a,b,sum(x) from t group by cube(a,b)"
> ,qex [Cube [SimpleGroup $ Iden [Name "a"] > ,qex [Cube [SimpleGroup $ Iden [Name Nothing "a"]
> ,SimpleGroup $ Iden [Name "b"]]]) > ,SimpleGroup $ Iden [Name Nothing "b"]]])
> ,("select a,b,sum(x) from t group by grouping sets((),(a,b))" > ,("select a,b,sum(x) from t group by grouping sets((),(a,b))"
> ,qex [GroupingSets [GroupingParens [] > ,qex [GroupingSets [GroupingParens []
> ,GroupingParens [SimpleGroup $ Iden [Name "a"] > ,GroupingParens [SimpleGroup $ Iden [Name Nothing "a"]
> ,SimpleGroup $ Iden [Name "b"]]]]) > ,SimpleGroup $ Iden [Name Nothing "b"]]]])
> ,("select sum(x) from t group by ()" > ,("select sum(x) from t group by ()"
> ,let x = qe [GroupingParens []] > ,let x = qe [GroupingParens []]
> in x {qeSelectList = tail $ qeSelectList x}) > in x {qeSelectList = tail $ qeSelectList x})
> ] > ]
> where > where
> qe g = makeSelect > qe g = makeSelect
> {qeSelectList = [(Iden [Name "a"], Nothing) > {qeSelectList = [(Iden [Name Nothing "a"], Nothing)
> ,(App [Name "sum"] [Iden [Name "x"]], Nothing)] > ,(App [Name Nothing "sum"] [Iden [Name Nothing "x"]], Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeGroupBy = g} > ,qeGroupBy = g}
> qex g = let x = qe g > qex g = let x = qe g
> in x {qeSelectList = let [a,b] = qeSelectList x > in x {qeSelectList = let [a,b] = qeSelectList x
> in [a,(Iden [Name "b"],Nothing),b]} > in [a,(Iden [Name Nothing "b"],Nothing),b]}
== 7.10 <having clause> == 7.10 <having clause>
@ -3056,12 +3056,12 @@ not satisfy a <search condition>.
> $ map (uncurry (TestQueryExpr ansi2011)) > $ map (uncurry (TestQueryExpr ansi2011))
> [("select a,sum(x) from t group by a having sum(x) > 1000" > [("select a,sum(x) from t group by a having sum(x) > 1000"
> ,makeSelect > ,makeSelect
> {qeSelectList = [(Iden [Name "a"], Nothing) > {qeSelectList = [(Iden [Name Nothing "a"], Nothing)
> ,(App [Name "sum"] [Iden [Name "x"]], Nothing)] > ,(App [Name Nothing "sum"] [Iden [Name Nothing "x"]], Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeGroupBy = [SimpleGroup $ Iden [Name "a"]] > ,qeGroupBy = [SimpleGroup $ Iden [Name Nothing "a"]]
> ,qeHaving = Just $ BinOp (App [Name "sum"] [Iden [Name "x"]]) > ,qeHaving = Just $ BinOp (App [Name Nothing "sum"] [Iden [Name Nothing "x"]])
> [Name ">"] > [Name Nothing ">"]
> (NumLit "1000")}) > (NumLit "1000")})
> ] > ]
@ -3182,22 +3182,22 @@ Specify a table derived from the result of a <table expression>.
> ,("select distinct a from t",qe {qeSetQuantifier = Distinct}) > ,("select distinct a from t",qe {qeSetQuantifier = Distinct})
> ,("select * from t", qe {qeSelectList = [(Star,Nothing)]}) > ,("select * from t", qe {qeSelectList = [(Star,Nothing)]})
> ,("select a.* from t" > ,("select a.* from t"
> ,qe {qeSelectList = [(BinOp (Iden [Name "a"]) [Name "."] Star > ,qe {qeSelectList = [(BinOp (Iden [Name Nothing "a"]) [Name Nothing "."] Star
> ,Nothing)]}) > ,Nothing)]})
> ,("select a b from t" > ,("select a b from t"
> ,qe {qeSelectList = [(Iden [Name "a"], Just $ Name "b")]}) > ,qe {qeSelectList = [(Iden [Name Nothing "a"], Just $ Name Nothing "b")]})
> ,("select a as b from t" > ,("select a as b from t"
> ,qe {qeSelectList = [(Iden [Name "a"], Just $ Name "b")]}) > ,qe {qeSelectList = [(Iden [Name Nothing "a"], Just $ Name Nothing "b")]})
> ,("select a,b from t" > ,("select a,b from t"
> ,qe {qeSelectList = [(Iden [Name "a"], Nothing) > ,qe {qeSelectList = [(Iden [Name Nothing "a"], Nothing)
> ,(Iden [Name "b"], Nothing)]}) > ,(Iden [Name Nothing "b"], Nothing)]})
> -- todo: all field reference alias > -- todo: all field reference alias
> --,("select * as (a,b) from t",undefined) > --,("select * as (a,b) from t",undefined)
> ] > ]
> where > where
> qe = makeSelect > qe = makeSelect
> {qeSelectList = [(Iden [Name "a"], Nothing)] > {qeSelectList = [(Iden [Name Nothing "a"], Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> } > }
== 7.13 <query expression> == 7.13 <query expression>
@ -3282,7 +3282,7 @@ everywhere
> explicitTableQueryExpression :: TestItem > explicitTableQueryExpression :: TestItem
> explicitTableQueryExpression= Group "explicit table query expression" > explicitTableQueryExpression= Group "explicit table query expression"
> $ map (uncurry (TestQueryExpr ansi2011)) > $ map (uncurry (TestQueryExpr ansi2011))
> [("table t", Table [Name "t"]) > [("table t", Table [Name Nothing "t"])
> ] > ]
@ -3306,7 +3306,7 @@ everywhere
> $ map (uncurry (TestQueryExpr ansi2011)) > $ map (uncurry (TestQueryExpr ansi2011))
> [-- todo: finish tests for order offset and fetch > [-- todo: finish tests for order offset and fetch
> ("select a from t order by a" > ("select a from t order by a"
> ,qe {qeOrderBy = [SortSpec (Iden [Name "a"]) > ,qe {qeOrderBy = [SortSpec (Iden [Name Nothing "a"])
> DirDefault NullsOrderDefault]}) > DirDefault NullsOrderDefault]})
> ,("select a from t offset 5 row" > ,("select a from t offset 5 row"
> ,qe {qeOffset = Just $ NumLit "5"}) > ,qe {qeOffset = Just $ NumLit "5"})
@ -3320,8 +3320,8 @@ everywhere
> ] > ]
> where > where
> qe = makeSelect > qe = makeSelect
> {qeSelectList = [(Iden [Name "a"], Nothing)] > {qeSelectList = [(Iden [Name Nothing "a"], Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> } > }
@ -3463,19 +3463,19 @@ Specify a comparison of two row values.
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> $ map mkOp ["=", "<>", "<", ">", "<=", ">="] > $ map mkOp ["=", "<>", "<", ">", "<=", ">="]
> ++ [("ROW(a) = ROW(b)" > ++ [("ROW(a) = ROW(b)"
> ,BinOp (App [Name "ROW"] [a]) > ,BinOp (App [Name Nothing "ROW"] [a])
> [Name "="] > [Name Nothing "="]
> (App [Name "ROW"] [b])) > (App [Name Nothing "ROW"] [b]))
> ,("(a,b) = (c,d)" > ,("(a,b) = (c,d)"
> ,BinOp (SpecialOp [Name "rowctor"] [a,b]) > ,BinOp (SpecialOp [Name Nothing "rowctor"] [a,b])
> [Name "="] > [Name Nothing "="]
> (SpecialOp [Name "rowctor"] [Iden [Name "c"], Iden [Name "d"]])) > (SpecialOp [Name Nothing "rowctor"] [Iden [Name Nothing "c"], Iden [Name Nothing "d"]]))
> ] > ]
> where > where
> mkOp nm = ("a " ++ nm ++ " b" > mkOp nm = ("a " ++ nm ++ " b"
> ,BinOp a [Name nm] b) > ,BinOp a [Name Nothing nm] b)
> a = Iden [Name "a"] > a = Iden [Name Nothing "a"]
> b = Iden [Name "b"] > b = Iden [Name Nothing "b"]
TODO: what other tests, more complex expressions with comparisons? TODO: what other tests, more complex expressions with comparisons?
@ -3667,20 +3667,20 @@ Specify a quantified comparison.
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("a = any (select * from t)" > [("a = any (select * from t)"
> ,QuantifiedComparison (Iden [Name "a"]) [Name "="] CPAny qe) > ,QuantifiedComparison (Iden [Name Nothing "a"]) [Name Nothing "="] CPAny qe)
> ,("a <= some (select * from t)" > ,("a <= some (select * from t)"
> ,QuantifiedComparison (Iden [Name "a"]) [Name "<="] CPSome qe) > ,QuantifiedComparison (Iden [Name Nothing "a"]) [Name Nothing "<="] CPSome qe)
> ,("a > all (select * from t)" > ,("a > all (select * from t)"
> ,QuantifiedComparison (Iden [Name "a"]) [Name ">"] CPAll qe) > ,QuantifiedComparison (Iden [Name Nothing "a"]) [Name Nothing ">"] CPAll qe)
> ,("(a,b) <> all (select * from t)" > ,("(a,b) <> all (select * from t)"
> ,QuantifiedComparison > ,QuantifiedComparison
> (SpecialOp [Name "rowctor"] [Iden [Name "a"] > (SpecialOp [Name Nothing "rowctor"] [Iden [Name Nothing "a"]
> ,Iden [Name "b"]]) [Name "<>"] CPAll qe) > ,Iden [Name Nothing "b"]]) [Name Nothing "<>"] CPAll qe)
> ] > ]
> where > where
> qe = makeSelect > qe = makeSelect
> {qeSelectList = [(Star,Nothing)] > {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]} > ,qeFrom = [TRSimple [Name Nothing "t"]]}
== 8.10 <exists predicate> == 8.10 <exists predicate>
@ -3696,8 +3696,8 @@ Specify a test for a non-empty set.
> ,SubQueryExpr SqExists > ,SubQueryExpr SqExists
> $ makeSelect > $ makeSelect
> {qeSelectList = [(Star,Nothing)] > {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeWhere = Just (BinOp (Iden [Name "a"]) [Name "="] (NumLit "4")) > ,qeWhere = Just (BinOp (Iden [Name Nothing "a"]) [Name Nothing "="] (NumLit "4"))
> } > }
> )] > )]
@ -3715,8 +3715,8 @@ Specify a test for the absence of duplicate rows.
> ,SubQueryExpr SqUnique > ,SubQueryExpr SqUnique
> $ makeSelect > $ makeSelect
> {qeSelectList = [(Star,Nothing)] > {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> ,qeWhere = Just (BinOp (Iden [Name "a"]) [Name "="] (NumLit "4")) > ,qeWhere = Just (BinOp (Iden [Name Nothing "a"]) [Name Nothing "="] (NumLit "4"))
> } > }
> )] > )]
@ -3748,20 +3748,20 @@ Specify a test for matching rows.
> matchPredicate = Group "match predicate" > matchPredicate = Group "match predicate"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("a match (select a from t)" > [("a match (select a from t)"
> ,Match (Iden [Name "a"]) False qe) > ,Match (Iden [Name Nothing "a"]) False qe)
> ,("(a,b) match (select a,b from t)" > ,("(a,b) match (select a,b from t)"
> ,Match (SpecialOp [Name "rowctor"] > ,Match (SpecialOp [Name Nothing "rowctor"]
> [Iden [Name "a"], Iden [Name "b"]]) False qea) > [Iden [Name Nothing "a"], Iden [Name Nothing "b"]]) False qea)
> ,("(a,b) match unique (select a,b from t)" > ,("(a,b) match unique (select a,b from t)"
> ,Match (SpecialOp [Name "rowctor"] > ,Match (SpecialOp [Name Nothing "rowctor"]
> [Iden [Name "a"], Iden [Name "b"]]) True qea) > [Iden [Name Nothing "a"], Iden [Name Nothing "b"]]) True qea)
> ] > ]
> where > where
> qe = makeSelect > qe = makeSelect
> {qeSelectList = [(Iden [Name "a"],Nothing)] > {qeSelectList = [(Iden [Name Nothing "a"],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]} > ,qeFrom = [TRSimple [Name Nothing "t"]]}
> qea = qe {qeSelectList = qeSelectList qe > qea = qe {qeSelectList = qeSelectList qe
> ++ [(Iden [Name "b"],Nothing)]} > ++ [(Iden [Name Nothing "b"],Nothing)]}
TODO: simple, partial and full TODO: simple, partial and full
@ -4100,7 +4100,7 @@ Specify a default collation.
> collateClause = Group "collate clause" > collateClause = Group "collate clause"
> $ map (uncurry (TestValueExpr ansi2011)) > $ map (uncurry (TestValueExpr ansi2011))
> [("a collate my_collation" > [("a collate my_collation"
> ,Collate (Iden [Name "a"]) [Name "my_collation"])] > ,Collate (Iden [Name Nothing "a"]) [Name Nothing "my_collation"])]
== 10.8 <constraint name definition> and <constraint characteristics> == 10.8 <constraint name definition> and <constraint characteristics>
@ -4210,25 +4210,25 @@ Specify a value computed from a collection of rows.
> aggregateFunction :: TestItem > aggregateFunction :: TestItem
> aggregateFunction = Group "aggregate function" > aggregateFunction = Group "aggregate function"
> $ map (uncurry (TestValueExpr ansi2011)) $ > $ map (uncurry (TestValueExpr ansi2011)) $
> [("count(*)",App [Name "count"] [Star]) > [("count(*)",App [Name Nothing "count"] [Star])
> ,("count(*) filter (where something > 5)" > ,("count(*) filter (where something > 5)"
> ,AggregateApp [Name "count"] SQDefault [Star] [] fil) > ,AggregateApp [Name Nothing "count"] SQDefault [Star] [] fil)
gsf gsf
> ,("count(a)",App [Name "count"] [Iden [Name "a"]]) > ,("count(a)",App [Name Nothing "count"] [Iden [Name Nothing "a"]])
> ,("count(distinct a)" > ,("count(distinct a)"
> ,AggregateApp [Name "count"] > ,AggregateApp [Name Nothing "count"]
> Distinct > Distinct
> [Iden [Name "a"]] [] Nothing) > [Iden [Name Nothing "a"]] [] Nothing)
> ,("count(all a)" > ,("count(all a)"
> ,AggregateApp [Name "count"] > ,AggregateApp [Name Nothing "count"]
> All > All
> [Iden [Name "a"]] [] Nothing) > [Iden [Name Nothing "a"]] [] Nothing)
> ,("count(all a) filter (where something > 5)" > ,("count(all a) filter (where something > 5)"
> ,AggregateApp [Name "count"] > ,AggregateApp [Name Nothing "count"]
> All > All
> [Iden [Name "a"]] [] fil) > [Iden [Name Nothing "a"]] [] fil)
> ] ++ concatMap mkSimpleAgg > ] ++ concatMap mkSimpleAgg
> ["avg","max","min","sum" > ["avg","max","min","sum"
> ,"every", "any", "some" > ,"every", "any", "some"
@ -4247,41 +4247,41 @@ osf
> ++ > ++
> [("rank(a,c) within group (order by b)" > [("rank(a,c) within group (order by b)"
> ,AggregateAppGroup [Name "rank"] > ,AggregateAppGroup [Name Nothing "rank"]
> [Iden [Name "a"], Iden [Name "c"]] > [Iden [Name Nothing "a"], Iden [Name Nothing "c"]]
> ob)] > ob)]
> ++ map mkGp ["dense_rank","percent_rank" > ++ map mkGp ["dense_rank","percent_rank"
> ,"cume_dist", "percentile_cont" > ,"cume_dist", "percentile_cont"
> ,"percentile_disc"] > ,"percentile_disc"]
> ++ [("array_agg(a)", App [Name "array_agg"] [Iden [Name "a"]]) > ++ [("array_agg(a)", App [Name Nothing "array_agg"] [Iden [Name Nothing "a"]])
> ,("array_agg(a order by z)" > ,("array_agg(a order by z)"
> ,AggregateApp [Name "array_agg"] > ,AggregateApp [Name Nothing "array_agg"]
> SQDefault > SQDefault
> [Iden [Name "a"]] > [Iden [Name Nothing "a"]]
> [SortSpec (Iden [Name "z"]) > [SortSpec (Iden [Name Nothing "z"])
> DirDefault NullsOrderDefault] > DirDefault NullsOrderDefault]
> Nothing)] > Nothing)]
> where > where
> fil = Just $ BinOp (Iden [Name "something"]) [Name ">"] (NumLit "5") > fil = Just $ BinOp (Iden [Name Nothing "something"]) [Name Nothing ">"] (NumLit "5")
> ob = [SortSpec (Iden [Name "b"]) DirDefault NullsOrderDefault] > ob = [SortSpec (Iden [Name Nothing "b"]) DirDefault NullsOrderDefault]
> mkGp nm = (nm ++ "(a) within group (order by b)" > mkGp nm = (nm ++ "(a) within group (order by b)"
> ,AggregateAppGroup [Name nm] > ,AggregateAppGroup [Name Nothing nm]
> [Iden [Name "a"]] > [Iden [Name Nothing "a"]]
> ob) > ob)
> mkSimpleAgg nm = > mkSimpleAgg nm =
> [(nm ++ "(a)",App [Name nm] [Iden [Name "a"]]) > [(nm ++ "(a)",App [Name Nothing nm] [Iden [Name Nothing "a"]])
> ,(nm ++ "(distinct a)" > ,(nm ++ "(distinct a)"
> ,AggregateApp [Name nm] > ,AggregateApp [Name Nothing nm]
> Distinct > Distinct
> [Iden [Name "a"]] [] Nothing)] > [Iden [Name Nothing "a"]] [] Nothing)]
> mkBsf nm = > mkBsf nm =
> [(nm ++ "(a,b)",App [Name nm] [Iden [Name "a"],Iden [Name "b"]]) > [(nm ++ "(a,b)",App [Name Nothing nm] [Iden [Name Nothing "a"],Iden [Name Nothing "b"]])
> ,(nm ++"(a,b) filter (where something > 5)" > ,(nm ++"(a,b) filter (where something > 5)"
> ,AggregateApp [Name nm] > ,AggregateApp [Name Nothing nm]
> SQDefault > SQDefault
> [Iden [Name "a"],Iden [Name "b"]] [] fil)] > [Iden [Name Nothing "a"],Iden [Name Nothing "b"]] [] fil)]
== 10.10 <sort specification list> == 10.10 <sort specification list>
@ -4306,28 +4306,28 @@ Specify a sort order.
> sortSpecificationList = Group "sort specification list" > sortSpecificationList = Group "sort specification list"
> $ map (uncurry (TestQueryExpr ansi2011)) > $ map (uncurry (TestQueryExpr ansi2011))
> [("select * from t order by a" > [("select * from t order by a"
> ,qe {qeOrderBy = [SortSpec (Iden [Name "a"]) > ,qe {qeOrderBy = [SortSpec (Iden [Name Nothing "a"])
> DirDefault NullsOrderDefault]}) > DirDefault NullsOrderDefault]})
> ,("select * from t order by a,b" > ,("select * from t order by a,b"
> ,qe {qeOrderBy = [SortSpec (Iden [Name "a"]) > ,qe {qeOrderBy = [SortSpec (Iden [Name Nothing "a"])
> DirDefault NullsOrderDefault > DirDefault NullsOrderDefault
> ,SortSpec (Iden [Name "b"]) > ,SortSpec (Iden [Name Nothing "b"])
> DirDefault NullsOrderDefault]}) > DirDefault NullsOrderDefault]})
> ,("select * from t order by a asc,b" > ,("select * from t order by a asc,b"
> ,qe {qeOrderBy = [SortSpec (Iden [Name "a"]) > ,qe {qeOrderBy = [SortSpec (Iden [Name Nothing "a"])
> Asc NullsOrderDefault > Asc NullsOrderDefault
> ,SortSpec (Iden [Name "b"]) > ,SortSpec (Iden [Name Nothing "b"])
> DirDefault NullsOrderDefault]}) > DirDefault NullsOrderDefault]})
> ,("select * from t order by a desc,b" > ,("select * from t order by a desc,b"
> ,qe {qeOrderBy = [SortSpec (Iden [Name "a"]) > ,qe {qeOrderBy = [SortSpec (Iden [Name Nothing "a"])
> Desc NullsOrderDefault > Desc NullsOrderDefault
> ,SortSpec (Iden [Name "b"]) > ,SortSpec (Iden [Name Nothing "b"])
> DirDefault NullsOrderDefault]}) > DirDefault NullsOrderDefault]})
> ,("select * from t order by a collate x desc,b" > ,("select * from t order by a collate x desc,b"
> ,qe {qeOrderBy = [SortSpec > ,qe {qeOrderBy = [SortSpec
> (Collate (Iden [Name "a"]) [Name "x"]) > (Collate (Iden [Name Nothing "a"]) [Name Nothing "x"])
> Desc NullsOrderDefault > Desc NullsOrderDefault
> ,SortSpec (Iden [Name "b"]) > ,SortSpec (Iden [Name Nothing "b"])
> DirDefault NullsOrderDefault]}) > DirDefault NullsOrderDefault]})
> ,("select * from t order by 1,2" > ,("select * from t order by 1,2"
> ,qe {qeOrderBy = [SortSpec (NumLit "1") > ,qe {qeOrderBy = [SortSpec (NumLit "1")
@ -4338,4 +4338,4 @@ Specify a sort order.
> where > where
> qe = makeSelect > qe = makeSelect
> {qeSelectList = [(Star,Nothing)] > {qeSelectList = [(Star,Nothing)]
> ,qeFrom = [TRSimple [Name "t"]]} > ,qeFrom = [TRSimple [Name Nothing "t"]]}

366
tools/Language/SQL/SimpleSQL/SQL2011Schema.lhs
View file

@ -21,7 +21,7 @@ This module covers the tests for parsing schema and DDL statements.
[ <schema element>... ] [ <schema element>... ]
> (TestStatement ansi2011 "create schema my_schema" > (TestStatement ansi2011 "create schema my_schema"
> $ CreateSchema [Name "my_schema"]) > $ CreateSchema [Name Nothing "my_schema"])
todo: schema name can have . todo: schema name can have .
schema name can be quoted iden or unicode quoted iden schema name can be quoted iden or unicode quoted iden
@ -80,11 +80,11 @@ add schema element support:
> ,(TestStatement ansi2011 "drop schema my_schema" > ,(TestStatement ansi2011 "drop schema my_schema"
> $ DropSchema [Name "my_schema"] DefaultDropBehaviour) > $ DropSchema [Name Nothing "my_schema"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 "drop schema my_schema cascade" > ,(TestStatement ansi2011 "drop schema my_schema cascade"
> $ DropSchema [Name "my_schema"] Cascade) > $ DropSchema [Name Nothing "my_schema"] Cascade)
> ,(TestStatement ansi2011 "drop schema my_schema restrict" > ,(TestStatement ansi2011 "drop schema my_schema restrict"
> $ DropSchema [Name "my_schema"] Restrict) > $ DropSchema [Name Nothing "my_schema"] Restrict)
11.3 <table definition> 11.3 <table definition>
@ -95,9 +95,9 @@ add schema element support:
[ ON COMMIT <table commit action> ROWS ] [ ON COMMIT <table commit action> ROWS ]
> ,(TestStatement ansi2011 "create table t (a int, b int);" > ,(TestStatement ansi2011 "create table t (a int, b int);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableColumnDef $ ColumnDef (Name "b") (TypeName [Name "int"]) Nothing []]) > ,TableColumnDef $ ColumnDef (Name Nothing "b") (TypeName [Name Nothing "int"]) Nothing []])
<table contents source> ::= <table contents source> ::=
@ -312,26 +312,26 @@ todo: constraint characteristics
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int not null);" > "create table t (a int not null);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing ColNotNullConstraint]]) > [ColConstraintDef Nothing ColNotNullConstraint]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int constraint a_not_null not null);" > "create table t (a int constraint a_not_null not null);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef (Just [Name "a_not_null"]) ColNotNullConstraint]]) > [ColConstraintDef (Just [Name Nothing "a_not_null"]) ColNotNullConstraint]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int unique);" > "create table t (a int unique);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing ColUniqueConstraint]]) > [ColConstraintDef Nothing ColUniqueConstraint]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int primary key);" > "create table t (a int primary key);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing ColPrimaryKeyConstraint]]) > [ColConstraintDef Nothing ColPrimaryKeyConstraint]])
references t(a,b) references t(a,b)
@ -341,99 +341,99 @@ references t(a,b)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u);" > "create table t (a int references u);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing DefaultReferenceMatch > [Name Nothing "u"] Nothing DefaultReferenceMatch
> DefaultReferentialAction DefaultReferentialAction]]) > DefaultReferentialAction DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u(a));" > "create table t (a int references u(a));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] (Just $ Name "a") DefaultReferenceMatch > [Name Nothing "u"] (Just $ Name Nothing "a") DefaultReferenceMatch
> DefaultReferentialAction DefaultReferentialAction]]) > DefaultReferentialAction DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u match full);" > "create table t (a int references u match full);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing MatchFull > [Name Nothing "u"] Nothing MatchFull
> DefaultReferentialAction DefaultReferentialAction]]) > DefaultReferentialAction DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u match partial);" > "create table t (a int references u match partial);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing MatchPartial > [Name Nothing "u"] Nothing MatchPartial
> DefaultReferentialAction DefaultReferentialAction]]) > DefaultReferentialAction DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u match simple);" > "create table t (a int references u match simple);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing MatchSimple > [Name Nothing "u"] Nothing MatchSimple
> DefaultReferentialAction DefaultReferentialAction]]) > DefaultReferentialAction DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u on update cascade );" > "create table t (a int references u on update cascade );"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing DefaultReferenceMatch > [Name Nothing "u"] Nothing DefaultReferenceMatch
> RefCascade DefaultReferentialAction]]) > RefCascade DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u on update set null );" > "create table t (a int references u on update set null );"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing DefaultReferenceMatch > [Name Nothing "u"] Nothing DefaultReferenceMatch
> RefSetNull DefaultReferentialAction]]) > RefSetNull DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u on update set default );" > "create table t (a int references u on update set default );"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing DefaultReferenceMatch > [Name Nothing "u"] Nothing DefaultReferenceMatch
> RefSetDefault DefaultReferentialAction]]) > RefSetDefault DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u on update no action );" > "create table t (a int references u on update no action );"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing DefaultReferenceMatch > [Name Nothing "u"] Nothing DefaultReferenceMatch
> RefNoAction DefaultReferentialAction]]) > RefNoAction DefaultReferentialAction]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u on delete cascade );" > "create table t (a int references u on delete cascade );"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing DefaultReferenceMatch > [Name Nothing "u"] Nothing DefaultReferenceMatch
> DefaultReferentialAction RefCascade]]) > DefaultReferentialAction RefCascade]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u on update cascade on delete restrict );" > "create table t (a int references u on update cascade on delete restrict );"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing DefaultReferenceMatch > [Name Nothing "u"] Nothing DefaultReferenceMatch
> RefCascade RefRestrict]]) > RefCascade RefRestrict]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int references u on delete restrict on update cascade );" > "create table t (a int references u on delete restrict on update cascade );"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing $ ColReferencesConstraint > [ColConstraintDef Nothing $ ColReferencesConstraint
> [Name "u"] Nothing DefaultReferenceMatch > [Name Nothing "u"] Nothing DefaultReferenceMatch
> RefCascade RefRestrict]]) > RefCascade RefRestrict]])
TODO: try combinations and permutations of column constraints and TODO: try combinations and permutations of column constraints and
@ -442,10 +442,10 @@ options
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int check (a>5));" > "create table t (a int check (a>5));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing
> [ColConstraintDef Nothing > [ColConstraintDef Nothing
> (ColCheckConstraint $ BinOp (Iden [Name "a"]) [Name ">"] (NumLit "5"))]]) > (ColCheckConstraint $ BinOp (Iden [Name Nothing "a"]) [Name Nothing ">"] (NumLit "5"))]])
@ -456,21 +456,21 @@ options
[ <left paren> <common sequence generator options> <right paren> ] [ <left paren> <common sequence generator options> <right paren> ]
> ,(TestStatement ansi2011 "create table t (a int generated always as identity);" > ,(TestStatement ansi2011 "create table t (a int generated always as identity);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"])
> (Just $ IdentityColumnSpec GeneratedAlways []) []]) > (Just $ IdentityColumnSpec GeneratedAlways []) []])
> ,(TestStatement ansi2011 "create table t (a int generated by default as identity);" > ,(TestStatement ansi2011 "create table t (a int generated by default as identity);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"])
> (Just $ IdentityColumnSpec GeneratedByDefault []) []]) > (Just $ IdentityColumnSpec GeneratedByDefault []) []])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int generated always as identity\n\ > "create table t (a int generated always as identity\n\
> \ ( start with 5 increment by 5 maxvalue 500 minvalue 5 cycle ));" > \ ( start with 5 increment by 5 maxvalue 500 minvalue 5 cycle ));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"])
> (Just $ IdentityColumnSpec GeneratedAlways > (Just $ IdentityColumnSpec GeneratedAlways
> [SGOStartWith 5 > [SGOStartWith 5
> ,SGOIncrementBy 5 > ,SGOIncrementBy 5
@ -481,8 +481,8 @@ options
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int generated always as identity\n\ > "create table t (a int generated always as identity\n\
> \ ( start with -4 no maxvalue no minvalue no cycle ));" > \ ( start with -4 no maxvalue no minvalue no cycle ));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"])
> (Just $ IdentityColumnSpec GeneratedAlways > (Just $ IdentityColumnSpec GeneratedAlways
> [SGOStartWith (-4) > [SGOStartWith (-4)
> ,SGONoMaxValue > ,SGONoMaxValue
@ -509,11 +509,11 @@ generated always (valueexpr)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int, \n\ > "create table t (a int, \n\
> \ a2 int generated always as (a * 2));" > \ a2 int generated always as (a * 2));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableColumnDef $ ColumnDef (Name "a2") (TypeName [Name "int"]) > ,TableColumnDef $ ColumnDef (Name Nothing "a2") (TypeName [Name Nothing "int"])
> (Just $ GenerationClause > (Just $ GenerationClause
> (BinOp (Iden [Name "a"]) [Name "*"] (NumLit "2"))) []]) > (BinOp (Iden [Name Nothing "a"]) [Name Nothing "*"] (NumLit "2"))) []])
@ -537,8 +537,8 @@ generated always (valueexpr)
> ,(TestStatement ansi2011 "create table t (a int default 0);" > ,(TestStatement ansi2011 "create table t (a int default 0);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"])
> (Just $ DefaultClause $ NumLit "0") []]) > (Just $ DefaultClause $ NumLit "0") []])
@ -570,37 +570,37 @@ generated always (valueexpr)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int, unique (a));" > "create table t (a int, unique (a));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableConstraintDef Nothing $ TableUniqueConstraint [Name "a"] > ,TableConstraintDef Nothing $ TableUniqueConstraint [Name Nothing "a"]
> ]) > ])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int, constraint a_unique unique (a));" > "create table t (a int, constraint a_unique unique (a));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableConstraintDef (Just [Name "a_unique"]) $ > ,TableConstraintDef (Just [Name Nothing "a_unique"]) $
> TableUniqueConstraint [Name "a"] > TableUniqueConstraint [Name Nothing "a"]
> ]) > ])
todo: test permutations of column defs and table constraints todo: test permutations of column defs and table constraints
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int, b int, unique (a,b));" > "create table t (a int, b int, unique (a,b));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableColumnDef $ ColumnDef (Name "b") (TypeName [Name "int"]) Nothing [] > ,TableColumnDef $ ColumnDef (Name Nothing "b") (TypeName [Name Nothing "int"]) Nothing []
> ,TableConstraintDef Nothing $ > ,TableConstraintDef Nothing $
> TableUniqueConstraint [Name "a", Name "b"] > TableUniqueConstraint [Name Nothing "a", Name Nothing "b"]
> ]) > ])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int, b int, primary key (a,b));" > "create table t (a int, b int, primary key (a,b));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableColumnDef $ ColumnDef (Name "b") (TypeName [Name "int"]) Nothing [] > ,TableColumnDef $ ColumnDef (Name Nothing "b") (TypeName [Name Nothing "int"]) Nothing []
> ,TableConstraintDef Nothing $ > ,TableConstraintDef Nothing $
> TablePrimaryKeyConstraint [Name "a", Name "b"] > TablePrimaryKeyConstraint [Name Nothing "a", Name Nothing "b"]
> ]) > ])
@ -621,26 +621,26 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int, b int,\n\ > "create table t (a int, b int,\n\
> \ foreign key (a,b) references u(c,d) match full on update cascade on delete restrict );" > \ foreign key (a,b) references u(c,d) match full on update cascade on delete restrict );"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableColumnDef $ ColumnDef (Name "b") (TypeName [Name "int"]) Nothing [] > ,TableColumnDef $ ColumnDef (Name Nothing "b") (TypeName [Name Nothing "int"]) Nothing []
> ,TableConstraintDef Nothing $ > ,TableConstraintDef Nothing $
> TableReferencesConstraint > TableReferencesConstraint
> [Name "a", Name "b"] > [Name Nothing "a", Name Nothing "b"]
> [Name "u"] > [Name Nothing "u"]
> (Just [Name "c", Name "d"]) > (Just [Name Nothing "c", Name Nothing "d"])
> MatchFull RefCascade RefRestrict > MatchFull RefCascade RefRestrict
> ]) > ])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int,\n\ > "create table t (a int,\n\
> \ constraint tfku1 foreign key (a) references u);" > \ constraint tfku1 foreign key (a) references u);"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableConstraintDef (Just [Name "tfku1"]) $ > ,TableConstraintDef (Just [Name Nothing "tfku1"]) $
> TableReferencesConstraint > TableReferencesConstraint
> [Name "a"] > [Name Nothing "a"]
> [Name "u"] > [Name Nothing "u"]
> Nothing DefaultReferenceMatch > Nothing DefaultReferenceMatch
> DefaultReferentialAction DefaultReferentialAction > DefaultReferentialAction DefaultReferentialAction
> ]) > ])
@ -703,24 +703,24 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int, b int, \n\ > "create table t (a int, b int, \n\
> \ check (a > b));" > \ check (a > b));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableColumnDef $ ColumnDef (Name "b") (TypeName [Name "int"]) Nothing [] > ,TableColumnDef $ ColumnDef (Name Nothing "b") (TypeName [Name Nothing "int"]) Nothing []
> ,TableConstraintDef Nothing $ > ,TableConstraintDef Nothing $
> TableCheckConstraint > TableCheckConstraint
> (BinOp (Iden [Name "a"]) [Name ">"] (Iden [Name "b"])) > (BinOp (Iden [Name Nothing "a"]) [Name Nothing ">"] (Iden [Name Nothing "b"]))
> ]) > ])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create table t (a int, b int, \n\ > "create table t (a int, b int, \n\
> \ constraint agtb check (a > b));" > \ constraint agtb check (a > b));"
> $ CreateTable [Name "t"] > $ CreateTable [Name Nothing "t"]
> [TableColumnDef $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > [TableColumnDef $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ,TableColumnDef $ ColumnDef (Name "b") (TypeName [Name "int"]) Nothing [] > ,TableColumnDef $ ColumnDef (Name Nothing "b") (TypeName [Name Nothing "int"]) Nothing []
> ,TableConstraintDef (Just [Name "agtb"]) $ > ,TableConstraintDef (Just [Name Nothing "agtb"]) $
> TableCheckConstraint > TableCheckConstraint
> (BinOp (Iden [Name "a"]) [Name ">"] (Iden [Name "b"])) > (BinOp (Iden [Name Nothing "a"]) [Name Nothing ">"] (Iden [Name Nothing "b"]))
> ]) > ])
@ -755,8 +755,8 @@ alter table t add a int unique not null check (a>0)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t add column a int" > "alter table t add column a int"
> $ AlterTable [Name "t"] $ AddColumnDef > $ AlterTable [Name Nothing "t"] $ AddColumnDef
> $ ColumnDef (Name "a") (TypeName [Name "int"]) Nothing [] > $ ColumnDef (Name Nothing "a") (TypeName [Name Nothing "int"]) Nothing []
> ) > )
todo: more add column todo: more add column
@ -787,7 +787,7 @@ todo: more add column
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t alter column c set default 0" > "alter table t alter column c set default 0"
> $ AlterTable [Name "t"] $ AlterColumnSetDefault (Name "c") > $ AlterTable [Name Nothing "t"] $ AlterColumnSetDefault (Name Nothing "c")
> $ NumLit "0") > $ NumLit "0")
11.14 <drop column default clause> 11.14 <drop column default clause>
@ -797,7 +797,7 @@ todo: more add column
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t alter column c drop default" > "alter table t alter column c drop default"
> $ AlterTable [Name "t"] $ AlterColumnDropDefault (Name "c")) > $ AlterTable [Name Nothing "t"] $ AlterColumnDropDefault (Name Nothing "c"))
11.15 <set column not null clause> 11.15 <set column not null clause>
@ -807,7 +807,7 @@ todo: more add column
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t alter column c set not null" > "alter table t alter column c set not null"
> $ AlterTable [Name "t"] $ AlterColumnSetNotNull (Name "c")) > $ AlterTable [Name Nothing "t"] $ AlterColumnSetNotNull (Name Nothing "c"))
11.16 <drop column not null clause> 11.16 <drop column not null clause>
@ -816,7 +816,7 @@ todo: more add column
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t alter column c drop not null" > "alter table t alter column c drop not null"
> $ AlterTable [Name "t"] $ AlterColumnDropNotNull (Name "c")) > $ AlterTable [Name Nothing "t"] $ AlterColumnDropNotNull (Name Nothing "c"))
11.17 <add column scope clause> 11.17 <add column scope clause>
@ -835,8 +835,8 @@ todo: more add column
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t alter column c set data type int;" > "alter table t alter column c set data type int;"
> $ AlterTable [Name "t"] $ > $ AlterTable [Name Nothing "t"] $
> AlterColumnSetDataType (Name "c") (TypeName [Name "int"])) > AlterColumnSetDataType (Name Nothing "c") (TypeName [Name Nothing "int"]))
@ -934,18 +934,18 @@ included in the generated plan above
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t drop column c" > "alter table t drop column c"
> $ AlterTable [Name "t"] $ > $ AlterTable [Name Nothing "t"] $
> DropColumn (Name "c") DefaultDropBehaviour) > DropColumn (Name Nothing "c") DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t drop c cascade" > "alter table t drop c cascade"
> $ AlterTable [Name "t"] $ > $ AlterTable [Name Nothing "t"] $
> DropColumn (Name "c") Cascade) > DropColumn (Name Nothing "c") Cascade)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t drop c restrict" > "alter table t drop c restrict"
> $ AlterTable [Name "t"] $ > $ AlterTable [Name Nothing "t"] $
> DropColumn (Name "c") Restrict) > DropColumn (Name Nothing "c") Restrict)
@ -956,15 +956,15 @@ included in the generated plan above
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t add constraint c unique (a,b)" > "alter table t add constraint c unique (a,b)"
> $ AlterTable [Name "t"] $ > $ AlterTable [Name Nothing "t"] $
> AddTableConstraintDef (Just [Name "c"]) > AddTableConstraintDef (Just [Name Nothing "c"])
> $ TableUniqueConstraint [Name "a", Name "b"]) > $ TableUniqueConstraint [Name Nothing "a", Name Nothing "b"])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t add unique (a,b)" > "alter table t add unique (a,b)"
> $ AlterTable [Name "t"] $ > $ AlterTable [Name Nothing "t"] $
> AddTableConstraintDef Nothing > AddTableConstraintDef Nothing
> $ TableUniqueConstraint [Name "a", Name "b"]) > $ TableUniqueConstraint [Name Nothing "a", Name Nothing "b"])
11.25 <alter table constraint definition> 11.25 <alter table constraint definition>
@ -980,13 +980,13 @@ todo
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t drop constraint c" > "alter table t drop constraint c"
> $ AlterTable [Name "t"] $ > $ AlterTable [Name Nothing "t"] $
> DropTableConstraintDef [Name "c"] DefaultDropBehaviour) > DropTableConstraintDef [Name Nothing "c"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter table t drop constraint c restrict" > "alter table t drop constraint c restrict"
> $ AlterTable [Name "t"] $ > $ AlterTable [Name Nothing "t"] $
> DropTableConstraintDef [Name "c"] Restrict) > DropTableConstraintDef [Name Nothing "c"] Restrict)
11.27 <add table period definition> 11.27 <add table period definition>
@ -1038,11 +1038,11 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop table t" > "drop table t"
> $ DropTable [Name "t"] DefaultDropBehaviour) > $ DropTable [Name Nothing "t"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop table t restrict" > "drop table t restrict"
> $ DropTable [Name "t"] Restrict) > $ DropTable [Name Nothing "t"] Restrict)
11.32 <view definition> 11.32 <view definition>
@ -1084,48 +1084,48 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create view v as select * from t" > "create view v as select * from t"
> $ CreateView False [Name "v"] Nothing (makeSelect > $ CreateView False [Name Nothing "v"] Nothing (makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> }) Nothing) > }) Nothing)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create recursive view v as select * from t" > "create recursive view v as select * from t"
> $ CreateView True [Name "v"] Nothing (makeSelect > $ CreateView True [Name Nothing "v"] Nothing (makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> }) Nothing) > }) Nothing)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create view v(a,b) as select * from t" > "create view v(a,b) as select * from t"
> $ CreateView False [Name "v"] (Just [Name "a", Name "b"]) > $ CreateView False [Name Nothing "v"] (Just [Name Nothing "a", Name Nothing "b"])
> (makeSelect > (makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> }) Nothing) > }) Nothing)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create view v as select * from t with check option" > "create view v as select * from t with check option"
> $ CreateView False [Name "v"] Nothing (makeSelect > $ CreateView False [Name Nothing "v"] Nothing (makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> }) (Just DefaultCheckOption)) > }) (Just DefaultCheckOption))
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create view v as select * from t with cascaded check option" > "create view v as select * from t with cascaded check option"
> $ CreateView False [Name "v"] Nothing (makeSelect > $ CreateView False [Name Nothing "v"] Nothing (makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> }) (Just CascadedCheckOption)) > }) (Just CascadedCheckOption))
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create view v as select * from t with local check option" > "create view v as select * from t with local check option"
> $ CreateView False [Name "v"] Nothing > $ CreateView False [Name Nothing "v"] Nothing
> (makeSelect > (makeSelect
> {qeSelectList = [(Star, Nothing)] > {qeSelectList = [(Star, Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> }) (Just LocalCheckOption)) > }) (Just LocalCheckOption))
@ -1137,11 +1137,11 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop view v" > "drop view v"
> $ DropView [Name "v"] DefaultDropBehaviour) > $ DropView [Name Nothing "v"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop view v cascade" > "drop view v cascade"
> $ DropView [Name "v"] Cascade) > $ DropView [Name Nothing "v"] Cascade)
11.34 <domain definition> 11.34 <domain definition>
@ -1158,35 +1158,35 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create domain my_int int" > "create domain my_int int"
> $ CreateDomain [Name "my_int"] > $ CreateDomain [Name Nothing "my_int"]
> (TypeName [Name "int"]) > (TypeName [Name Nothing "int"])
> Nothing []) > Nothing [])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create domain my_int as int" > "create domain my_int as int"
> $ CreateDomain [Name "my_int"] > $ CreateDomain [Name Nothing "my_int"]
> (TypeName [Name "int"]) > (TypeName [Name Nothing "int"])
> Nothing []) > Nothing [])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create domain my_int int default 0" > "create domain my_int int default 0"
> $ CreateDomain [Name "my_int"] > $ CreateDomain [Name Nothing "my_int"]
> (TypeName [Name "int"]) > (TypeName [Name Nothing "int"])
> (Just (NumLit "0")) []) > (Just (NumLit "0")) [])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create domain my_int int check (value > 5)" > "create domain my_int int check (value > 5)"
> $ CreateDomain [Name "my_int"] > $ CreateDomain [Name Nothing "my_int"]
> (TypeName [Name "int"]) > (TypeName [Name Nothing "int"])
> Nothing [(Nothing > Nothing [(Nothing
> ,BinOp (Iden [Name "value"]) [Name ">"] (NumLit "5"))]) > ,BinOp (Iden [Name Nothing "value"]) [Name Nothing ">"] (NumLit "5"))])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create domain my_int int constraint gt5 check (value > 5)" > "create domain my_int int constraint gt5 check (value > 5)"
> $ CreateDomain [Name "my_int"] > $ CreateDomain [Name Nothing "my_int"]
> (TypeName [Name "int"]) > (TypeName [Name Nothing "int"])
> Nothing [(Just [Name "gt5"] > Nothing [(Just [Name Nothing "gt5"]
> ,BinOp (Iden [Name "value"]) [Name ">"] (NumLit "5"))]) > ,BinOp (Iden [Name Nothing "value"]) [Name Nothing ">"] (NumLit "5"))])
@ -1208,7 +1208,7 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter domain my_int set default 0" > "alter domain my_int set default 0"
> $ AlterDomain [Name "my_int"] > $ AlterDomain [Name Nothing "my_int"]
> $ ADSetDefault $ NumLit "0") > $ ADSetDefault $ NumLit "0")
@ -1219,7 +1219,7 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter domain my_int drop default" > "alter domain my_int drop default"
> $ AlterDomain [Name "my_int"] > $ AlterDomain [Name Nothing "my_int"]
> $ ADDropDefault) > $ ADDropDefault)
@ -1230,15 +1230,15 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter domain my_int add check (value > 6)" > "alter domain my_int add check (value > 6)"
> $ AlterDomain [Name "my_int"] > $ AlterDomain [Name Nothing "my_int"]
> $ ADAddConstraint Nothing > $ ADAddConstraint Nothing
> $ BinOp (Iden [Name "value"]) [Name ">"] (NumLit "6")) > $ BinOp (Iden [Name Nothing "value"]) [Name Nothing ">"] (NumLit "6"))
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter domain my_int add constraint gt6 check (value > 6)" > "alter domain my_int add constraint gt6 check (value > 6)"
> $ AlterDomain [Name "my_int"] > $ AlterDomain [Name Nothing "my_int"]
> $ ADAddConstraint (Just [Name "gt6"]) > $ ADAddConstraint (Just [Name Nothing "gt6"])
> $ BinOp (Iden [Name "value"]) [Name ">"] (NumLit "6")) > $ BinOp (Iden [Name Nothing "value"]) [Name Nothing ">"] (NumLit "6"))
11.39 <drop domain constraint definition> 11.39 <drop domain constraint definition>
@ -1248,8 +1248,8 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter domain my_int drop constraint gt6" > "alter domain my_int drop constraint gt6"
> $ AlterDomain [Name "my_int"] > $ AlterDomain [Name Nothing "my_int"]
> $ ADDropConstraint [Name "gt6"]) > $ ADDropConstraint [Name Nothing "gt6"])
11.40 <drop domain statement> 11.40 <drop domain statement>
@ -1258,11 +1258,11 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop domain my_int" > "drop domain my_int"
> $ DropDomain [Name "my_int"] DefaultDropBehaviour) > $ DropDomain [Name Nothing "my_int"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop domain my_int cascade" > "drop domain my_int cascade"
> $ DropDomain [Name "my_int"] Cascade) > $ DropDomain [Name Nothing "my_int"] Cascade)
@ -1334,13 +1334,13 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create assertion t1_not_empty CHECK ((select count(*) from t1) > 0);" > "create assertion t1_not_empty CHECK ((select count(*) from t1) > 0);"
> $ CreateAssertion [Name "t1_not_empty"] > $ CreateAssertion [Name Nothing "t1_not_empty"]
> $ BinOp (SubQueryExpr SqSq $ > $ BinOp (SubQueryExpr SqSq $
> makeSelect > makeSelect
> {qeSelectList = [(App [Name "count"] [Star],Nothing)] > {qeSelectList = [(App [Name Nothing "count"] [Star],Nothing)]
> ,qeFrom = [TRSimple [Name "t1"]] > ,qeFrom = [TRSimple [Name Nothing "t1"]]
> }) > })
> [Name ">"] (NumLit "0")) > [Name Nothing ">"] (NumLit "0"))
11.48 <drop assertion statement> 11.48 <drop assertion statement>
@ -1349,11 +1349,11 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop assertion t1_not_empty;" > "drop assertion t1_not_empty;"
> $ DropAssertion [Name "t1_not_empty"] DefaultDropBehaviour) > $ DropAssertion [Name Nothing "t1_not_empty"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop assertion t1_not_empty cascade;" > "drop assertion t1_not_empty cascade;"
> $ DropAssertion [Name "t1_not_empty"] Cascade) > $ DropAssertion [Name Nothing "t1_not_empty"] Cascade)
11.49 <trigger definition> 11.49 <trigger definition>
@ -1990,18 +1990,18 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create sequence seq" > "create sequence seq"
> $ CreateSequence [Name "seq"] []) > $ CreateSequence [Name Nothing "seq"] [])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create sequence seq as bigint" > "create sequence seq as bigint"
> $ CreateSequence [Name "seq"] > $ CreateSequence [Name Nothing "seq"]
> [SGODataType $ TypeName [Name "bigint"]]) > [SGODataType $ TypeName [Name Nothing "bigint"]])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "create sequence seq as bigint start with 5" > "create sequence seq as bigint start with 5"
> $ CreateSequence [Name "seq"] > $ CreateSequence [Name Nothing "seq"]
> [SGOStartWith 5 > [SGOStartWith 5
> ,SGODataType $ TypeName [Name "bigint"] > ,SGODataType $ TypeName [Name Nothing "bigint"]
> ]) > ])
@ -2025,17 +2025,17 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter sequence seq restart" > "alter sequence seq restart"
> $ AlterSequence [Name "seq"] > $ AlterSequence [Name Nothing "seq"]
> [SGORestart Nothing]) > [SGORestart Nothing])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter sequence seq restart with 5" > "alter sequence seq restart with 5"
> $ AlterSequence [Name "seq"] > $ AlterSequence [Name Nothing "seq"]
> [SGORestart $ Just 5]) > [SGORestart $ Just 5])
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "alter sequence seq restart with 5 increment by 5" > "alter sequence seq restart with 5 increment by 5"
> $ AlterSequence [Name "seq"] > $ AlterSequence [Name Nothing "seq"]
> [SGORestart $ Just 5 > [SGORestart $ Just 5
> ,SGOIncrementBy 5]) > ,SGOIncrementBy 5])
@ -2047,11 +2047,11 @@ defintely skip
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop sequence seq" > "drop sequence seq"
> $ DropSequence [Name "seq"] DefaultDropBehaviour) > $ DropSequence [Name Nothing "seq"] DefaultDropBehaviour)
> ,(TestStatement ansi2011 > ,(TestStatement ansi2011
> "drop sequence seq restrict" > "drop sequence seq restrict"
> $ DropSequence [Name "seq"] Restrict) > $ DropSequence [Name Nothing "seq"] Restrict)
> ] > ]

72
tools/Language/SQL/SimpleSQL/TableRefs.lhs
View file

@ -11,95 +11,95 @@ expression
> tableRefTests :: TestItem > tableRefTests :: TestItem
> tableRefTests = Group "tableRefTests" $ map (uncurry (TestQueryExpr ansi2011)) > tableRefTests = Group "tableRefTests" $ map (uncurry (TestQueryExpr ansi2011))
> [("select a from t" > [("select a from t"
> ,ms [TRSimple [Name "t"]]) > ,ms [TRSimple [Name Nothing "t"]])
> ,("select a from f(a)" > ,("select a from f(a)"
> ,ms [TRFunction [Name "f"] [Iden [Name "a"]]]) > ,ms [TRFunction [Name Nothing "f"] [Iden [Name Nothing "a"]]])
> ,("select a from t,u" > ,("select a from t,u"
> ,ms [TRSimple [Name "t"], TRSimple [Name "u"]]) > ,ms [TRSimple [Name Nothing "t"], TRSimple [Name Nothing "u"]])
> ,("select a from s.t" > ,("select a from s.t"
> ,ms [TRSimple [Name "s", Name "t"]]) > ,ms [TRSimple [Name Nothing "s", Name Nothing "t"]])
these lateral queries make no sense but the syntax is valid these lateral queries make no sense but the syntax is valid
> ,("select a from lateral a" > ,("select a from lateral a"
> ,ms [TRLateral $ TRSimple [Name "a"]]) > ,ms [TRLateral $ TRSimple [Name Nothing "a"]])
> ,("select a from lateral a,b" > ,("select a from lateral a,b"
> ,ms [TRLateral $ TRSimple [Name "a"], TRSimple [Name "b"]]) > ,ms [TRLateral $ TRSimple [Name Nothing "a"], TRSimple [Name Nothing "b"]])
> ,("select a from a, lateral b" > ,("select a from a, lateral b"
> ,ms [TRSimple [Name "a"], TRLateral $ TRSimple [Name "b"]]) > ,ms [TRSimple [Name Nothing "a"], TRLateral $ TRSimple [Name Nothing "b"]])
> ,("select a from a natural join lateral b" > ,("select a from a natural join lateral b"
> ,ms [TRJoin (TRSimple [Name "a"]) True JInner > ,ms [TRJoin (TRSimple [Name Nothing "a"]) True JInner
> (TRLateral $ TRSimple [Name "b"]) > (TRLateral $ TRSimple [Name Nothing "b"])
> Nothing]) > Nothing])
> ,("select a from lateral a natural join lateral b" > ,("select a from lateral a natural join lateral b"
> ,ms [TRJoin (TRLateral $ TRSimple [Name "a"]) True JInner > ,ms [TRJoin (TRLateral $ TRSimple [Name Nothing "a"]) True JInner
> (TRLateral $ TRSimple [Name "b"]) > (TRLateral $ TRSimple [Name Nothing "b"])
> Nothing]) > Nothing])
> ,("select a from t inner join u on expr" > ,("select a from t inner join u on expr"
> ,ms [TRJoin (TRSimple [Name "t"]) False JInner (TRSimple [Name "u"]) > ,ms [TRJoin (TRSimple [Name Nothing "t"]) False JInner (TRSimple [Name Nothing "u"])
> (Just $ JoinOn $ Iden [Name "expr"])]) > (Just $ JoinOn $ Iden [Name Nothing "expr"])])
> ,("select a from t join u on expr" > ,("select a from t join u on expr"
> ,ms [TRJoin (TRSimple [Name "t"]) False JInner (TRSimple [Name "u"]) > ,ms [TRJoin (TRSimple [Name Nothing "t"]) False JInner (TRSimple [Name Nothing "u"])
> (Just $ JoinOn $ Iden [Name "expr"])]) > (Just $ JoinOn $ Iden [Name Nothing "expr"])])
> ,("select a from t left join u on expr" > ,("select a from t left join u on expr"
> ,ms [TRJoin (TRSimple [Name "t"]) False JLeft (TRSimple [Name "u"]) > ,ms [TRJoin (TRSimple [Name Nothing "t"]) False JLeft (TRSimple [Name Nothing "u"])
> (Just $ JoinOn $ Iden [Name "expr"])]) > (Just $ JoinOn $ Iden [Name Nothing "expr"])])
> ,("select a from t right join u on expr" > ,("select a from t right join u on expr"
> ,ms [TRJoin (TRSimple [Name "t"]) False JRight (TRSimple [Name "u"]) > ,ms [TRJoin (TRSimple [Name Nothing "t"]) False JRight (TRSimple [Name Nothing "u"])
> (Just $ JoinOn $ Iden [Name "expr"])]) > (Just $ JoinOn $ Iden [Name Nothing "expr"])])
> ,("select a from t full join u on expr" > ,("select a from t full join u on expr"
> ,ms [TRJoin (TRSimple [Name "t"]) False JFull (TRSimple [Name "u"]) > ,ms [TRJoin (TRSimple [Name Nothing "t"]) False JFull (TRSimple [Name Nothing "u"])
> (Just $ JoinOn $ Iden [Name "expr"])]) > (Just $ JoinOn $ Iden [Name Nothing "expr"])])
> ,("select a from t cross join u" > ,("select a from t cross join u"
> ,ms [TRJoin (TRSimple [Name "t"]) False > ,ms [TRJoin (TRSimple [Name Nothing "t"]) False
> JCross (TRSimple [Name "u"]) Nothing]) > JCross (TRSimple [Name Nothing "u"]) Nothing])
> ,("select a from t natural inner join u" > ,("select a from t natural inner join u"
> ,ms [TRJoin (TRSimple [Name "t"]) True JInner (TRSimple [Name "u"]) > ,ms [TRJoin (TRSimple [Name Nothing "t"]) True JInner (TRSimple [Name Nothing "u"])
> Nothing]) > Nothing])
> ,("select a from t inner join u using(a,b)" > ,("select a from t inner join u using(a,b)"
> ,ms [TRJoin (TRSimple [Name "t"]) False JInner (TRSimple [Name "u"]) > ,ms [TRJoin (TRSimple [Name Nothing "t"]) False JInner (TRSimple [Name Nothing "u"])
> (Just $ JoinUsing [Name "a", Name "b"])]) > (Just $ JoinUsing [Name Nothing "a", Name Nothing "b"])])
> ,("select a from (select a from t)" > ,("select a from (select a from t)"
> ,ms [TRQueryExpr $ ms [TRSimple [Name "t"]]]) > ,ms [TRQueryExpr $ ms [TRSimple [Name Nothing "t"]]])
> ,("select a from t as u" > ,("select a from t as u"
> ,ms [TRAlias (TRSimple [Name "t"]) (Alias (Name "u") Nothing)]) > ,ms [TRAlias (TRSimple [Name Nothing "t"]) (Alias (Name Nothing "u") Nothing)])
> ,("select a from t u" > ,("select a from t u"
> ,ms [TRAlias (TRSimple [Name "t"]) (Alias (Name "u") Nothing)]) > ,ms [TRAlias (TRSimple [Name Nothing "t"]) (Alias (Name Nothing "u") Nothing)])
> ,("select a from t u(b)" > ,("select a from t u(b)"
> ,ms [TRAlias (TRSimple [Name "t"]) (Alias (Name "u") $ Just [Name "b"])]) > ,ms [TRAlias (TRSimple [Name Nothing "t"]) (Alias (Name Nothing "u") $ Just [Name Nothing "b"])])
> ,("select a from (t cross join u) as u" > ,("select a from (t cross join u) as u"
> ,ms [TRAlias (TRParens $ > ,ms [TRAlias (TRParens $
> TRJoin (TRSimple [Name "t"]) False JCross (TRSimple [Name "u"]) Nothing) > TRJoin (TRSimple [Name Nothing "t"]) False JCross (TRSimple [Name Nothing "u"]) Nothing)
> (Alias (Name "u") Nothing)]) > (Alias (Name Nothing "u") Nothing)])
> -- todo: not sure if the associativity is correct > -- todo: not sure if the associativity is correct
> ,("select a from t cross join u cross join v", > ,("select a from t cross join u cross join v",
> ms [TRJoin > ms [TRJoin
> (TRJoin (TRSimple [Name "t"]) False > (TRJoin (TRSimple [Name Nothing "t"]) False
> JCross (TRSimple [Name "u"]) Nothing) > JCross (TRSimple [Name Nothing "u"]) Nothing)
> False JCross (TRSimple [Name "v"]) Nothing]) > False JCross (TRSimple [Name Nothing "v"]) Nothing])
> ] > ]
> where > where
> ms f = makeSelect {qeSelectList = [(Iden [Name "a"],Nothing)] > ms f = makeSelect {qeSelectList = [(Iden [Name Nothing "a"],Nothing)]
> ,qeFrom = f} > ,qeFrom = f}

250
tools/Language/SQL/SimpleSQL/ValueExprs.lhs
View file

@ -41,14 +41,14 @@ Tests for parsing value expressions
> ,IntervalLit Nothing "3" (Itf "day" Nothing) Nothing) > ,IntervalLit Nothing "3" (Itf "day" Nothing) Nothing)
> ,("interval '3' day (3)" > ,("interval '3' day (3)"
> ,IntervalLit Nothing "3" (Itf "day" $ Just (3,Nothing)) Nothing) > ,IntervalLit Nothing "3" (Itf "day" $ Just (3,Nothing)) Nothing)
> ,("interval '3 weeks'", TypedLit (TypeName [Name "interval"]) "3 weeks") > ,("interval '3 weeks'", TypedLit (TypeName [Name Nothing "interval"]) "3 weeks")
> ] > ]
> identifiers :: TestItem > identifiers :: TestItem
> identifiers = Group "identifiers" $ map (uncurry (TestValueExpr ansi2011)) > identifiers = Group "identifiers" $ map (uncurry (TestValueExpr ansi2011))
> [("iden1", Iden [Name "iden1"]) > [("iden1", Iden [Name Nothing "iden1"])
> --,("t.a", Iden2 "t" "a") > --,("t.a", Iden2 "t" "a")
> ,("\"quoted identifier\"", Iden [QuotedName "\"" "\"" "quoted identifier"]) > ,("\"quoted identifier\"", Iden [Name (Just ("\"","\"")) "quoted identifier"])
> ] > ]
> star :: TestItem > star :: TestItem
@ -66,41 +66,41 @@ Tests for parsing value expressions
> dots :: TestItem > dots :: TestItem
> dots = Group "dot" $ map (uncurry (TestValueExpr ansi2011)) > dots = Group "dot" $ map (uncurry (TestValueExpr ansi2011))
> [("t.a", Iden [Name "t",Name "a"]) > [("t.a", Iden [Name Nothing "t",Name Nothing "a"])
> ,("t.*", BinOp (Iden [Name "t"]) [Name "."] Star) > ,("t.*", BinOp (Iden [Name Nothing "t"]) [Name Nothing "."] Star)
> ,("a.b.c", Iden [Name "a",Name "b",Name "c"]) > ,("a.b.c", Iden [Name Nothing "a",Name Nothing "b",Name Nothing "c"])
> ,("ROW(t.*,42)", App [Name "ROW"] [BinOp (Iden [Name "t"]) [Name "."] Star, NumLit "42"]) > ,("ROW(t.*,42)", App [Name Nothing "ROW"] [BinOp (Iden [Name Nothing "t"]) [Name Nothing "."] Star, NumLit "42"])
> ] > ]
> app :: TestItem > app :: TestItem
> app = Group "app" $ map (uncurry (TestValueExpr ansi2011)) > app = Group "app" $ map (uncurry (TestValueExpr ansi2011))
> [("f()", App [Name "f"] []) > [("f()", App [Name Nothing "f"] [])
> ,("f(a)", App [Name "f"] [Iden [Name "a"]]) > ,("f(a)", App [Name Nothing "f"] [Iden [Name Nothing "a"]])
> ,("f(a,b)", App [Name "f"] [Iden [Name "a"], Iden [Name "b"]]) > ,("f(a,b)", App [Name Nothing "f"] [Iden [Name Nothing "a"], Iden [Name Nothing "b"]])
> ] > ]
> caseexp :: TestItem > caseexp :: TestItem
> caseexp = Group "caseexp" $ map (uncurry (TestValueExpr ansi2011)) > caseexp = Group "caseexp" $ map (uncurry (TestValueExpr ansi2011))
> [("case a when 1 then 2 end" > [("case a when 1 then 2 end"
> ,Case (Just $ Iden [Name "a"]) [([NumLit "1"] > ,Case (Just $ Iden [Name Nothing "a"]) [([NumLit "1"]
> ,NumLit "2")] Nothing) > ,NumLit "2")] Nothing)
> ,("case a when 1 then 2 when 3 then 4 end" > ,("case a when 1 then 2 when 3 then 4 end"
> ,Case (Just $ Iden [Name "a"]) [([NumLit "1"], NumLit "2") > ,Case (Just $ Iden [Name Nothing "a"]) [([NumLit "1"], NumLit "2")
> ,([NumLit "3"], NumLit "4")] Nothing) > ,([NumLit "3"], NumLit "4")] Nothing)
> ,("case a when 1 then 2 when 3 then 4 else 5 end" > ,("case a when 1 then 2 when 3 then 4 else 5 end"
> ,Case (Just $ Iden [Name "a"]) [([NumLit "1"], NumLit "2") > ,Case (Just $ Iden [Name Nothing "a"]) [([NumLit "1"], NumLit "2")
> ,([NumLit "3"], NumLit "4")] > ,([NumLit "3"], NumLit "4")]
> (Just $ NumLit "5")) > (Just $ NumLit "5"))
> ,("case when a=1 then 2 when a=3 then 4 else 5 end" > ,("case when a=1 then 2 when a=3 then 4 else 5 end"
> ,Case Nothing [([BinOp (Iden [Name "a"]) [Name "="] (NumLit "1")], NumLit "2") > ,Case Nothing [([BinOp (Iden [Name Nothing "a"]) [Name Nothing "="] (NumLit "1")], NumLit "2")
> ,([BinOp (Iden [Name "a"]) [Name "="] (NumLit "3")], NumLit "4")] > ,([BinOp (Iden [Name Nothing "a"]) [Name Nothing "="] (NumLit "3")], NumLit "4")]
> (Just $ NumLit "5")) > (Just $ NumLit "5"))
> ,("case a when 1,2 then 10 when 3,4 then 20 end" > ,("case a when 1,2 then 10 when 3,4 then 20 end"
> ,Case (Just $ Iden [Name "a"]) [([NumLit "1",NumLit "2"] > ,Case (Just $ Iden [Name Nothing "a"]) [([NumLit "1",NumLit "2"]
> ,NumLit "10") > ,NumLit "10")
> ,([NumLit "3",NumLit "4"] > ,([NumLit "3",NumLit "4"]
> ,NumLit "20")] > ,NumLit "20")]
@ -117,48 +117,48 @@ Tests for parsing value expressions
> binaryOperators :: TestItem > binaryOperators :: TestItem
> binaryOperators = Group "binaryOperators" $ map (uncurry (TestValueExpr ansi2011)) > binaryOperators = Group "binaryOperators" $ map (uncurry (TestValueExpr ansi2011))
> [("a + b", BinOp (Iden [Name "a"]) [Name "+"] (Iden [Name "b"])) > [("a + b", BinOp (Iden [Name Nothing "a"]) [Name Nothing "+"] (Iden [Name Nothing "b"]))
> -- sanity check fixities > -- sanity check fixities
> -- todo: add more fixity checking > -- todo: add more fixity checking
> ,("a + b * c" > ,("a + b * c"
> ,BinOp (Iden [Name "a"]) [Name "+"] > ,BinOp (Iden [Name Nothing "a"]) [Name Nothing "+"]
> (BinOp (Iden [Name "b"]) [Name "*"] (Iden [Name "c"]))) > (BinOp (Iden [Name Nothing "b"]) [Name Nothing "*"] (Iden [Name Nothing "c"])))
> ,("a * b + c" > ,("a * b + c"
> ,BinOp (BinOp (Iden [Name "a"]) [Name "*"] (Iden [Name "b"])) > ,BinOp (BinOp (Iden [Name Nothing "a"]) [Name Nothing "*"] (Iden [Name Nothing "b"]))
> [Name "+"] (Iden [Name "c"])) > [Name Nothing "+"] (Iden [Name Nothing "c"]))
> ] > ]
> unaryOperators :: TestItem > unaryOperators :: TestItem
> unaryOperators = Group "unaryOperators" $ map (uncurry (TestValueExpr ansi2011)) > unaryOperators = Group "unaryOperators" $ map (uncurry (TestValueExpr ansi2011))
> [("not a", PrefixOp [Name "not"] $ Iden [Name "a"]) > [("not a", PrefixOp [Name Nothing "not"] $ Iden [Name Nothing "a"])
> ,("not not a", PrefixOp [Name "not"] $ PrefixOp [Name "not"] $ Iden [Name "a"]) > ,("not not a", PrefixOp [Name Nothing "not"] $ PrefixOp [Name Nothing "not"] $ Iden [Name Nothing "a"])
> ,("+a", PrefixOp [Name "+"] $ Iden [Name "a"]) > ,("+a", PrefixOp [Name Nothing "+"] $ Iden [Name Nothing "a"])
> ,("-a", PrefixOp [Name "-"] $ Iden [Name "a"]) > ,("-a", PrefixOp [Name Nothing "-"] $ Iden [Name Nothing "a"])
> ] > ]
> casts :: TestItem > casts :: TestItem
> casts = Group "operators" $ map (uncurry (TestValueExpr ansi2011)) > casts = Group "operators" $ map (uncurry (TestValueExpr ansi2011))
> [("cast('1' as int)" > [("cast('1' as int)"
> ,Cast (StringLit "'" "'" "1") $ TypeName [Name "int"]) > ,Cast (StringLit "'" "'" "1") $ TypeName [Name Nothing "int"])
> ,("int '3'" > ,("int '3'"
> ,TypedLit (TypeName [Name "int"]) "3") > ,TypedLit (TypeName [Name Nothing "int"]) "3")
> ,("cast('1' as double precision)" > ,("cast('1' as double precision)"
> ,Cast (StringLit "'" "'" "1") $ TypeName [Name "double precision"]) > ,Cast (StringLit "'" "'" "1") $ TypeName [Name Nothing "double precision"])
> ,("cast('1' as float(8))" > ,("cast('1' as float(8))"
> ,Cast (StringLit "'" "'" "1") $ PrecTypeName [Name "float"] 8) > ,Cast (StringLit "'" "'" "1") $ PrecTypeName [Name Nothing "float"] 8)
> ,("cast('1' as decimal(15,2))" > ,("cast('1' as decimal(15,2))"
> ,Cast (StringLit "'" "'" "1") $ PrecScaleTypeName [Name "decimal"] 15 2) > ,Cast (StringLit "'" "'" "1") $ PrecScaleTypeName [Name Nothing "decimal"] 15 2)
> ,("double precision '3'" > ,("double precision '3'"
> ,TypedLit (TypeName [Name "double precision"]) "3") > ,TypedLit (TypeName [Name Nothing "double precision"]) "3")
> ] > ]
> subqueries :: TestItem > subqueries :: TestItem
@ -167,113 +167,113 @@ Tests for parsing value expressions
> ,("(select a from t)", SubQueryExpr SqSq ms) > ,("(select a from t)", SubQueryExpr SqSq ms)
> ,("a in (select a from t)" > ,("a in (select a from t)"
> ,In True (Iden [Name "a"]) (InQueryExpr ms)) > ,In True (Iden [Name Nothing "a"]) (InQueryExpr ms))
> ,("a not in (select a from t)" > ,("a not in (select a from t)"
> ,In False (Iden [Name "a"]) (InQueryExpr ms)) > ,In False (Iden [Name Nothing "a"]) (InQueryExpr ms))
> ,("a > all (select a from t)" > ,("a > all (select a from t)"
> ,QuantifiedComparison (Iden [Name "a"]) [Name ">"] CPAll ms) > ,QuantifiedComparison (Iden [Name Nothing "a"]) [Name Nothing ">"] CPAll ms)
> ,("a = some (select a from t)" > ,("a = some (select a from t)"
> ,QuantifiedComparison (Iden [Name "a"]) [Name "="] CPSome ms) > ,QuantifiedComparison (Iden [Name Nothing "a"]) [Name Nothing "="] CPSome ms)
> ,("a <= any (select a from t)" > ,("a <= any (select a from t)"
> ,QuantifiedComparison (Iden [Name "a"]) [Name "<="] CPAny ms) > ,QuantifiedComparison (Iden [Name Nothing "a"]) [Name Nothing "<="] CPAny ms)
> ] > ]
> where > where
> ms = makeSelect > ms = makeSelect
> {qeSelectList = [(Iden [Name "a"],Nothing)] > {qeSelectList = [(Iden [Name Nothing "a"],Nothing)]
> ,qeFrom = [TRSimple [Name "t"]] > ,qeFrom = [TRSimple [Name Nothing "t"]]
> } > }
> miscOps :: TestItem > miscOps :: TestItem
> miscOps = Group "unaryOperators" $ map (uncurry (TestValueExpr ansi2011)) > miscOps = Group "unaryOperators" $ map (uncurry (TestValueExpr ansi2011))
> [("a in (1,2,3)" > [("a in (1,2,3)"
> ,In True (Iden [Name "a"]) $ InList $ map NumLit ["1","2","3"]) > ,In True (Iden [Name Nothing "a"]) $ InList $ map NumLit ["1","2","3"])
> ,("a is null", PostfixOp [Name "is null"] (Iden [Name "a"])) > ,("a is null", PostfixOp [Name Nothing "is null"] (Iden [Name Nothing "a"]))
> ,("a is not null", PostfixOp [Name "is not null"] (Iden [Name "a"])) > ,("a is not null", PostfixOp [Name Nothing "is not null"] (Iden [Name Nothing "a"]))
> ,("a is true", PostfixOp [Name "is true"] (Iden [Name "a"])) > ,("a is true", PostfixOp [Name Nothing "is true"] (Iden [Name Nothing "a"]))
> ,("a is not true", PostfixOp [Name "is not true"] (Iden [Name "a"])) > ,("a is not true", PostfixOp [Name Nothing "is not true"] (Iden [Name Nothing "a"]))
> ,("a is false", PostfixOp [Name "is false"] (Iden [Name "a"])) > ,("a is false", PostfixOp [Name Nothing "is false"] (Iden [Name Nothing "a"]))
> ,("a is not false", PostfixOp [Name "is not false"] (Iden [Name "a"])) > ,("a is not false", PostfixOp [Name Nothing "is not false"] (Iden [Name Nothing "a"]))
> ,("a is unknown", PostfixOp [Name "is unknown"] (Iden [Name "a"])) > ,("a is unknown", PostfixOp [Name Nothing "is unknown"] (Iden [Name Nothing "a"]))
> ,("a is not unknown", PostfixOp [Name "is not unknown"] (Iden [Name "a"])) > ,("a is not unknown", PostfixOp [Name Nothing "is not unknown"] (Iden [Name Nothing "a"]))
> ,("a is distinct from b", BinOp (Iden [Name "a"]) [Name "is distinct from"] (Iden [Name "b"])) > ,("a is distinct from b", BinOp (Iden [Name Nothing "a"]) [Name Nothing "is distinct from"] (Iden [Name Nothing "b"]))
> ,("a is not distinct from b" > ,("a is not distinct from b"
> ,BinOp (Iden [Name "a"]) [Name "is not distinct from"] (Iden [Name "b"])) > ,BinOp (Iden [Name Nothing "a"]) [Name Nothing "is not distinct from"] (Iden [Name Nothing "b"]))
> ,("a like b", BinOp (Iden [Name "a"]) [Name "like"] (Iden [Name "b"])) > ,("a like b", BinOp (Iden [Name Nothing "a"]) [Name Nothing "like"] (Iden [Name Nothing "b"]))
> ,("a not like b", BinOp (Iden [Name "a"]) [Name "not like"] (Iden [Name "b"])) > ,("a not like b", BinOp (Iden [Name Nothing "a"]) [Name Nothing "not like"] (Iden [Name Nothing "b"]))
> ,("a is similar to b", BinOp (Iden [Name "a"]) [Name "is similar to"] (Iden [Name "b"])) > ,("a is similar to b", BinOp (Iden [Name Nothing "a"]) [Name Nothing "is similar to"] (Iden [Name Nothing "b"]))
> ,("a is not similar to b" > ,("a is not similar to b"
> ,BinOp (Iden [Name "a"]) [Name "is not similar to"] (Iden [Name "b"])) > ,BinOp (Iden [Name Nothing "a"]) [Name Nothing "is not similar to"] (Iden [Name Nothing "b"]))
> ,("a overlaps b", BinOp (Iden [Name "a"]) [Name "overlaps"] (Iden [Name "b"])) > ,("a overlaps b", BinOp (Iden [Name Nothing "a"]) [Name Nothing "overlaps"] (Iden [Name Nothing "b"]))
special operators special operators
> ,("a between b and c", SpecialOp [Name "between"] [Iden [Name "a"] > ,("a between b and c", SpecialOp [Name Nothing "between"] [Iden [Name Nothing "a"]
> ,Iden [Name "b"] > ,Iden [Name Nothing "b"]
> ,Iden [Name "c"]]) > ,Iden [Name Nothing "c"]])
> ,("a not between b and c", SpecialOp [Name "not between"] [Iden [Name "a"] > ,("a not between b and c", SpecialOp [Name Nothing "not between"] [Iden [Name Nothing "a"]
> ,Iden [Name "b"] > ,Iden [Name Nothing "b"]
> ,Iden [Name "c"]]) > ,Iden [Name Nothing "c"]])
> ,("(1,2)" > ,("(1,2)"
> ,SpecialOp [Name "rowctor"] [NumLit "1", NumLit "2"]) > ,SpecialOp [Name Nothing "rowctor"] [NumLit "1", NumLit "2"])
keyword special operators keyword special operators
> ,("extract(day from t)" > ,("extract(day from t)"
> , SpecialOpK [Name "extract"] (Just $ Iden [Name "day"]) [("from", Iden [Name "t"])]) > , SpecialOpK [Name Nothing "extract"] (Just $ Iden [Name Nothing "day"]) [("from", Iden [Name Nothing "t"])])
> ,("substring(x from 1 for 2)" > ,("substring(x from 1 for 2)"
> ,SpecialOpK [Name "substring"] (Just $ Iden [Name "x"]) [("from", NumLit "1") > ,SpecialOpK [Name Nothing "substring"] (Just $ Iden [Name Nothing "x"]) [("from", NumLit "1")
> ,("for", NumLit "2")]) > ,("for", NumLit "2")])
> ,("substring(x from 1)" > ,("substring(x from 1)"
> ,SpecialOpK [Name "substring"] (Just $ Iden [Name "x"]) [("from", NumLit "1")]) > ,SpecialOpK [Name Nothing "substring"] (Just $ Iden [Name Nothing "x"]) [("from", NumLit "1")])
> ,("substring(x for 2)" > ,("substring(x for 2)"
> ,SpecialOpK [Name "substring"] (Just $ Iden [Name "x"]) [("for", NumLit "2")]) > ,SpecialOpK [Name Nothing "substring"] (Just $ Iden [Name Nothing "x"]) [("for", NumLit "2")])
> ,("substring(x from 1 for 2 collate C)" > ,("substring(x from 1 for 2 collate C)"
> ,SpecialOpK [Name "substring"] (Just $ Iden [Name "x"]) > ,SpecialOpK [Name Nothing "substring"] (Just $ Iden [Name Nothing "x"])
> [("from", NumLit "1") > [("from", NumLit "1")
> ,("for", Collate (NumLit "2") [Name "C"])]) > ,("for", Collate (NumLit "2") [Name Nothing "C"])])
this doesn't work because of a overlap in the 'in' parser this doesn't work because of a overlap in the 'in' parser
> ,("POSITION( string1 IN string2 )" > ,("POSITION( string1 IN string2 )"
> ,SpecialOpK [Name "position"] (Just $ Iden [Name "string1"]) [("in", Iden [Name "string2"])]) > ,SpecialOpK [Name Nothing "position"] (Just $ Iden [Name Nothing "string1"]) [("in", Iden [Name Nothing "string2"])])
> ,("CONVERT(char_value USING conversion_char_name)" > ,("CONVERT(char_value USING conversion_char_name)"
> ,SpecialOpK [Name "convert"] (Just $ Iden [Name "char_value"]) > ,SpecialOpK [Name Nothing "convert"] (Just $ Iden [Name Nothing "char_value"])
> [("using", Iden [Name "conversion_char_name"])]) > [("using", Iden [Name Nothing "conversion_char_name"])])
> ,("TRANSLATE(char_value USING translation_name)" > ,("TRANSLATE(char_value USING translation_name)"
> ,SpecialOpK [Name "translate"] (Just $ Iden [Name "char_value"]) > ,SpecialOpK [Name Nothing "translate"] (Just $ Iden [Name Nothing "char_value"])
> [("using", Iden [Name "translation_name"])]) > [("using", Iden [Name Nothing "translation_name"])])
OVERLAY(string PLACING embedded_string FROM start OVERLAY(string PLACING embedded_string FROM start
[FOR length]) [FOR length])
> ,("OVERLAY(string PLACING embedded_string FROM start)" > ,("OVERLAY(string PLACING embedded_string FROM start)"
> ,SpecialOpK [Name "overlay"] (Just $ Iden [Name "string"]) > ,SpecialOpK [Name Nothing "overlay"] (Just $ Iden [Name Nothing "string"])
> [("placing", Iden [Name "embedded_string"]) > [("placing", Iden [Name Nothing "embedded_string"])
> ,("from", Iden [Name "start"])]) > ,("from", Iden [Name Nothing "start"])])
> ,("OVERLAY(string PLACING embedded_string FROM start FOR length)" > ,("OVERLAY(string PLACING embedded_string FROM start FOR length)"
> ,SpecialOpK [Name "overlay"] (Just $ Iden [Name "string"]) > ,SpecialOpK [Name Nothing "overlay"] (Just $ Iden [Name Nothing "string"])
> [("placing", Iden [Name "embedded_string"]) > [("placing", Iden [Name Nothing "embedded_string"])
> ,("from", Iden [Name "start"]) > ,("from", Iden [Name Nothing "start"])
> ,("for", Iden [Name "length"])]) > ,("for", Iden [Name Nothing "length"])])
TRIM( [ [{LEADING | TRAILING | BOTH}] [removal_char] FROM ] TRIM( [ [{LEADING | TRAILING | BOTH}] [removal_char] FROM ]
target_string target_string
@ -282,117 +282,117 @@ target_string
> ,("trim(from target_string)" > ,("trim(from target_string)"
> ,SpecialOpK [Name "trim"] Nothing > ,SpecialOpK [Name Nothing "trim"] Nothing
> [("both", StringLit "'" "'" " ") > [("both", StringLit "'" "'" " ")
> ,("from", Iden [Name "target_string"])]) > ,("from", Iden [Name Nothing "target_string"])])
> ,("trim(leading from target_string)" > ,("trim(leading from target_string)"
> ,SpecialOpK [Name "trim"] Nothing > ,SpecialOpK [Name Nothing "trim"] Nothing
> [("leading", StringLit "'" "'" " ") > [("leading", StringLit "'" "'" " ")
> ,("from", Iden [Name "target_string"])]) > ,("from", Iden [Name Nothing "target_string"])])
> ,("trim(trailing from target_string)" > ,("trim(trailing from target_string)"
> ,SpecialOpK [Name "trim"] Nothing > ,SpecialOpK [Name Nothing "trim"] Nothing
> [("trailing", StringLit "'" "'" " ") > [("trailing", StringLit "'" "'" " ")
> ,("from", Iden [Name "target_string"])]) > ,("from", Iden [Name Nothing "target_string"])])
> ,("trim(both from target_string)" > ,("trim(both from target_string)"
> ,SpecialOpK [Name "trim"] Nothing > ,SpecialOpK [Name Nothing "trim"] Nothing
> [("both", StringLit "'" "'" " ") > [("both", StringLit "'" "'" " ")
> ,("from", Iden [Name "target_string"])]) > ,("from", Iden [Name Nothing "target_string"])])
> ,("trim(leading 'x' from target_string)" > ,("trim(leading 'x' from target_string)"
> ,SpecialOpK [Name "trim"] Nothing > ,SpecialOpK [Name Nothing "trim"] Nothing
> [("leading", StringLit "'" "'" "x") > [("leading", StringLit "'" "'" "x")
> ,("from", Iden [Name "target_string"])]) > ,("from", Iden [Name Nothing "target_string"])])
> ,("trim(trailing 'y' from target_string)" > ,("trim(trailing 'y' from target_string)"
> ,SpecialOpK [Name "trim"] Nothing > ,SpecialOpK [Name Nothing "trim"] Nothing
> [("trailing", StringLit "'" "'" "y") > [("trailing", StringLit "'" "'" "y")
> ,("from", Iden [Name "target_string"])]) > ,("from", Iden [Name Nothing "target_string"])])
> ,("trim(both 'z' from target_string collate C)" > ,("trim(both 'z' from target_string collate C)"
> ,SpecialOpK [Name "trim"] Nothing > ,SpecialOpK [Name Nothing "trim"] Nothing
> [("both", StringLit "'" "'" "z") > [("both", StringLit "'" "'" "z")
> ,("from", Collate (Iden [Name "target_string"]) [Name "C"])]) > ,("from", Collate (Iden [Name Nothing "target_string"]) [Name Nothing "C"])])
> ,("trim(leading from target_string)" > ,("trim(leading from target_string)"
> ,SpecialOpK [Name "trim"] Nothing > ,SpecialOpK [Name Nothing "trim"] Nothing
> [("leading", StringLit "'" "'" " ") > [("leading", StringLit "'" "'" " ")
> ,("from", Iden [Name "target_string"])]) > ,("from", Iden [Name Nothing "target_string"])])
> ] > ]
> aggregates :: TestItem > aggregates :: TestItem
> aggregates = Group "aggregates" $ map (uncurry (TestValueExpr ansi2011)) > aggregates = Group "aggregates" $ map (uncurry (TestValueExpr ansi2011))
> [("count(*)",App [Name "count"] [Star]) > [("count(*)",App [Name Nothing "count"] [Star])
> ,("sum(a order by a)" > ,("sum(a order by a)"
> ,AggregateApp [Name "sum"] SQDefault [Iden [Name "a"]] > ,AggregateApp [Name Nothing "sum"] SQDefault [Iden [Name Nothing "a"]]
> [SortSpec (Iden [Name "a"]) DirDefault NullsOrderDefault] Nothing) > [SortSpec (Iden [Name Nothing "a"]) DirDefault NullsOrderDefault] Nothing)
> ,("sum(all a)" > ,("sum(all a)"
> ,AggregateApp [Name "sum"] All [Iden [Name "a"]] [] Nothing) > ,AggregateApp [Name Nothing "sum"] All [Iden [Name Nothing "a"]] [] Nothing)
> ,("count(distinct a)" > ,("count(distinct a)"
> ,AggregateApp [Name "count"] Distinct [Iden [Name "a"]] [] Nothing) > ,AggregateApp [Name Nothing "count"] Distinct [Iden [Name Nothing "a"]] [] Nothing)
> ] > ]
> windowFunctions :: TestItem > windowFunctions :: TestItem
> windowFunctions = Group "windowFunctions" $ map (uncurry (TestValueExpr ansi2011)) > windowFunctions = Group "windowFunctions" $ map (uncurry (TestValueExpr ansi2011))
> [("max(a) over ()", WindowApp [Name "max"] [Iden [Name "a"]] [] [] Nothing) > [("max(a) over ()", WindowApp [Name Nothing "max"] [Iden [Name Nothing "a"]] [] [] Nothing)
> ,("count(*) over ()", WindowApp [Name "count"] [Star] [] [] Nothing) > ,("count(*) over ()", WindowApp [Name Nothing "count"] [Star] [] [] Nothing)
> ,("max(a) over (partition by b)" > ,("max(a) over (partition by b)"
> ,WindowApp [Name "max"] [Iden [Name "a"]] [Iden [Name "b"]] [] Nothing) > ,WindowApp [Name Nothing "max"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"]] [] Nothing)
> ,("max(a) over (partition by b,c)" > ,("max(a) over (partition by b,c)"
> ,WindowApp [Name "max"] [Iden [Name "a"]] [Iden [Name "b"],Iden [Name "c"]] [] Nothing) > ,WindowApp [Name Nothing "max"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"],Iden [Name Nothing "c"]] [] Nothing)
> ,("sum(a) over (order by b)" > ,("sum(a) over (order by b)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] []
> [SortSpec (Iden [Name "b"]) DirDefault NullsOrderDefault] Nothing) > [SortSpec (Iden [Name Nothing "b"]) DirDefault NullsOrderDefault] Nothing)
> ,("sum(a) over (order by b desc,c)" > ,("sum(a) over (order by b desc,c)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] []
> [SortSpec (Iden [Name "b"]) Desc NullsOrderDefault > [SortSpec (Iden [Name Nothing "b"]) Desc NullsOrderDefault
> ,SortSpec (Iden [Name "c"]) DirDefault NullsOrderDefault] Nothing) > ,SortSpec (Iden [Name Nothing "c"]) DirDefault NullsOrderDefault] Nothing)
> ,("sum(a) over (partition by b order by c)" > ,("sum(a) over (partition by b order by c)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [Iden [Name "b"]] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"]]
> [SortSpec (Iden [Name "c"]) DirDefault NullsOrderDefault] Nothing) > [SortSpec (Iden [Name Nothing "c"]) DirDefault NullsOrderDefault] Nothing)
> ,("sum(a) over (partition by b order by c range unbounded preceding)" > ,("sum(a) over (partition by b order by c range unbounded preceding)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [Iden [Name "b"]] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"]]
> [SortSpec (Iden [Name "c"]) DirDefault NullsOrderDefault] > [SortSpec (Iden [Name Nothing "c"]) DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRange UnboundedPreceding) > $ Just $ FrameFrom FrameRange UnboundedPreceding)
> ,("sum(a) over (partition by b order by c range 5 preceding)" > ,("sum(a) over (partition by b order by c range 5 preceding)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [Iden [Name "b"]] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"]]
> [SortSpec (Iden [Name "c"]) DirDefault NullsOrderDefault] > [SortSpec (Iden [Name Nothing "c"]) DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRange $ Preceding (NumLit "5")) > $ Just $ FrameFrom FrameRange $ Preceding (NumLit "5"))
> ,("sum(a) over (partition by b order by c range current row)" > ,("sum(a) over (partition by b order by c range current row)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [Iden [Name "b"]] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"]]
> [SortSpec (Iden [Name "c"]) DirDefault NullsOrderDefault] > [SortSpec (Iden [Name Nothing "c"]) DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRange Current) > $ Just $ FrameFrom FrameRange Current)
> ,("sum(a) over (partition by b order by c rows 5 following)" > ,("sum(a) over (partition by b order by c rows 5 following)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [Iden [Name "b"]] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"]]
> [SortSpec (Iden [Name "c"]) DirDefault NullsOrderDefault] > [SortSpec (Iden [Name Nothing "c"]) DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRows $ Following (NumLit "5")) > $ Just $ FrameFrom FrameRows $ Following (NumLit "5"))
> ,("sum(a) over (partition by b order by c range unbounded following)" > ,("sum(a) over (partition by b order by c range unbounded following)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [Iden [Name "b"]] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"]]
> [SortSpec (Iden [Name "c"]) DirDefault NullsOrderDefault] > [SortSpec (Iden [Name Nothing "c"]) DirDefault NullsOrderDefault]
> $ Just $ FrameFrom FrameRange UnboundedFollowing) > $ Just $ FrameFrom FrameRange UnboundedFollowing)
> ,("sum(a) over (partition by b order by c \n\ > ,("sum(a) over (partition by b order by c \n\
> \range between 5 preceding and 5 following)" > \range between 5 preceding and 5 following)"
> ,WindowApp [Name "sum"] [Iden [Name "a"]] [Iden [Name "b"]] > ,WindowApp [Name Nothing "sum"] [Iden [Name Nothing "a"]] [Iden [Name Nothing "b"]]
> [SortSpec (Iden [Name "c"]) DirDefault NullsOrderDefault] > [SortSpec (Iden [Name Nothing "c"]) DirDefault NullsOrderDefault]
> $ Just $ FrameBetween FrameRange > $ Just $ FrameBetween FrameRange
> (Preceding (NumLit "5")) > (Preceding (NumLit "5"))
> (Following (NumLit "5"))) > (Following (NumLit "5")))
@ -401,6 +401,6 @@ target_string
> parens :: TestItem > parens :: TestItem
> parens = Group "parens" $ map (uncurry (TestValueExpr ansi2011)) > parens = Group "parens" $ map (uncurry (TestValueExpr ansi2011))
> [("(a)", Parens (Iden [Name "a"])) > [("(a)", Parens (Iden [Name Nothing "a"]))
> ,("(a + b)", Parens (BinOp (Iden [Name "a"]) [Name "+"] (Iden [Name "b"]))) > ,("(a + b)", Parens (BinOp (Iden [Name Nothing "a"]) [Name Nothing "+"] (Iden [Name Nothing "b"])))
> ] > ]