Hello community,
here is the log from the commit of package ghc-persistent-mysql for
openSUSE:Factory checked in at 2017-07-06 00:03:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-persistent-mysql (Old)
and /work/SRC/openSUSE:Factory/.ghc-persistent-mysql.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-persistent-mysql"
Thu Jul 6 00:03:32 2017 rev:4 rq:508035 version:2.6.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-persistent-mysql/ghc-persistent-mysql.changes
2017-06-04 01:58:20.224846862 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-persistent-mysql.new/ghc-persistent-mysql.changes
2017-07-06 00:03:33.744922112 +0200
@@ -1,0 +2,5 @@
+Sun Jun 25 18:41:41 UTC 2017 - [email protected]
+
+- Update to version 2.6.1.
+
+-------------------------------------------------------------------
Old:
----
persistent-mysql-2.6.0.2.tar.gz
New:
----
persistent-mysql-2.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-persistent-mysql.spec ++++++
--- /var/tmp/diff_new_pack.ZpUu7o/_old 2017-07-06 00:03:34.564806609 +0200
+++ /var/tmp/diff_new_pack.ZpUu7o/_new 2017-07-06 00:03:34.564806609 +0200
@@ -18,7 +18,7 @@
%global pkg_name persistent-mysql
Name: ghc-%{pkg_name}
-Version: 2.6.0.2
+Version: 2.6.1
Release: 0
Summary: Backend for the persistent library using MySQL database server
License: MIT
++++++ persistent-mysql-2.6.0.2.tar.gz -> persistent-mysql-2.6.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/persistent-mysql-2.6.0.2/ChangeLog.md
new/persistent-mysql-2.6.1/ChangeLog.md
--- old/persistent-mysql-2.6.0.2/ChangeLog.md 2017-05-16 20:03:39.000000000
+0200
+++ new/persistent-mysql-2.6.1/ChangeLog.md 2017-06-19 06:27:00.000000000
+0200
@@ -1,4 +1,8 @@
-##2.6.0.2
+## 2.6.1
+
+* Add functions `insertOnDuplicateKeyUpdate`, `insertManyOnDuplicateKeyUpdate`
to `Database.Persist.MySQL` module.
+
+## 2.6.0.2
Prevent spurious no-op migrations when `default=NULL` is specified - revised
version [#672](https://github.com/yesodweb/persistent/pull/672) (which fixes
bug [#671](https://github.com/yesodweb/persistent/issues/671) introduced by the
earlier attempt [#641](https://github.com/yesodweb/persistent/pull/641))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/persistent-mysql-2.6.0.2/Database/Persist/MySQL.hs
new/persistent-mysql-2.6.1/Database/Persist/MySQL.hs
--- old/persistent-mysql-2.6.0.2/Database/Persist/MySQL.hs 2017-05-16
20:03:39.000000000 +0200
+++ new/persistent-mysql-2.6.1/Database/Persist/MySQL.hs 2017-06-19
06:27:00.000000000 +0200
@@ -1,4 +1,5 @@
{-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE GADTs #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE FlexibleContexts #-}
@@ -14,6 +15,9 @@
, MySQLBase.defaultSSLInfo
, MySQLConf(..)
, mockMigration
+ , insertOnDuplicateKeyUpdate
+ , insertManyOnDuplicateKeyUpdate
+ , SomeField(..)
) where
import Control.Arrow
@@ -1014,3 +1018,107 @@
result = runReaderT . runWriterT . runWriterT $ mig
resp <- result sqlbackend
mapM_ T.putStrLn $ map snd $ snd resp
+
+-- | MySQL specific 'upsert'. This will prevent multiple queries, when one will
+-- do.
+insertOnDuplicateKeyUpdate
+ :: ( PersistEntityBackend record ~ BaseBackend backend
+ , PersistEntity record
+ , MonadIO m
+ , PersistStore backend
+ , backend ~ SqlBackend
+ )
+ => record
+ -> [Update record]
+ -> SqlPersistT m ()
+insertOnDuplicateKeyUpdate record =
+ insertManyOnDuplicateKeyUpdate [record] []
+
+-- | This wraps values of an Entity's 'EntityField', making them have the same
+-- type. This allows them to be put in lists.
+data SomeField record where
+ SomeField :: EntityField record typ -> SomeField record
+
+-- | Do a bulk insert on the given records in the first parameter. In the event
+-- that a key conflicts with a record currently in the database, the second and
+-- third parameters determine what will happen.
+--
+-- The second parameter is a list of fields to copy from the original value.
+-- This allows you to specify that, when a collision occurs, you'll just update
+-- the value in the database with the field values that you inserted.
+--
+-- The third parameter is a list of updates to perform that are independent of
+-- the value that is provided. You can use this to increment a counter value.
+-- These updates only occur if the original record is present in the database.
+insertManyOnDuplicateKeyUpdate
+ :: ( PersistEntityBackend record ~ SqlBackend
+ , PersistEntity record
+ , MonadIO m
+ )
+ => [record] -- ^ A list of the records you want to insert, or update
+ -> [SomeField record] -- ^ A list of the fields you want to copy over.
+ -> [Update record] -- ^ A list of the updates to apply that aren't dependent
on the record being inserted.
+ -> SqlPersistT m ()
+insertManyOnDuplicateKeyUpdate [] _ _ = return ()
+insertManyOnDuplicateKeyUpdate records [] [] = insertMany_ records
+insertManyOnDuplicateKeyUpdate records fieldValues updates =
+ uncurry rawExecute $ mkBulkInsertQuery records fieldValues updates
+
+-- | This creates the query for 'bulkInsertOnDuplicateKeyUpdate'. It will give
+-- garbage results if you don't provide a list of either fields to copy or
+-- fields to update.
+mkBulkInsertQuery
+ :: (PersistEntityBackend record ~ SqlBackend, PersistEntity record)
+ => [record] -- ^ A list of the records you want to insert, or update
+ -> [SomeField record] -- ^ A list of the fields you want to copy over.
+ -> [Update record] -- ^ A list of the updates to apply that aren't
dependent on the record being inserted.
+ -> (Text, [PersistValue])
+mkBulkInsertQuery records fieldValues updates =
+ (q, recordValues <> updsValues)
+ where
+ fieldDefs = map (\x -> case x of SomeField rec -> persistFieldDef rec)
fieldValues
+ updateFieldNames = map (T.pack . escapeDBName . fieldDB) fieldDefs
+ entityDef' = entityDef records
+ entityFieldNames = map (T.pack . escapeDBName . fieldDB) (entityFields
entityDef')
+ tableName = T.pack . escapeDBName . entityDB $ entityDef'
+ recordValues = concatMap (map toPersistValue . toPersistFields) records
+ recordPlaceholders = commaSeparated $ map (parenWrapped . commaSeparated .
map (const "?") . toPersistFields) records
+ fieldSets = map (\n -> T.concat [n, "=VALUES(", n, ")"]) updateFieldNames
+ upds = map mkUpdateText updates
+ updsValues = map (\(Update _ val _) -> toPersistValue val) updates
+ q = T.concat
+ [ "INSERT INTO "
+ , tableName
+ , " ("
+ , commaSeparated entityFieldNames
+ , ") "
+ , " VALUES "
+ , recordPlaceholders
+ , " ON DUPLICATE KEY UPDATE "
+ , commaSeparated (fieldSets <> upds)
+ ]
+
+-- | Vendored from @persistent@.
+mkUpdateText :: PersistEntity record => Update record -> Text
+mkUpdateText x =
+ case updateUpdate x of
+ Assign -> n <> "=?"
+ Add -> T.concat [n, "=", n, "+?"]
+ Subtract -> T.concat [n, "=", n, "-?"]
+ Multiply -> T.concat [n, "=", n, "*?"]
+ Divide -> T.concat [n, "=", n, "/?"]
+ BackendSpecificUpdate up ->
+ error . T.unpack $ "BackendSpecificUpdate " <> up <> " not supported"
+ where
+ n = T.pack . escapeDBName . fieldDB . updateFieldDef $ x
+
+commaSeparated :: [Text] -> Text
+commaSeparated = T.intercalate ", "
+
+parenWrapped :: Text -> Text
+parenWrapped t = T.concat ["(", t, ")"]
+
+-- | Gets the 'FieldDef' for an 'Update'. Vendored from @persistent@.
+updateFieldDef :: PersistEntity v => Update v -> FieldDef
+updateFieldDef (Update f _ _) = persistFieldDef f
+updateFieldDef BackendUpdate {} = error "updateFieldDef did not expect
BackendUpdate"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/persistent-mysql-2.6.0.2/persistent-mysql.cabal
new/persistent-mysql-2.6.1/persistent-mysql.cabal
--- old/persistent-mysql-2.6.0.2/persistent-mysql.cabal 2017-05-16
20:03:39.000000000 +0200
+++ new/persistent-mysql-2.6.1/persistent-mysql.cabal 2017-06-19
06:27:00.000000000 +0200
@@ -1,5 +1,5 @@
name: persistent-mysql
-version: 2.6.0.2
+version: 2.6.1
license: MIT
license-file: LICENSE
author: Felipe Lessa <[email protected]>, Michael Snoyman
