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

fix website generation, update stack, a few small tweaks

Browse source
This commit is contained in:
Jake Wheat 2024-10-07 12:17:25 +01:00
parent 6805383774
commit bd85f2ba74
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -32,7 +32,7 @@ parserexe :
cabal build -fparserexe SimpleSQLParserTool cabal build -fparserexe SimpleSQLParserTool
.PHONY : all .PHONY : all
all : build test parserexe website all : build test parserexe
############################################### ###############################################

2
release_checklist
View file

@ -43,7 +43,7 @@ ghcup install stack [latest from the list on stackage.org]
stack test stack test
~~~~ ~~~~
Run the tests on the previous 2 ghcs latest point releases, and the latest ghc, each with the latest cabal-install they support (e.g. as of the start of 2024, these three ghc versions are 9.8.1, 9.6.4, 9.4.8). This is now trivial to do with ghcup, amazing progress in Haskell tools in recent years. Run the tests on the previous 2 ghcs latest point releases, and the latest ghc, each with the latest cabal-install they support (e.g. as of October 2024, these three ghc versions are 9.10.1, 9.8.2, 9.6.6). This is now trivial to do with ghcup, amazing progress in Haskell tools in recent years.
Build the release tarball, run a test with an example using this tarball: Build the release tarball, run a test with an example using this tarball:

4
simple-sql-parser.cabal
View file

@ -29,10 +29,6 @@ Flag parserexe
Description: Build SimpleSQLParserTool exe Description: Build SimpleSQLParserTool exe
Default: False Default: False
Flag testexe
Description: Build Testing exe
Default: False
common shared-properties common shared-properties
default-language: Haskell2010 default-language: Haskell2010
build-depends: base >=4 && <5, build-depends: base >=4 && <5,

2
stack.yaml
View file

@ -1,7 +1,7 @@
# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
resolver: lts-22.5 resolver: lts-22.37
# Local packages, usually specified by relative directory name # Local packages, usually specified by relative directory name
packages: packages:

8
stack.yaml.lock
View file

@ -13,7 +13,7 @@ packages:
hackage: megaparsec-9.6.1 hackage: megaparsec-9.6.1
snapshots: snapshots:
- completed: - completed:
sha256: 90e6fcdcf6706918ef022ab01214828c550ee637a2d50f4fe96b15742b8bced1 sha256: c6274f9587d6bf40b6aaa7d1092684c37a2d8bb1e0df999ae0e2b755db15682d
size: 714102 size: 720026
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/5.yaml url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/37.yaml
original: lts-22.5 original: lts-22.37

3
website/RenderTestCases.hs
View file

@ -41,7 +41,8 @@ doc _ (LexTest d str _ _) =
doc _ (LexFails d str _) = doc _ (LexFails d str _) =
[Row (L.fromStrict str) (showResultL $ L.lexSQL d False "" Nothing str)] [Row (L.fromStrict str) (showResultL $ L.lexSQL d False "" Nothing str)]
doc _ (GeneralParseFailTest {}) = [] doc _ (GeneralParseFailTest {}) = []
-- todo: find some way to render error message examples in a readable way
doc _ (GoldenErrorTest {}) = []
showResult :: Show a => Either P.ParseError a -> L.Text showResult :: Show a => Either P.ParseError a -> L.Text
showResult = either (("Left\n" <>) . L.fromStrict . P.prettyError) (L.pack . ppShow) showResult = either (("Left\n" <>) . L.fromStrict . P.prettyError) (L.pack . ppShow)

3
website/render-test-cases.cabal
View file

@ -18,6 +18,8 @@ executable RenderTestCases
pretty-show, pretty-show,
hspec-expectations, hspec-expectations,
raw-strings-qq, raw-strings-qq,
hspec-golden,
filepath,
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wall -O0 ghc-options: -Wall -O0
@ -38,6 +40,7 @@ executable RenderTestCases
Language.SQL.SimpleSQL.Pretty Language.SQL.SimpleSQL.Pretty
Language.SQL.SimpleSQL.QueryExprComponents Language.SQL.SimpleSQL.QueryExprComponents
Language.SQL.SimpleSQL.QueryExprs Language.SQL.SimpleSQL.QueryExprs
Language.SQL.SimpleSQL.QueryExprParens
Language.SQL.SimpleSQL.SQL2011AccessControl Language.SQL.SimpleSQL.SQL2011AccessControl
Language.SQL.SimpleSQL.SQL2011Bits Language.SQL.SimpleSQL.SQL2011Bits
Language.SQL.SimpleSQL.SQL2011DataManipulation Language.SQL.SimpleSQL.SQL2011DataManipulation