persistent-sqlite 2.13.0.4 → 2.13.1.0

raw patch · 3 files changed

+32/−12 lines, 3 filesdep ~persistent

Dependency ranges changed: persistent

Files

• ChangeLog.md +7/−0
• Database/Persist/Sqlite.hs +23/−10
• persistent-sqlite.cabal +2/−2

@@ -1,5 +1,12 @@ # Changelog for persistent-sqlite +## 2.13.1.0++* [#1341](https://github.com/yesodweb/persistent/pull/1341)+    * Add `SqlBackendHooks` to allow for instrumentation of queries.+* [#1327](https://github.com/yesodweb/persistent/pull/1327)+    * Update backend to support new `StatementCache` interface+ ## 2.13.0.4  * `aeson-2.0` support [#1351](https://github.com/yesodweb/persistent/pull/1351/)

@@ -60,17 +60,30 @@ import Control.Concurrent (threadDelay) import qualified Control.Exception as E import Control.Monad (forM_)-import Control.Monad.IO.Unlift (MonadIO (..), MonadUnliftIO, askRunInIO, withRunInIO, withUnliftIO, unliftIO, withRunInIO)-import Control.Monad.Logger (NoLoggingT, runNoLoggingT, MonadLoggerIO, logWarn, runLoggingT, askLoggerIO)+import Control.Monad.IO.Unlift+       ( MonadIO(..)+       , MonadUnliftIO+       , askRunInIO+       , unliftIO+       , withRunInIO+       , withUnliftIO+       )+import Control.Monad.Logger+       ( MonadLoggerIO+       , NoLoggingT+       , askLoggerIO+       , logWarn+       , runLoggingT+       , runNoLoggingT+       ) import Control.Monad.Reader (MonadReader)-import Control.Monad.Trans.Resource (MonadResource) import Control.Monad.Trans.Reader (ReaderT, runReaderT)+import Control.Monad.Trans.Resource (MonadResource) #if !MIN_VERSION_base(4,12,0) import Control.Monad.Trans.Reader (withReaderT) #endif import Control.Monad.Trans.Writer (runWriterT) import Data.Acquire (Acquire, mkAcquire, with)-import Data.Maybe import Data.Aeson #if MIN_VERSION_aeson(2,0,0) import qualified Data.Aeson.KeyMap as KeyMap@@ -79,24 +92,24 @@ import Data.Conduit import qualified Data.Conduit.Combinators as C import qualified Data.Conduit.List as CL+import Data.Foldable (toList) import qualified Data.HashMap.Lazy as HashMap import Data.Int (Int64)-import Data.IORef-import qualified Data.Map as Map+import Data.IORef (newIORef)+import Data.Maybe import Data.Pool (Pool) import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.IO as TIO import Lens.Micro.TH (makeLenses) import UnliftIO.Resource (ResourceT, runResourceT)-import Data.Foldable (toList)  #if MIN_VERSION_base(4,12,0) import Database.Persist.Compatible #endif import Database.Persist.Sql-import Database.Persist.SqlBackend import qualified Database.Persist.Sql.Util as Util+import Database.Persist.SqlBackend import qualified Database.Sqlite as Sqlite  @@ -272,7 +285,7 @@         Sqlite.reset conn stmt         Sqlite.finalize stmt -    smap <- newIORef $ Map.empty+    smap <- newIORef mempty     return $         setConnMaxParams 999 $         setConnPutManySql putManySql $@@ -459,7 +472,7 @@ -- with the difference that an actual database isn't needed for it. mockMigration :: Migration -> IO () mockMigration mig = do-    smap <- newIORef $ Map.empty+    smap <- newIORef mempty     let sqlbackend =             setConnMaxParams 999 $             mkSqlBackend MkSqlBackendArgs

@@ -1,5 +1,5 @@ name:            persistent-sqlite-version:         2.13.0.4+version:         2.13.1.0 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -44,7 +44,7 @@  library     build-depends:   base                    >= 4.9         && < 5-                   , persistent              >= 2.13        && < 3+                   , persistent              >= 2.13.3      && < 3                    , aeson                   >= 1.0                    , bytestring              >= 0.10                    , conduit                 >= 1.2.12