Browse Source

update versions and tidy build

change version to 0.6.0 to avoid collisions with sqream versions
fix a few warnings
update a few dependencies versions
update the stack build to lts-5.13
Jake Wheat 3 years ago
parent
commit
5f7ff2c64e

+ 1
- 1
Makefile View File

@@ -215,7 +215,7 @@ website-haddock : $(shell find hssqlppp hssqlppp-th -iname '*hs')
215 215
 	stack install hscolour
216 216
 	stack haddock hssqlppp hssqlppp-th
217 217
 	# todo: how to find the right dir automatically
218
-	cp -R .stack-work/install/x86_64-linux/lts-5.1/7.10.3/doc/* build/website/haddock/
218
+	cp -R .stack-work/install/x86_64-linux/lts-5.13/7.10.3/doc/* build/website/haddock/
219 219
 
220 220
 
221 221
 # generate a diagram of the hssqlppp package internal module dependencies

+ 1
- 1
build-extras/hssqlppp-build-extras.cabal View File

@@ -1,5 +1,5 @@
1 1
 Name:                hssqlppp-build-extras
2
-Version:             0.5.26
2
+Version:             0.6.0
3 3
 Build-Type:          Simple
4 4
 Cabal-Version:       >=1.10
5 5
 

+ 30
- 25
examples/hssqlppp-examples.cabal View File

@@ -1,5 +1,5 @@
1 1
 Name:                hssqlppp-examples
2
-Version:             0.5.26
2
+Version:             0.6.0
3 3
 Build-Type:          Simple
4 4
 Cabal-Version:       >=1.10
5 5
 
@@ -11,8 +11,8 @@ executable FixSqlServerTpchSyntax
11 11
   build-depends:       base >= 4 && < 5,
12 12
                        uniplate >= 1.6 && < 1.7,
13 13
                        text >= 0.11.1.13 && < 1.3,
14
-                       hssqlppp == 0.5.26,
15
-                       hssqlppp-th == 0.5.26
14
+                       hssqlppp == 0.6.0,
15
+                       hssqlppp-th == 0.6.0
16 16
   default-language:    Haskell2010
17 17
   ghc-options:         -Wall
18 18
 
@@ -23,8 +23,8 @@ executable Lex
23 23
                        uniplate >= 1.6 && < 1.7,
24 24
                        text >= 0.11.1.13 && < 1.3,
25 25
                        pretty-show >= 1.6 && < 1.7,
26
-                       hssqlppp == 0.5.26,
27
-                       hssqlppp-th == 0.5.26
26
+                       hssqlppp == 0.6.0,
27
+                       hssqlppp-th == 0.6.0
28 28
   default-language:    Haskell2010
29 29
   ghc-options:         -Wall
30 30
 
@@ -39,8 +39,8 @@ executable MakeSelect
39 39
   build-depends:       base >= 4 && < 5,
40 40
                        uniplate >= 1.6 && < 1.7,
41 41
                        text >= 0.11.1.13 && < 1.3,
42
-                       hssqlppp == 0.5.26,
43
-                       hssqlppp-th == 0.5.26
42
+                       hssqlppp == 0.6.0,
43
+                       hssqlppp-th == 0.6.0
44 44
   default-language:    Haskell2010
45 45
   ghc-options:         -Wall
46 46
 
@@ -51,8 +51,8 @@ executable PPPTest
51 51
                        text >= 0.11.1.13 && < 1.3,
52 52
                        Diff >= 0.3 && < 0.4,
53 53
                        pretty-show >= 1.6 && < 1.7,
54
-                       hssqlppp == 0.5.26,
55
-                       hssqlppp-th == 0.5.26
54
+                       hssqlppp == 0.6.0,
55
+                       hssqlppp-th == 0.6.0
56 56
   default-language:    Haskell2010
57 57
   ghc-options:         -Wall
58 58
 
@@ -61,8 +61,8 @@ executable Parse
61 61
   build-depends:       base >= 4 && < 5,
62 62
                        uniplate >= 1.6 && < 1.7,
63 63
                        text >= 0.11.1.13 && < 1.3,
64
-                       hssqlppp == 0.5.26,
65
-                       hssqlppp-th == 0.5.26
64
+                       hssqlppp == 0.6.0,
65
+                       hssqlppp-th == 0.6.0
66 66
   default-language:    Haskell2010
67 67
   ghc-options:         -Wall
68 68
 
@@ -73,8 +73,8 @@ executable Parse2
73 73
                        text >= 0.11.1.13 && < 1.3,
74 74
                        pretty-show >= 1.6 && < 1.7,
75 75
                        haskell-src-exts >= 1.13 && < 1.18,
76
-                       hssqlppp == 0.5.26,
77
-                       hssqlppp-th == 0.5.26
76
+                       hssqlppp == 0.6.0,
77
+                       hssqlppp-th == 0.6.0
78 78
   other-modules:       GroomUtils
79 79
   default-language:    Haskell2010
80 80
   ghc-options:         -Wall
@@ -86,8 +86,8 @@ executable Parse3
86 86
                        text >= 0.11.1.13 && < 1.3,
87 87
                        pretty-show >= 1.6 && < 1.7,
88 88
                        haskell-src-exts >= 1.13 && < 1.18,
89
-                       hssqlppp == 0.5.26,
90
-                       hssqlppp-th == 0.5.26
89
+                       hssqlppp == 0.6.0,
90
+                       hssqlppp-th == 0.6.0
91 91
   other-modules:       GroomUtils
92 92
   default-language:    Haskell2010
93 93
   ghc-options:         -Wall
@@ -97,8 +97,8 @@ executable QQ
97 97
   build-depends:       base >= 4 && < 5,
98 98
                        uniplate >= 1.6 && < 1.7,
99 99
                        text >= 0.11.1.13 && < 1.3,
100
-                       hssqlppp == 0.5.26,
101
-                       hssqlppp-th == 0.5.26
100
+                       hssqlppp == 0.6.0,
101
+                       hssqlppp-th == 0.6.0
102 102
   default-language:    Haskell2010
103 103
   ghc-options:         -Wall
104 104
 
@@ -107,8 +107,8 @@ executable Reformat
107 107
   build-depends:       base >= 4 && < 5,
108 108
                        uniplate >= 1.6 && < 1.7,
109 109
                        text >= 0.11.1.13 && < 1.3,
110
-                       hssqlppp == 0.5.26,
111
-                       hssqlppp-th == 0.5.26
110
+                       hssqlppp == 0.6.0,
111
+                       hssqlppp-th == 0.6.0
112 112
   default-language:    Haskell2010
113 113
   ghc-options:         -Wall
114 114
 
@@ -118,8 +118,8 @@ executable ShowCatalog
118 118
                        uniplate >= 1.6 && < 1.7,
119 119
                        text >= 0.11.1.13 && < 1.3,
120 120
                        pretty-show >= 1.6 && < 1.7,
121
-                       hssqlppp == 0.5.26,
122
-                       hssqlppp-th == 0.5.26
121
+                       hssqlppp == 0.6.0,
122
+                       hssqlppp-th == 0.6.0
123 123
   default-language:    Haskell2010
124 124
   ghc-options:         -Wall
125 125
 
@@ -128,8 +128,8 @@ executable TypeCheck
128 128
   build-depends:       base >= 4 && < 5,
129 129
                        uniplate >= 1.6 && < 1.7,
130 130
                        text >= 0.11.1.13 && < 1.3,
131
-                       hssqlppp == 0.5.26,
132
-                       hssqlppp-th == 0.5.26
131
+                       hssqlppp == 0.6.0,
132
+                       hssqlppp-th == 0.6.0
133 133
   default-language:    Haskell2010
134 134
   ghc-options:         -Wall
135 135
 
@@ -138,8 +138,8 @@ executable TypeCheck2
138 138
   build-depends:       base >= 4 && < 5,
139 139
                        uniplate >= 1.6 && < 1.7,
140 140
                        text >= 0.11.1.13 && < 1.3,
141
-                       hssqlppp == 0.5.26,
142
-                       hssqlppp-th == 0.5.26
141
+                       hssqlppp == 0.6.0,
142
+                       hssqlppp-th == 0.6.0
143 143
   default-language:    Haskell2010
144 144
   ghc-options:         -Wall
145 145
 
@@ -148,8 +148,8 @@ executable TypeCheck2
148 148
 --   build-depends:       base >= 4 && < 5,
149 149
 --                        uniplate >= 1.6 && < 1.7,
150 150
 --                        text >= 0.11.1.13 && < 1.3,
151
+--                        hssqlppp == 0.6.0,
152
+--                        hssqlppp-th == 0.6.0
151 153
 --   default-language:    Haskell2010
152 154
 --   ghc-options:         -Wall
153 155
 
@@ -158,9 +158,9 @@ executable TypeCheck2
158 158
 --   build-depends:       base >= 4 && < 5,
159 159
 --                        uniplate >= 1.6 && < 1.7,
160 160
 --                        text >= 0.11.1.13 && < 1.3,
161
+--                        hssqlppp == 0.6.0,
162
+--                        hssqlppp-th == 0.6.0,
163
+--                        hssqlppp-pg == 0.6.0
161 164
 --   default-language:    Haskell2010
162 165
 --   ghc-options:         -Wall
163 166
 

+ 2
- 2
hssqlppp-pg/hssqlppp-pg.cabal View File

@@ -1,5 +1,5 @@
1 1
 Name:                hssqlppp-pg
2
-Version:             0.5.26
2
+Version:             0.6.0
3 3
 Synopsis:            Extra libraries for hssqlppp which depend on PostgreSQL
4 4
 License:             BSD3
5 5
 License-file:        LICENSE
@@ -29,7 +29,7 @@ source-repository head
29 29
 
30 30
 Library
31 31
   Build-Depends:     base >= 4 && < 5,
32
-                     hssqlppp == 0.5.26,
32
+                     hssqlppp == 0.6.0,
33 33
                      split,
34 34
                      postgresql-simple >= 0.4 && < 0.6,
35 35
                      template-haskell,

+ 3
- 3
hssqlppp-th/hssqlppp-th.cabal View File

@@ -1,5 +1,5 @@
1 1
 Name:                hssqlppp-th
2
-Version:             0.5.26
2
+Version:             0.6.0
3 3
 Synopsis:            hssqlppp extras which need template-haskell
4 4
 License:             BSD3
5 5
 License-file:        LICENSE
@@ -30,7 +30,7 @@ source-repository head
30 30
 Library
31 31
   Build-Depends:     base >= 4 && < 5,
32 32
                      template-haskell,
33
-                     hssqlppp == 0.5.26,
33
+                     hssqlppp == 0.6.0,
34 34
                      syb >= 0.1.0.2 && < 0.7,
35 35
                      text >= 0.11.1.13 && < 1.3
36 36
 
@@ -50,7 +50,7 @@ Test-Suite TestsTh
50 50
                        tasty-hunit >= 0.9 && < 0.10,
51 51
 
52 52
                        text >= 0.11.1.13 && < 1.3,
53
-                       hssqlppp == 0.5.26
53
+                       hssqlppp == 0.6.0
54 54
 
55 55
   Other-Modules:       Database.HsSqlPpp.Tests.QuasiQuoteTests
56 56
                        Database.HsSqlPpp.Quote

+ 3
- 3
hssqlppp/hssqlppp.cabal View File

@@ -1,5 +1,5 @@
1 1
 Name:                hssqlppp
2
-Version:             0.5.26
2
+Version:             0.6.0
3 3
 Synopsis:            SQL parser and type checker
4 4
 License:             BSD3
5 5
 License-file:        LICENSE
@@ -39,7 +39,7 @@ Library
39 39
                      syb >= 0.1.0.2 && < 0.7,
40 40
                      text >= 0.11.1.13 && < 1.3,
41 41
                      uniplate >= 1.6 && < 1.7,
42
-                     transformers >= 0.4 && < 0.6,
42
+                     transformers >= 0.3 && < 0.6,
43 43
                      pretty-show >= 1.6 && < 1.7
44 44
 
45 45
   hs-source-dirs:    src
@@ -101,7 +101,7 @@ Test-Suite Tests
101 101
                        tasty-hunit >= 0.9 && < 0.10,
102 102
                        text >= 0.11.1.13 && < 1.3,
103 103
                        uniplate >= 1.6 && < 1.7,
104
-                       transformers >= 0.4 && < 0.6,
104
+                       transformers >= 0.3 && < 0.6,
105 105
                        pretty-show >= 1.6 && < 1.7
106 106
 
107 107
                      -- rough start:

+ 1
- 1
hssqlppp/src/Database/HsSqlPpp/Catalog.lhs View File

@@ -41,7 +41,7 @@ Forward the public part of CatalogInternal.
41 41
 >     --,defaultTemplate1Catalog
42 42
 >     --,defaultTSQLCatalog
43 43
 >     --,odbcCatalog
44
->      -- * Catalog comparison
44
+>      -- -- * Catalog comparison
45 45
 >     --,CatalogDiff(..)
46 46
 >     --,compareCatalogs
47 47
 >     --,ppCatDiff

+ 25
- 1
hssqlppp/src/Database/HsSqlPpp/Internals/Catalog/CatalogNew.lhs View File

@@ -468,7 +468,29 @@ question: should the catalog manage the following:
468 468
 
469 469
 > -- | A catalog value containing nothing
470 470
 > emptyCatalog :: Catalog
471
-> emptyCatalog = Catalog {cRoles = S.empty}
471
+> emptyCatalog = Catalog {cRoles = S.empty
472
+>                        ,cSchemas = M.empty
473
+>                        ,cCharacterSets = M.empty
474
+>                        ,cCollations = M.empty
475
+>                        ,cSequences = M.empty
476
+>                        ,cTypeCategories = S.empty
477
+>                        ,cExternalTypes = S.empty
478
+>                        ,cCasts = S.empty
479
+>                        ,cFunctions = M.empty
480
+>                        ,cPrefixOps = M.empty
481
+>                        ,cPostfixOps = M.empty
482
+>                        ,cBinaryOps = M.empty
483
+>                        ,cSpecialOps = M.empty
484
+>                        ,cWindows = 0
485
+>                        ,cAggregates = 0
486
+>                        ,cTables = M.empty
487
+>                        ,cConstraints = 0
488
+>                        ,cDefaults = 0
489
+>                        ,cViews = M.empty
490
+>                        ,cDomainTypes = M.empty
491
+>                        ,cCompositeTypes = M.empty
492
+>                        ,cEnums = 0
493
+>                        }
472 494
 
473 495
 > updateCatalog :: CatalogUpdate -> Catalog -> Either CatError Catalog
474 496
 > updateCatalog (CreateRole r) c@(Catalog {cRoles = rs})
@@ -486,6 +508,8 @@ todo: cascade the rename
486 508
 >     | rn `S.member` rs = Left $ RoleAlreadyExists rn
487 509
 >     | otherwise = Right $ c {cRoles = S.insert rn $ S.delete r rs}
488 510
 
511
+> updateCatalog _ _ = error "update catalog not completed yet"
512
+
489 513
 
490 514
 > type RoleName = String
491 515
 

+ 2
- 2
hssqlppp/tests/Database/HsSqlPpp/Tests/TypeChecking/Catalog.lhs View File

@@ -7,9 +7,9 @@
7 7
 > import Database.HsSqlPpp.Tests.TestTypes
8 8
 > --import Database.HsSqlPpp.Internals.TypeChecking.Environment
9 9
 > --import Database.HsSqlPpp.Tests.TypeChecking.Utils
10
-> import qualified Data.Text.Lazy as T
10
+> --import qualified Data.Text.Lazy as T
11 11
 > import qualified Test.Tasty.HUnit as H
12
-> import qualified Data.Map as M
12
+> --import qualified Data.Map as M
13 13
 > import qualified Data.Set as S
14 14
 > import Control.Monad
15 15
 

+ 3
- 3
hssqlppp/tests/Database/HsSqlPpp/Tests/TypeChecking/QueryExprs.lhs View File

@@ -11,9 +11,9 @@ typechecks as well as correct queries compared to the old tests.
11 11
 > import Database.HsSqlPpp.Dialect
12 12
 > import Database.HsSqlPpp.Internals.TypesInternal
13 13
 > import Database.HsSqlPpp.Tests.TestTypes
14
-> import Database.HsSqlPpp.Internals.AstInternal as A
15
-> import Database.HsSqlPpp.Tests.Parsing.Utils
16
-> import qualified Data.Text as T
14
+> --import Database.HsSqlPpp.Internals.AstInternal as A
15
+> --import Database.HsSqlPpp.Tests.Parsing.Utils
16
+> --import qualified Data.Text as T
17 17
 > import qualified Data.Text.Lazy as L
18 18
 
19 19
 > queryExprs :: Item

+ 1
- 1
hssqlppp/tests/Database/HsSqlPpp/Tests/TypeChecking/TypeCheckTests.lhs View File

@@ -8,7 +8,7 @@
8 8
 
9 9
 
10 10
 > import Database.HsSqlPpp.Tests.TestTypes
11
-> import Database.HsSqlPpp.Tests.TypeChecking.AnsiScalarExprs
11
+> --import Database.HsSqlPpp.Tests.TypeChecking.AnsiScalarExprs
12 12
 > import Database.HsSqlPpp.Tests.TypeChecking.ScalarExprs
13 13
 > import Database.HsSqlPpp.Tests.TypeChecking.SimpleQueryExprs
14 14
 > import Database.HsSqlPpp.Tests.TypeChecking.Rewrites

+ 1
- 1
make-generated-website-files/MakeGeneratedWebsiteFiles.lhs View File

@@ -16,7 +16,7 @@ add some of the missing information to the output
16 16
 > import Database.HsSqlPpp.Tests.TypeChecking.TypeCheckTests as TT
17 17
 > --import Text.Show.Pretty
18 18
 > import qualified Data.Text.Lazy as L
19
-> import qualified Data.Text as T
19
+> --import qualified Data.Text as T
20 20
 > import Database.HsSqlPpp.Utils.GroomUtils
21 21
 > --import Control.Monad
22 22
 > import Language.Haskell.Exts hiding (String)

+ 1
- 1
make-generated-website-files/hssqlppp-make-generated-website-files.cabal View File

@@ -1,5 +1,5 @@
1 1
 Name:                hssqlppp-make-generated-website-files
2
-Version:             0.5.26
2
+Version:             0.6.0
3 3
 Build-Type:          Simple
4 4
 Cabal-Version:       >=1.10
5 5
 

+ 2
- 2
make-website/hssqlppp-make-website.cabal View File

@@ -1,5 +1,5 @@
1 1
 Name:                hssqlppp-make-website
2
-Version:             0.5.22
2
+Version:             0.6.0
3 3
 Build-Type:          Simple
4 4
 Cabal-Version:       >=1.10
5 5
 
@@ -47,7 +47,7 @@ executable MakeWebsite
47 47
                        haskell-src-exts >= 1.13 && < 1.18,
48 48
                        uniplate >= 1.6 && < 1.7,
49 49
                        -- parsec >= 3.1.2 && < 3.2,
50
-                       pandoc >= 1.15 && < 1.17,
50
+                       pandoc >= 1.15 && < 1.18,
51 51
                        -- pandoc-types >= 1.12 && < 1.13,
52 52
                        -- blaze-html >= 0.7 && < 0.8,
53 53
                        directory >= 1.2 && < 1.3,

+ 1
- 1
postprocess-uuagc/hssqlppp-postprocess-uuagc.cabal View File

@@ -1,5 +1,5 @@
1 1
 Name:                hssqlppp-postprocess-uuagc
2
-Version:             0.5.26
2
+Version:             0.6.0
3 3
 Build-Type:          Simple
4 4
 Cabal-Version:       >=1.10
5 5
 

+ 3
- 3
stack.yaml View File

@@ -1,7 +1,7 @@
1 1
 # For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
2 2
 
3 3
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4
-resolver: lts-5.1
4
+resolver: lts-5.13
5 5
 
6 6
 # Local packages, usually specified by relative directory name
7 7
 packages:
@@ -18,9 +18,9 @@ extra-deps: [uuagc-0.9.52.1
18 18
             ,uuagc-cabal-1.0.6.0
19 19
             ,uulib-0.9.22
20 20
             ,dotgen-0.4.2
21
-            ,graphmod-1.2.8]
21
+            ,graphmod-1.2.9]
22 22
 
23
-# Override default flag values for local packages and extra-deps
23
+# Override default flag values for local pbackages and extra-deps
24 24
 flags: {}
25 25
 
26 26
 # Extra package databases containing global packages

+ 4
- 4
website-source/index.asciidoc View File

@@ -8,10 +8,10 @@
8 8
 
9 9
 == Overview
10 10
 
11
-A parser and type checker for SQL written in Haskell. Targets the
12
-PostgreSQL dialect of SQL and PL/pgSQL syntax only. BSD licensed.
11
+A parser and type checker for SQL written in Haskell. Mainly targets
12
+the PostgreSQL dialect of SQL and PL/pgSQL syntax only. BSD licensed.
13 13
 
14
-This is the documentation for version 0.5.x. Documentation for other
14
+This is the documentation for version 0.6.x. Documentation for other
15 15
 versions is available here: http://jakewheat.github.io/hssqlppp/.
16 16
 
17 17
 If you just need a SQL parser, this is an updated project focused on
@@ -87,7 +87,7 @@ casts, tables, views and functions.
87 87
 
88 88
 == Installation
89 89
 
90
-This project is currently developed on GHC 7.10.2. It has also been
90
+This project is currently developed on GHC 7.10.3. It has also been
91 91
 tested recently with 7.8.4.
92 92
 
93 93
 To install use

Loading…
Cancel
Save