From 7914898cc8f07bbaf8358d208469392346341964 Mon Sep 17 00:00:00 2001
From: Jake Wheat <jakewheatmail@gmail.com>
Date: Fri, 20 Jun 2014 12:27:23 +0300
Subject: [PATCH] update to accept latest mtl

---
 .gitignore                        | 4 +++-
 Language/SQL/SimpleSQL/Parser.lhs | 2 +-
 TODO                              | 6 ++++++
 changelog                         | 7 ++++++-
 simple-sql-parser.cabal           | 6 +++---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d3c086..fc9501b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /dist/
-/logchanges
\ No newline at end of file
+/logchanges
+/cabal.sandbox.config
+/.cabal-sandbox/
\ No newline at end of file
diff --git a/Language/SQL/SimpleSQL/Parser.lhs b/Language/SQL/SimpleSQL/Parser.lhs
index 8b7fe77..b7a7545 100644
--- a/Language/SQL/SimpleSQL/Parser.lhs
+++ b/Language/SQL/SimpleSQL/Parser.lhs
@@ -832,7 +832,7 @@ together.
 >           ,orderBy <* closeParen
 >            <**> (optionMaybe afilter <$$$$> aggAppWithoutDupe)]
 >      -- no valueExprs: duplicates and order by not allowed
->     ,([] <$ closeParen) <**> (window <|> withinGroup <|> pure (flip App))
+>     ,([] <$ closeParen) <**> option (flip App) (window <|> withinGroup)
 >     ]
 >   where
 >     aggAppWithoutDupeOrd n es f = AggregateApp n SQDefault es [] f
diff --git a/TODO b/TODO
index 6ec8106..432ddf6 100644
--- a/TODO
+++ b/TODO
@@ -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
 create a new module for generic combinators
 work on getting rid of monad and guard
diff --git a/changelog b/changelog
index f505bb5..282e517 100644
--- a/changelog
+++ b/changelog
@@ -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
+	update to ghc 7.8.2
 	remove dependency on haskell-src-exts
 	derive Data and Typeable in all the syntax types
 	improve the error messages a great deal
diff --git a/simple-sql-parser.cabal b/simple-sql-parser.cabal
index 2601d88..4051d2a 100644
--- a/simple-sql-parser.cabal
+++ b/simple-sql-parser.cabal
@@ -35,7 +35,7 @@ library
   other-extensions:    TupleSections
   build-depends:       base >=4.6 && <4.8,
                        parsec >=3.1 && <3.2,
-                       mtl >=2.1 && <2.2,
+                       mtl >=2.1 && <2.3,
                        pretty >= 1.1 && < 1.2
   -- hs-source-dirs:
   default-language:    Haskell2010
@@ -48,7 +48,7 @@ Test-Suite Tests
   hs-source-dirs:      .,tools
   Build-Depends:       base >=4.6 && <4.8,
                        parsec >=3.1 && <3.2,
-                       mtl >=2.1 && <2.2,
+                       mtl >=2.1 && <2.3,
                        pretty >= 1.1 && < 1.2,
 
                        HUnit >= 1.2 && < 1.3,
@@ -83,7 +83,7 @@ executable SQLIndent
   hs-source-dirs:      .,tools
   Build-Depends:       base >=4.6 && <4.8,
                        parsec >=3.1 && <3.2,
-                       mtl >=2.1 && <2.2,
+                       mtl >=2.1 && <2.3,
                        pretty >= 1.1 && < 1.2
   other-extensions:    TupleSections,DeriveDataTypeable
   default-language:    Haskell2010