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 2021-06-01 10:39:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-persistent-sqlite (Old) and /work/SRC/openSUSE:Factory/.ghc-persistent-sqlite.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-persistent-sqlite" Tue Jun 1 10:39:10 2021 rev:8 rq:896219 version:2.13.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-persistent-sqlite/ghc-persistent-sqlite.changes 2021-05-11 23:04:16.644925652 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-persistent-sqlite.new.1898/ghc-persistent-sqlite.changes 2021-06-01 10:40:47.337152924 +0200 @@ -1,0 +2,22 @@ +Thu May 27 17:15:25 UTC 2021 - psim...@suse.com + +- Update persistent-sqlite to version 2.13.0.3. + ## 2.13.0.3 + + * Somehow failed to properly release the safe-to-remove changes. + + ## 2.13.0.2 + + * [#1275](https://github.com/yesodweb/persistent/pull/1275) + * Fix SafeToRemove + +------------------------------------------------------------------- +Wed May 26 08:46:17 UTC 2021 - psim...@suse.com + +- Update persistent-sqlite to version 2.13.0.2. + ## 2.13.0.1 + + * [#1265](https://github.com/yesodweb/persistent/pull/1265) + * Support GHC 9 + +------------------------------------------------------------------- Old: ---- persistent-sqlite-2.13.0.0.tar.gz persistent-sqlite.cabal New: ---- persistent-sqlite-2.13.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-persistent-sqlite.spec ++++++ --- /var/tmp/diff_new_pack.zCLY6N/_old 2021-06-01 10:40:48.025154095 +0200 +++ /var/tmp/diff_new_pack.zCLY6N/_new 2021-06-01 10:40:48.029154102 +0200 @@ -19,13 +19,12 @@ %global pkg_name persistent-sqlite %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.13.0.0 +Version: 2.13.0.3 Release: 0 Summary: Backend for the persistent library using sqlite3 License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel @@ -78,7 +77,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %define cabal_configure_options -fsystemlib ++++++ persistent-sqlite-2.13.0.0.tar.gz -> persistent-sqlite-2.13.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-sqlite-2.13.0.0/ChangeLog.md new/persistent-sqlite-2.13.0.3/ChangeLog.md --- old/persistent-sqlite-2.13.0.0/ChangeLog.md 2021-05-05 23:13:54.000000000 +0200 +++ new/persistent-sqlite-2.13.0.3/ChangeLog.md 2021-05-27 17:30:35.000000000 +0200 @@ -1,5 +1,19 @@ # Changelog for persistent-sqlite +## 2.13.0.3 + +* Somehow failed to properly release the safe-to-remove changes. + +## 2.13.0.2 + +* [#1275](https://github.com/yesodweb/persistent/pull/1275) + * Fix SafeToRemove + +## 2.13.0.1 + +* [#1265](https://github.com/yesodweb/persistent/pull/1265) + * Support GHC 9 + ## 2.13.0.0 * [#1225](https://github.com/yesodweb/persistent/pull/1225) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-sqlite-2.13.0.0/Database/Persist/Sqlite.hs new/persistent-sqlite-2.13.0.3/Database/Persist/Sqlite.hs --- old/persistent-sqlite-2.13.0.0/Database/Persist/Sqlite.hs 2021-05-05 23:10:13.000000000 +0200 +++ new/persistent-sqlite-2.13.0.3/Database/Persist/Sqlite.hs 2021-05-24 21:14:59.000000000 +0200 @@ -499,7 +499,14 @@ safeToRemove def (FieldNameDB colName) = any (elem FieldAttrSafeToRemove . fieldAttrs) $ filter ((== FieldNameDB colName) . fieldDB) - $ getEntityFieldsDatabase def + $ allEntityFields + where + allEntityFields = + getEntityFieldsDatabase def <> case getEntityId def of + EntityIdField fdef -> + [fdef] + _ -> + [] getCopyTable :: [EntityDef] -> (Text -> IO Statement) @@ -676,7 +683,7 @@ putManySql :: EntityDef -> Int -> Text putManySql ent n = putManySql' conflictColumns (toList fields) ent n where - fields = getEntityFieldsDatabase ent + fields = getEntityFields ent conflictColumns = concatMap (map (escapeF . snd) . toList . uniqueFields) (getEntityUniques ent) repsertManySql :: EntityDef -> Int -> Text @@ -915,6 +922,33 @@ projectBackend = _persistentBackend #if MIN_VERSION_base(4,12,0) +instance (PersistCore b) => PersistCore (RawSqlite b) where + newtype BackendKey (RawSqlite b) = RawSqliteKey { unRawSqliteKey :: BackendKey (Compatible b (RawSqlite b)) } + +makeCompatibleKeyInstances [t| forall b. Compatible b (RawSqlite b) |] +#else +instance (PersistCore b) => PersistCore (RawSqlite b) where + newtype BackendKey (RawSqlite b) = RawSqliteKey { unRawSqliteKey :: BackendKey (RawSqlite b) } + +deriving instance (Show (BackendKey b)) => Show (BackendKey (RawSqlite b)) +deriving instance (Read (BackendKey b)) => Read (BackendKey (RawSqlite b)) +deriving instance (Eq (BackendKey b)) => Eq (BackendKey (RawSqlite b)) +deriving instance (Ord (BackendKey b)) => Ord (BackendKey (RawSqlite b)) +deriving instance (Num (BackendKey b)) => Num (BackendKey (RawSqlite b)) +deriving instance (Integral (BackendKey b)) => Integral (BackendKey (RawSqlite b)) +deriving instance (PersistField (BackendKey b)) => PersistField (BackendKey (RawSqlite b)) +deriving instance (PersistFieldSql (BackendKey b)) => PersistFieldSql (BackendKey (RawSqlite b)) +deriving instance (Real (BackendKey b)) => Real (BackendKey (RawSqlite b)) +deriving instance (Enum (BackendKey b)) => Enum (BackendKey (RawSqlite b)) +deriving instance (Bounded (BackendKey b)) => Bounded (BackendKey (RawSqlite b)) +deriving instance (ToJSON (BackendKey b)) => ToJSON (BackendKey (RawSqlite b)) +deriving instance (FromJSON (BackendKey b)) => FromJSON (BackendKey (RawSqlite b)) +#endif + + +#if MIN_VERSION_base(4,12,0) +$(pure []) + makeCompatibleInstances [t| forall b. Compatible b (RawSqlite b) |] #else instance HasPersistBackend b => HasPersistBackend (RawSqlite b) where @@ -961,29 +995,5 @@ putMany = withReaderT _persistentBackend . putMany #endif -#if MIN_VERSION_base(4,12,0) -instance (PersistCore b) => PersistCore (RawSqlite b) where - newtype BackendKey (RawSqlite b) = RawSqliteKey { unRawSqliteKey :: BackendKey (Compatible b (RawSqlite b)) } - -makeCompatibleKeyInstances [t| forall b. Compatible b (RawSqlite b) |] -#else -instance (PersistCore b) => PersistCore (RawSqlite b) where - newtype BackendKey (RawSqlite b) = RawSqliteKey { unRawSqliteKey :: BackendKey (RawSqlite b) } - -deriving instance (Show (BackendKey b)) => Show (BackendKey (RawSqlite b)) -deriving instance (Read (BackendKey b)) => Read (BackendKey (RawSqlite b)) -deriving instance (Eq (BackendKey b)) => Eq (BackendKey (RawSqlite b)) -deriving instance (Ord (BackendKey b)) => Ord (BackendKey (RawSqlite b)) -deriving instance (Num (BackendKey b)) => Num (BackendKey (RawSqlite b)) -deriving instance (Integral (BackendKey b)) => Integral (BackendKey (RawSqlite b)) -deriving instance (PersistField (BackendKey b)) => PersistField (BackendKey (RawSqlite b)) -deriving instance (PersistFieldSql (BackendKey b)) => PersistFieldSql (BackendKey (RawSqlite b)) -deriving instance (Real (BackendKey b)) => Real (BackendKey (RawSqlite b)) -deriving instance (Enum (BackendKey b)) => Enum (BackendKey (RawSqlite b)) -deriving instance (Bounded (BackendKey b)) => Bounded (BackendKey (RawSqlite b)) -deriving instance (ToJSON (BackendKey b)) => ToJSON (BackendKey (RawSqlite b)) -deriving instance (FromJSON (BackendKey b)) => FromJSON (BackendKey (RawSqlite b)) -#endif - makeLenses ''RawSqlite makeLenses ''SqliteConnectionInfo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-sqlite-2.13.0.0/persistent-sqlite.cabal new/persistent-sqlite-2.13.0.3/persistent-sqlite.cabal --- old/persistent-sqlite-2.13.0.0/persistent-sqlite.cabal 2021-05-05 23:10:13.000000000 +0200 +++ new/persistent-sqlite-2.13.0.3/persistent-sqlite.cabal 2021-05-27 17:30:38.000000000 +0200 @@ -1,5 +1,5 @@ name: persistent-sqlite -version: 2.13.0.0 +version: 2.13.0.3 license: MIT license-file: LICENSE author: Michael Snoyman <mich...@snoyman.com>