From b3333b04bcf5620c2f31798a73de0b1d73154d73 Mon Sep 17 00:00:00 2001 From: Jake Wheat Date: Tue, 12 Jul 2016 09:53:24 +0300 Subject: [PATCH 1/7] update dependencies so it works with ghc 8 --- simple-sql-parser.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/simple-sql-parser.cabal b/simple-sql-parser.cabal index d071205..6f35b4c 100644 --- a/simple-sql-parser.cabal +++ b/simple-sql-parser.cabal @@ -33,7 +33,7 @@ library Other-Modules: Language.SQL.SimpleSQL.Errors, Language.SQL.SimpleSQL.Combinators other-extensions: TupleSections - build-depends: base >=4.5 && <4.9, + build-depends: base, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2 @@ -46,12 +46,12 @@ Test-Suite Tests type: exitcode-stdio-1.0 main-is: RunTests.lhs hs-source-dirs: .,tools - Build-Depends: base >=4.5 && <4.9, + Build-Depends: base, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2, - HUnit >= 1.2 && < 1.3, + HUnit >= 1.2 && < 1.4, test-framework >= 0.8 && < 0.9, test-framework-hunit >= 0.3 && < 0.4 @@ -82,7 +82,7 @@ Test-Suite Tests executable SQLIndent main-is: SQLIndent.lhs hs-source-dirs: .,tools - Build-Depends: base >=4.5 && <4.9, + Build-Depends: base, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2 From 6f42a4866a4b7e0b042c99deea74fb8865c9b88e Mon Sep 17 00:00:00 2001 From: Jake Wheat Date: Tue, 12 Jul 2016 09:55:04 +0300 Subject: [PATCH 2/7] update version to 0.4.2 --- simple-sql-parser.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-sql-parser.cabal b/simple-sql-parser.cabal index 6f35b4c..f68bc58 100644 --- a/simple-sql-parser.cabal +++ b/simple-sql-parser.cabal @@ -1,5 +1,5 @@ name: simple-sql-parser -version: 0.4.1 +version: 0.4.2 synopsis: A parser for SQL queries description: A parser for SQL queries. Parses most SQL:2011 From efcb0f78d10b8cd8f3eda269a8c2232c26dedb73 Mon Sep 17 00:00:00 2001 From: Jake Wheat Date: Tue, 12 Jul 2016 09:58:34 +0300 Subject: [PATCH 3/7] add dependencies back to base --- simple-sql-parser.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simple-sql-parser.cabal b/simple-sql-parser.cabal index f68bc58..c386281 100644 --- a/simple-sql-parser.cabal +++ b/simple-sql-parser.cabal @@ -33,7 +33,7 @@ library Other-Modules: Language.SQL.SimpleSQL.Errors, Language.SQL.SimpleSQL.Combinators other-extensions: TupleSections - build-depends: base, + build-depends: base >=4.5 && <4.10, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2 @@ -46,7 +46,7 @@ Test-Suite Tests type: exitcode-stdio-1.0 main-is: RunTests.lhs hs-source-dirs: .,tools - Build-Depends: base, + Build-Depends: base >=4.5 && <4.10, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2, @@ -82,7 +82,7 @@ Test-Suite Tests executable SQLIndent main-is: SQLIndent.lhs hs-source-dirs: .,tools - Build-Depends: base, + Build-Depends: base >=4.5 && <4.10, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2 From 57e500432840c13c07d4a018225888ea82c72827 Mon Sep 17 00:00:00 2001 From: Jake Wheat Date: Tue, 27 Jun 2017 23:07:56 +0300 Subject: [PATCH 4/7] update dependencies --- README | 4 ++-- simple-sql-parser.cabal | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index f1e497f..163969b 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ A parser for SQL queries in Haskell. -Homepage: http://jakewheat.github.io/simple-sql-parser/ +Homepage: http://jakewheat.github.io/simple-sql-parser/latest -Contact: jakewheatmail@gmail.com \ No newline at end of file +Contact: jakewheatmail@gmail.com diff --git a/simple-sql-parser.cabal b/simple-sql-parser.cabal index c386281..1d3a16e 100644 --- a/simple-sql-parser.cabal +++ b/simple-sql-parser.cabal @@ -1,12 +1,12 @@ name: simple-sql-parser -version: 0.4.2 +version: 0.4.3 synopsis: A parser for SQL queries description: A parser for SQL queries. Parses most SQL:2011 queries. Please see the homepage for more information - . + . -homepage: http://jakewheat.github.io/simple-sql-parser/ +homepage: http://jakewheat.github.io/simple-sql-parser/latest license: BSD3 license-file: LICENSE author: Jake Wheat @@ -33,7 +33,7 @@ library Other-Modules: Language.SQL.SimpleSQL.Errors, Language.SQL.SimpleSQL.Combinators other-extensions: TupleSections - build-depends: base >=4.5 && <4.10, + build-depends: base , parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2 @@ -46,12 +46,12 @@ Test-Suite Tests type: exitcode-stdio-1.0 main-is: RunTests.lhs hs-source-dirs: .,tools - Build-Depends: base >=4.5 && <4.10, + Build-Depends: base , parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2, - HUnit >= 1.2 && < 1.4, + HUnit >= 1.2 && < 1.7, test-framework >= 0.8 && < 0.9, test-framework-hunit >= 0.3 && < 0.4 @@ -82,7 +82,7 @@ Test-Suite Tests executable SQLIndent main-is: SQLIndent.lhs hs-source-dirs: .,tools - Build-Depends: base >=4.5 && <4.10, + Build-Depends: base, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2 From 67282108c9d08dd8b691aef2bd4196013e896bb9 Mon Sep 17 00:00:00 2001 From: Jake Wheat Date: Wed, 2 Aug 2017 22:32:39 +0300 Subject: [PATCH 5/7] add base version in cabal file for hackage --- simple-sql-parser.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simple-sql-parser.cabal b/simple-sql-parser.cabal index 1d3a16e..a73eaa3 100644 --- a/simple-sql-parser.cabal +++ b/simple-sql-parser.cabal @@ -33,7 +33,7 @@ library Other-Modules: Language.SQL.SimpleSQL.Errors, Language.SQL.SimpleSQL.Combinators other-extensions: TupleSections - build-depends: base , + build-depends: base >=4 && <5, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2 @@ -46,7 +46,7 @@ Test-Suite Tests type: exitcode-stdio-1.0 main-is: RunTests.lhs hs-source-dirs: .,tools - Build-Depends: base , + Build-Depends: base >=4 && <5, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2, @@ -82,7 +82,7 @@ Test-Suite Tests executable SQLIndent main-is: SQLIndent.lhs hs-source-dirs: .,tools - Build-Depends: base, + Build-Depends: base >=4 && <5, parsec >=3.1 && <3.2, mtl >=2.1 && <2.3, pretty >= 1.1 && < 1.2 From aafe06da7c33782c5bf2896211d482c04bba9bea Mon Sep 17 00:00:00 2001 From: Jake Wheat Date: Wed, 2 Aug 2017 22:33:18 +0300 Subject: [PATCH 6/7] add backported Makefile --- Makefile | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..7a94a8a --- /dev/null +++ b/Makefile @@ -0,0 +1,30 @@ + +# quick makefile to document how to do the various tasks + +# there is no real reason to actually use the makefile except for a +# very small amount of convenience + +.PHONY : init +init : + cabal sandbox init + cabal install happy + cabal install --only-dependencies --enable-tests + cabal configure --enable-tests + +.PHONY : build +build : + cabal build + +.PHONY : test +test : build + dist/build/Tests/Tests --hide-successes + +.PHONY : website +website : + website/make_website.sh + +.PHONY : clean +clean : + cabal clean + cabal sandbox delete + rm -Rf build/ From 2b9f32f2a1034b7f22495de6e2d9e4094e6c79a2 Mon Sep 17 00:00:00 2001 From: Jake Wheat Date: Sat, 5 Aug 2017 11:53:47 +0300 Subject: [PATCH 7/7] update changelog --- changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index f063991..3623169 100644 --- a/changelog +++ b/changelog @@ -1,7 +1,8 @@ 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.3 + tested with ghc 8.0.2 and 8.2.1 0.4.1 (commit TBD) tested with ghc 7.4.2, 7.6.3, 7.8.4,7.10.0.20150123 simple demonstration of how dialects could be handled internally