Merge branch 'master' into persistent-sqlite-conn-pool-config

yesodweb · Dec 7, 2023 · fcbf875 · fcbf875
2 parents 043d38a + e2fb8d4
commit fcbf875
Show file tree

Hide file tree

Showing 6 changed files with 37,995 additions and 16,756 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -90,6 +90,4 @@ jobs:
       - run: cabal v2-build all --disable-optimization $CONFIG
       - run: cabal v2-test all --disable-optimization $CONFIG --test-options "--fail-on-focus"
       - run: cabal v2-bench all --disable-optimization $CONFIG
-      - run: cabal v2-haddock all $CONFIG
-        continue-on-error: true
       - run: cabal v2-sdist all
diff --git a/persistent-sqlite/ChangeLog.md b/persistent-sqlite/ChangeLog.md
@@ -8,6 +8,8 @@
       Using ConnectionPoolConfig, it is possible to set the connection idle timeout.
 * [#1486](https://github.com/yesodweb/persistent/pull/1486)
     * Add Database.Sqlite.open' which takes a ByteString
+* [#1522](https://github.com/yesodweb/persistent/pull/1522)
+    * Update the sqlite amalgamation to 3.43.1
 
 ## 2.13.2.0
 

diff --git a/persistent-sqlite/Database/Sqlite.hs b/persistent-sqlite/Database/Sqlite.hs
@@ -241,7 +241,9 @@ openError path' = do
 open :: Text -> IO Connection
 open path = open' (encodeUtf8 path)
 
--- @since 2.13.2.0
+-- |  Like 'open', but accepts a 'ByteString' instead of a 'Text'.
+--
+-- @since 2.13.3.0
 open' :: BS.ByteString -> IO Connection
 open' path = do
   databaseOrError <- openError path