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

add support for rowctor without row, e.g. (1,2)

Browse source
This commit is contained in:
Jake Wheat 2013-12-17 16:20:05 +02:00
parent 89a4dd0e3e
commit e03090a6a1
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Language/SQL/SimpleSQL/Parser.lhs
View file

@ -302,10 +302,14 @@ that SQL supports.
> <$ try (keyword_ "character" <* keyword_ "varying") > <$ try (keyword_ "character" <* keyword_ "varying")
> ,TypeName <$> identifierString] > ,TypeName <$> identifierString]
== scalar parens == scalar parens and row ctor
> sparens :: P ScalarExpr > sparens :: P ScalarExpr
> sparens = Parens <$> parens scalarExpr' > sparens =
> ctor <$> parens (commaSep1 scalarExpr')
> where
> ctor [a] = Parens a
> ctor as = SpecialOp (Name "rowctor") as
== operator parsing == operator parsing

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

@ -80,6 +80,9 @@
> <+> text "for" > <+> text "for"
> <+> scalarExpr e) > <+> scalarExpr e)
> scalarExpr (SpecialOp (Name "rowctor") as) =
> parens $ commaSep $ map scalarExpr as
> scalarExpr (SpecialOp nm es) = > scalarExpr (SpecialOp nm es) =
> name nm <+> parens (commaSep $ map scalarExpr es) > name nm <+> parens (commaSep $ map scalarExpr es)

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

@ -203,6 +203,9 @@ Tests for parsing scalar expressions
> ,("substring(x from 1 for 2)" > ,("substring(x from 1 for 2)"
> ,SpecialOp "substring" [Iden "x", NumLit "1", NumLit "2"]) > ,SpecialOp "substring" [Iden "x", NumLit "1", NumLit "2"])
> ,("(1,2)"
> ,SpecialOp "rowctor" [NumLit "1", NumLit "2"])
> ] > ]
> aggregates :: TestItem > aggregates :: TestItem