Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-persistent-sqlite for
openSUSE:Factory checked in at 2022-02-11 23:09:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-persistent-sqlite (Old)
and /work/SRC/openSUSE:Factory/.ghc-persistent-sqlite.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-persistent-sqlite"
Fri Feb 11 23:09:27 2022 rev:9 rq:953510 version:2.13.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-persistent-sqlite/ghc-persistent-sqlite.changes
2021-06-01 10:40:47.337152924 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-persistent-sqlite.new.1956/ghc-persistent-sqlite.changes
2022-02-11 23:11:22.995288488 +0100
@@ -1,0 +2,15 @@
+Sat Jan 29 00:05:57 UTC 2022 - Peter Simons <psim...@suse.com>
+
+- Update persistent-sqlite to version 2.13.1.0.
+ ## 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/)
+
+-------------------------------------------------------------------
Old:
----
persistent-sqlite-2.13.0.3.tar.gz
New:
----
persistent-sqlite-2.13.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-persistent-sqlite.spec ++++++
--- /var/tmp/diff_new_pack.BYfUrP/_old 2022-02-11 23:11:23.987291357 +0100
+++ /var/tmp/diff_new_pack.BYfUrP/_new 2022-02-11 23:11:23.991291369 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-persistent-sqlite
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name persistent-sqlite
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 2.13.0.3
+Version: 2.13.1.0
Release: 0
Summary: Backend for the persistent library using sqlite3
License: MIT
++++++ persistent-sqlite-2.13.0.3.tar.gz -> persistent-sqlite-2.13.1.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/persistent-sqlite-2.13.0.3/ChangeLog.md
new/persistent-sqlite-2.13.1.0/ChangeLog.md
--- old/persistent-sqlite-2.13.0.3/ChangeLog.md 2021-05-27 17:30:35.000000000
+0200
+++ new/persistent-sqlite-2.13.1.0/ChangeLog.md 2022-01-29 01:05:29.000000000
+0100
@@ -1,5 +1,16 @@
# 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/)
+
## 2.13.0.3
* Somehow failed to properly release the safe-to-remove changes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/persistent-sqlite-2.13.0.3/Database/Persist/Sqlite.hs
new/persistent-sqlite-2.13.1.0/Database/Persist/Sqlite.hs
--- old/persistent-sqlite-2.13.0.3/Database/Persist/Sqlite.hs 2021-05-24
21:14:59.000000000 +0200
+++ new/persistent-sqlite-2.13.1.0/Database/Persist/Sqlite.hs 2022-01-29
01:01:38.000000000 +0100
@@ -60,40 +60,56 @@
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
+#endif
import Data.Aeson.Types (modifyFailure)
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
@@ -269,7 +285,7 @@
Sqlite.reset conn stmt
Sqlite.finalize stmt
- smap <- newIORef $ Map.empty
+ smap <- newIORef mempty
return $
setConnMaxParams 999 $
setConnPutManySql putManySql $
@@ -456,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
@@ -728,13 +744,18 @@
instance FromJSON SqliteConf where
parseJSON v = modifyFailure ("Persistent: error loading Sqlite conf: " ++)
$ flip (withObject "SqliteConf") v parser where
- parser o = if HashMap.member "database" o
+ parser o = if "database" `isMember` o
then SqliteConf
<$> o .: "database"
<*> o .: "poolsize"
else SqliteConfInfo
<$> o .: "connInfo"
<*> o .: "poolsize"
+#if MIN_VERSION_aeson(2,0,0)
+ isMember = KeyMap.member
+#else
+ isMember = HashMap.member
+#endif
instance PersistConfig SqliteConf where
type PersistConfigBackend SqliteConf = SqlPersistT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/persistent-sqlite-2.13.0.3/persistent-sqlite.cabal
new/persistent-sqlite-2.13.1.0/persistent-sqlite.cabal
--- old/persistent-sqlite-2.13.0.3/persistent-sqlite.cabal 2021-05-27
17:30:38.000000000 +0200
+++ new/persistent-sqlite-2.13.1.0/persistent-sqlite.cabal 2022-01-29
01:01:38.000000000 +0100
@@ -1,5 +1,5 @@
name: persistent-sqlite
-version: 2.13.0.3
+version: 2.13.1.0
license: MIT
license-file: LICENSE
author: Michael Snoyman <mich...@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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/persistent-sqlite-2.13.0.3/test/main.hs
new/persistent-sqlite-2.13.1.0/test/main.hs
--- old/persistent-sqlite-2.13.0.3/test/main.hs 2021-05-27 16:26:58.000000000
+0200
+++ new/persistent-sqlite-2.13.1.0/test/main.hs 2021-06-29 16:23:53.000000000
+0200
@@ -1,18 +1,18 @@
-{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE StandaloneDeriving #-}
-{-# LANGUAGE DerivingStrategies #-}
{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
import SqliteInit
@@ -21,21 +21,23 @@
import qualified CustomPersistFieldTest
import qualified CustomPrimaryKeyReferenceTest
import qualified DataTypeTest
-import qualified EmptyEntityTest
import qualified EmbedOrderTest
import qualified EmbedTest
+import qualified EmptyEntityTest
import qualified EquivalentTypeTest
import qualified ForeignKey
+import qualified GeneratedColumnTestSQL
import qualified HtmlTest
import qualified LargeNumberTest
+import qualified LongIdentifierTest
import qualified MaxLenTest
-import qualified MpsNoPrefixTest
-import qualified MpsCustomPrefixTest
+import qualified MaybeFieldDefsTest
import qualified MigrationColumnLengthTest
import qualified MigrationOnlyTest
-import qualified PersistentTest
-import qualified GeneratedColumnTestSQL
+import qualified MpsCustomPrefixTest
+import qualified MpsNoPrefixTest
import qualified PersistUniqueTest
+import qualified PersistentTest
import qualified PrimaryTest
import qualified RawSqlTest
import qualified ReadWriteTest
@@ -45,15 +47,14 @@
import qualified TransactionLevelTest
import qualified UniqueTest
import qualified UpsertTest
-import qualified LongIdentifierTest
-import Control.Exception (handle, IOException, throwIO)
+import Control.Exception (IOException, handle, throwIO)
import Control.Monad.Catch (catch)
import Control.Monad.IO.Class (liftIO)
import Control.Monad.Reader (MonadReader)
import Control.Monad.Trans.Resource (MonadResource)
import qualified Data.ByteString as BS
-import Data.Conduit ((.|), runConduit)
+import Data.Conduit (runConduit, (.|))
import qualified Data.Conduit.List as CL
import Data.Fixed
import Data.IntMap (IntMap)
@@ -62,9 +63,9 @@
import Filesystem (removeFile)
import Filesystem.Path.CurrentOS (fromText)
import qualified Lens.Micro as Lens
-import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
import System.IO (hClose)
import System.IO.Temp (withSystemTempFile)
+import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
import Database.Persist.Sqlite
import qualified Database.Sqlite as Sqlite
@@ -160,6 +161,7 @@
, LargeNumberTest.numberMigrate
, UniqueTest.uniqueMigrate
, MaxLenTest.maxlenMigrate
+ , MaybeFieldDefsTest.maybeFieldDefMigrate
, Recursive.recursiveMigrate
, CompositeTest.compositeMigrate
, MigrationTest.migrationMigrate
@@ -206,6 +208,7 @@
LargeNumberTest.specsWith db
UniqueTest.specsWith db
MaxLenTest.specsWith db
+ MaybeFieldDefsTest.specsWith db
Recursive.specsWith db
SumTypeTest.specsWith db (Just (runMigrationSilent
SumTypeTest.sumTypeMigrate))
MigrationOnlyTest.specsWith db
