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

update to accept latest mtl

Browse source
This commit is contained in:
Jake Wheat 2014-06-20 12:27:23 +03:00
parent 8996230093
commit 7914898cc8
5 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,2 +1,4 @@
/dist/ /dist/
/logchanges /logchanges
/cabal.sandbox.config
/.cabal-sandbox/

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

@ -832,7 +832,7 @@ together.
> ,orderBy <* closeParen > ,orderBy <* closeParen
> <**> (optionMaybe afilter <$$$$> aggAppWithoutDupe)] > <**> (optionMaybe afilter <$$$$> aggAppWithoutDupe)]
> -- no valueExprs: duplicates and order by not allowed > -- no valueExprs: duplicates and order by not allowed
> ,([] <$ closeParen) <**> (window <|> withinGroup <|> pure (flip App)) > ,([] <$ closeParen) <**> option (flip App) (window <|> withinGroup)
> ] > ]
> where > where
> aggAppWithoutDupeOrd n es f = AggregateApp n SQDefault es [] f > aggAppWithoutDupeOrd n es f = AggregateApp n SQDefault es [] f

6
TODO
View file

@ -1,3 +1,9 @@
work on reasonable subset of sql which is similar to the current
subset and smaller than the complete 2011 target
prototype for dialect handling
position annotation
work on the new refactoring of the parser work on the new refactoring of the parser
create a new module for generic combinators create a new module for generic combinators
work on getting rid of monad and guard work on getting rid of monad and guard

7
changelog
View file

@ -1,5 +1,10 @@
0.4.0-dev (updated to dbd48baaa1d1bce3d0d0139b8ffe55370fabe672) If you need help updating to a new version of simple-sql-parser,
please email jakewheatmail@gmail.com or use the github bug tracker,
https://github.com/JakeWheat/simple-sql-parser/issues.
0.4.0 (updated to dbd48baaa1d1bce3d0d0139b8ffe55370fabe672)
now targets SQL:2011 now targets SQL:2011
update to ghc 7.8.2
remove dependency on haskell-src-exts remove dependency on haskell-src-exts
derive Data and Typeable in all the syntax types derive Data and Typeable in all the syntax types
improve the error messages a great deal improve the error messages a great deal

6
simple-sql-parser.cabal
View file

@ -35,7 +35,7 @@ library
other-extensions: TupleSections other-extensions: TupleSections
build-depends: base >=4.6 && <4.8, build-depends: base >=4.6 && <4.8,
parsec >=3.1 && <3.2, parsec >=3.1 && <3.2,
mtl >=2.1 && <2.2, mtl >=2.1 && <2.3,
pretty >= 1.1 && < 1.2 pretty >= 1.1 && < 1.2
-- hs-source-dirs: -- hs-source-dirs:
default-language: Haskell2010 default-language: Haskell2010
@ -48,7 +48,7 @@ Test-Suite Tests
hs-source-dirs: .,tools hs-source-dirs: .,tools
Build-Depends: base >=4.6 && <4.8, Build-Depends: base >=4.6 && <4.8,
parsec >=3.1 && <3.2, parsec >=3.1 && <3.2,
mtl >=2.1 && <2.2, mtl >=2.1 && <2.3,
pretty >= 1.1 && < 1.2, pretty >= 1.1 && < 1.2,
HUnit >= 1.2 && < 1.3, HUnit >= 1.2 && < 1.3,
@ -83,7 +83,7 @@ executable SQLIndent
hs-source-dirs: .,tools hs-source-dirs: .,tools
Build-Depends: base >=4.6 && <4.8, Build-Depends: base >=4.6 && <4.8,
parsec >=3.1 && <3.2, parsec >=3.1 && <3.2,
mtl >=2.1 && <2.2, mtl >=2.1 && <2.3,
pretty >= 1.1 && < 1.2 pretty >= 1.1 && < 1.2
other-extensions: TupleSections,DeriveDataTypeable other-extensions: TupleSections,DeriveDataTypeable
default-language: Haskell2010 default-language: Haskell2010