git.iko.soy/servant
on master help sign in
Merge pull request #1397 from akhesaCaro/compiling_sqlite_simple_cookbook
53e943bGaël Deest
cabal.project+1−4
compare with master
unifiedsplit
@@ -26,7 +26,7 @@ packages:
26 doc/cookbook/custom-errors
26 doc/cookbook/custom-errors
27 doc/cookbook/basic-streaming
27 doc/cookbook/basic-streaming
28 doc/cookbook/db-postgres-pool
28 doc/cookbook/db-postgres-pool
29− -- doc/cookbook/db-sqlite-simple
29+ doc/cookbook/db-sqlite-simple
30 doc/cookbook/file-upload
30 doc/cookbook/file-upload
31 doc/cookbook/generic
31 doc/cookbook/generic
32 -- doc/cookbook/hoist-server-with-context
32 -- doc/cookbook/hoist-server-with-context
@@ -54,9 +54,6 @@ constraints:
54constraints: base-compat ^>=0.11
54constraints: base-compat ^>=0.11
55constraints: semigroups ^>=0.19
55constraints: semigroups ^>=0.19
56
56
57−-- MonadFail
58−-- https://github.com/nurpax/sqlite-simple/issues/74
59−constraints: sqlite-simple < 0
60-- allow-newer: sqlite-simple-0.4.16.0:semigroups
57-- allow-newer: sqlite-simple-0.4.16.0:semigroups
61-- allow-newer: direct-sqlite-2.3.24:semigroups
58-- allow-newer: direct-sqlite-2.3.24:semigroups
62
59
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1
@@ -23,7 +23,7 @@ executable cookbook-db-sqlite-simple
23 , http-types >= 0.12
23 , http-types >= 0.12
24 , markdown-unlit >= 0.4
24 , markdown-unlit >= 0.4
25 , http-client >= 0.5
25 , http-client >= 0.5
26− , sqlite-simple >= 0.4
26+ , sqlite-simple >= 0.4.5.0
27 , transformers
27 , transformers
28 default-language: Haskell2010
28 default-language: Haskell2010
29 ghc-options: -Wall -pgmL markdown-unlit
29 ghc-options: -Wall -pgmL markdown-unlit
servant-docs/test/Servant/DocsSpec.hs+5−2
@@ -126,8 +126,11 @@ spec = describe "Servant.Docs" $ do
126 it "mentions headers" $ do
126 it "mentions headers" $ do
127 md `shouldContain` "- This endpoint is sensitive to the value of the **X-Test** HTTP header."
127 md `shouldContain` "- This endpoint is sensitive to the value of the **X-Test** HTTP header."
128
128
129− it "contains response samples" $
129+ it "contains response samples - dt1field1" $
130− md `shouldContain` "{\"dt1field1\":\"field 1\",\"dt1field2\":13}"
130+ md `shouldContain` "\"dt1field1\":\"field 1\""
131+ it "contains response samples - dt1field2" $
132+ md `shouldContain` "\"dt1field2\":13"
133+
131 it "contains request body samples" $
134 it "contains request body samples" $
132 md `shouldContain` "17"
135 md `shouldContain` "17"
133
136