Mode switch for insert

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 4233a2aad707a9fb6240cd35b19446324f5e0b02..355dda3fc1c09c1206633c3ba13846d5aadb50a2 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -29,6 +29,7 @@ use Exception;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
@@ -131,7 +132,7 @@ class OEmbed
                                        'maxwidth' => $a->videowidth,
                                        'content' => $json_string,
                                        'created' => DateTimeFormat::utcNow()
-                               ], true);
+                               ], Database::INSERT_UPDATE);
                                $cache_ttl = Duration::DAY;
                        } else {
                                $cache_ttl = Duration::FIVE_MINUTES;

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 7dd7ac3e3a4d111d46d90752f2f47f8d664cdb24..8b25f617f61195dd903de1a27995903840e417b7 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -290,16 +290,16 @@ class DBA
        /**
         * Insert a row into a table
         *
-        * @param string|array $table               Table name or array [schema => table]
-        * @param array        $param               parameter array
-        * @param bool         $on_duplicate_update Do an update on a duplicate entry
+        * @param string|array $table          Table name or array [schema => table]
+        * @param array        $param          parameter array
+        * @param int          $duplicate_mode What to do on a duplicated entry
         *
         * @return boolean was the insert successful?
         * @throws \Exception
         */
-       public static function insert($table, $param, $on_duplicate_update = false)
+       public static function insert($table, array $param, int $duplicate_mode = Database::INSERT_DEFAULT)
        {
-               return DI::dba()->insert($table, $param, $on_duplicate_update);
+               return DI::dba()->insert($table, $param, $duplicate_mode);
        }
 
        /**

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 98d167c2fe82a33e8bb5cd8271f2569bf0349d5a..22b51af2160feba5e1944a690f12265ad898cc8e 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -1050,7 +1050,7 @@ class DBStructure
        {
                if (self::existsTable('verb') && !DBA::exists('verb', ['id' => 1])) {
                        foreach (Item::ACTIVITIES as $index => $activity) {
-                               DBA::insert('verb', ['id' => $index + 1, 'name' => $activity], true);
+                               DBA::insert('verb', ['id' => $index + 1, 'name' => $activity], Database::INSERT_IGNORE);
                        }
                }
 

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 273c2985c63f250688f2e90ba510cd758ec6ee17..951dd3e1169652d02db9867fbc480475f9beafb0 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -42,6 +42,10 @@ class Database
        const PDO = 'pdo';
        const MYSQLI = 'mysqli';
 
+       const INSERT_DEFAULT = 0;
+       const INSERT_UPDATE = 1;
+       const INSERT_IGNORE = 2;
+
        protected $connected = false;
 
        /**
@@ -966,14 +970,14 @@ class Database
        /**
         * Insert a row into a table
         *
-        * @param string|array $table               Table name or array [schema => table]
-        * @param array        $param               parameter array
-        * @param bool         $on_duplicate_update Do an update on a duplicate entry
+        * @param string|array $table          Table name or array [schema => table]
+        * @param array        $param          parameter array
+        * @param int          $duplicate_mode What to do on a duplicated entry
         *
         * @return boolean was the insert successful?
         * @throws \Exception
         */
-       public function insert($table, array $param, bool $on_duplicate_update = false)
+       public function insert($table, array $param, int $duplicate_mode = self::INSERT_DEFAULT)
        {
                if (empty($table) || empty($param)) {
                        $this->logger->info('Table and fields have to be set');
@@ -986,9 +990,15 @@ class Database
 
                $values_string = substr(str_repeat("?, ", count($param)), 0, -2);
 
-               $sql = "INSERT INTO " . $table_string . " (" . $fields_string . ") VALUES (" . $values_string . ")";
+               $sql = "INSERT ";
+
+               if ($duplicate_mode == self::INSERT_IGNORE) {
+                       $sql .= "IGNORE ";
+               }
+
+               $sql .= "INTO " . $table_string . " (" . $fields_string . ") VALUES (" . $values_string . ")";
 
-               if ($on_duplicate_update) {
+               if ($duplicate_mode == self::INSERT_UPDATE) {
                        $fields_string = implode(' = ?, ', array_map([DBA::class, 'quoteIdentifier'], array_keys($param)));
 
                        $sql .= " ON DUPLICATE KEY UPDATE " . $fields_string . " = ?";
@@ -997,7 +1007,12 @@ class Database
                        $param  = array_merge_recursive($values, $values);
                }
 
-               return $this->e($sql, $param);
+               $result = $this->e($sql, $param);
+               if (!$result || ($duplicate_mode != self::INSERT_IGNORE)) {
+                       return $result;
+               }
+
+               return $this->affectedRows() != 0;
        }
 
        /**

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index c6b151af5f23a696fb0274001b5a27fd752b5527..c21dab919aa93b2816829a148153995a0040644a 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -736,7 +736,7 @@ class PostUpdate
                while ($delivery = DBA::fetch($deliveries)) {
                        $id = $delivery['iid'];
                        unset($delivery['iid']);
-                       DBA::insert('post-delivery-data', $delivery, true);
+                       DBA::insert('post-delivery-data', $delivery, Database::INSERT_UPDATE);
                        ++$rows;
                }
                DBA::close($deliveries);

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 80a5d93cb2ebcbcfcc649af45f7ed821e33058d0..226aebfc003b08c48e02bd752da2d914f28910b9 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -31,6 +31,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notify\Type;
@@ -168,13 +169,13 @@ class Contact
         * Insert a row into the contact table
         * Important: You can't use DBA::lastInsertId() after this call since it will be set to 0.
         *
-        * @param array        $fields              field array
-        * @param bool         $on_duplicate_update Do an update on a duplicate entry
+        * @param array $fields         field array
+        * @param int   $duplicate_mode Do an update on a duplicate entry
         *
         * @return boolean was the insert successful?
         * @throws \Exception
         */
-       public static function insert(array $fields, bool $on_duplicate_update = false)
+       public static function insert(array $fields, int $duplicate_mode = Database::INSERT_DEFAULT)
        {
                if (!empty($fields['baseurl']) && empty($fields['gsid'])) {
                        $fields['gsid'] = GServer::getID($fields['baseurl'], true);
@@ -184,7 +185,7 @@ class Contact
                        $fields['created'] = DateTimeFormat::utcNow();
                }
 
-               $ret = DBA::insert('contact', $fields, $on_duplicate_update);
+               $ret = DBA::insert('contact', $fields, $duplicate_mode);
                $contact = DBA::selectFirst('contact', ['nurl', 'uid'], ['id' => DBA::lastInsertId()]);
                if (!DBA::isResult($contact)) {
                        // Shouldn't happen

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 1dcb6b0c2d7cc8476d1a0038eb613579d092a487..c2f5b78bd995beca250e28689913d08e42ddeb20 100644 (file)
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -23,6 +23,7 @@ namespace Friendica\Model;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
@@ -124,7 +125,7 @@ class Conversation
                                                Logger::DEBUG);
                                }
                        } else {
-                               if (!DBA::insert('conversation', $conversation, true)) {
+                               if (!DBA::insert('conversation', $conversation, Database::INSERT_UPDATE)) {
                                        Logger::log('Conversation: insert for ' . $conversation['item-uri'] . ' (protocol ' . $conversation['protocol'] . ') failed',
                                                Logger::DEBUG);
                                }

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 8800bcace0b58fc9bb4e51b588ec8f5fcc938af8..713d6f114601d901b53036b7a46ade4b83805a0e 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -27,6 +27,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Register;
@@ -541,7 +542,7 @@ class GServer
                        }
 
                        foreach ($tags as $tag) {
-                               DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], true);
+                               DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], Database::INSERT_IGNORE);
                        }
                }
 

diff --git a/src/Model/ItemURI.php b/src/Model/ItemURI.php
index 12e8d915df2cfe88ff4ca2e92cc69907e53757a0..7f05786c8ee72072b5cbe73b2aca26f381a2f91a 100644 (file)
--- a/src/Model/ItemURI.php
+++ b/src/Model/ItemURI.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Model;
 
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 
 class ItemURI
@@ -39,7 +40,7 @@ class ItemURI
                $uri = substr($fields['uri'], 0, 255);
 
                if (!DBA::exists('item-uri', ['uri' => $uri])) {
-                       DBA::insert('item-uri', $fields, true);
+                       DBA::insert('item-uri', $fields, Database::INSERT_UPDATE);
                }
 
                $itemuri = DBA::selectFirst('item-uri', ['id', 'guid'], ['uri' => $uri]);

diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 441fd52767d06d5a01fb1ed6a76350c7316e0b30..dd4a2b41e89295f7773b511489d364d7f4b779d5 100644 (file)
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -23,6 +23,7 @@ namespace Friendica\Model\Post;
 
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Images;
@@ -72,14 +73,14 @@ class Media
 
                // We are storing as fast as possible to avoid duplicated network requests
                // when fetching additional information for pictures and other content.
-               $result = DBA::insert('post-media', $media, true);
+               $result = DBA::insert('post-media', $media, Database::INSERT_UPDATE);
                Logger::info('Stored media', ['result' => $result, 'media' => $media, 'callstack' => System::callstack()]);
                $stored = $media;
 
                $media = self::fetchAdditionalData($media);
 
                if (array_diff_assoc($media, $stored)) {
-                       $result = DBA::insert('post-media', $media, true);
+                       $result = DBA::insert('post-media', $media, Database::INSERT_UPDATE);
                        Logger::info('Updated media', ['result' => $result, 'media' => $media]);
                } else {
                        Logger::info('Nothing to update', ['media' => $media]);

diff --git a/src/Model/Post/User.php b/src/Model/Post/User.php
index 840d020d6eeb42c31a817c817a4a5fedd4525ea9..c3ca5de1d007e65d6eae5f878414ca6a9ad4f762 100644 (file)
--- a/src/Model/Post/User.php
+++ b/src/Model/Post/User.php
@@ -23,7 +23,7 @@ namespace Friendica\Model\Post;
 
 use Friendica\Database\DBA;
 use \BadMethodCallException;
-use Friendica\Core\Logger;
+use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
 
 class User
@@ -58,7 +58,7 @@ class User
                        $fields['unseen'] = false;
                }
 
-               return DBA::insert('post-user', $fields);
+               return DBA::insert('post-user', $fields, Database::INSERT_IGNORE);
        }
 
        /**

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index f947b9f898429744b2f427e3dd1fa0fd4619499f..0ab4b3a49d439b0e87b6550298931c86a1e704fe 100644 (file)
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -25,6 +25,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;
@@ -151,7 +152,7 @@ class Tag
                        }
                }
 
-               DBA::insert('post-tag', $fields, true);
+               DBA::insert('post-tag', $fields, Database::INSERT_IGNORE);
 
                Logger::info('Stored tag/mention', ['uri-id' => $uriid, 'tag-id' => $tagid, 'contact-id' => $cid, 'name' => $name, 'type' => $type, 'callstack' => System::callstack(8)]);
        }
@@ -172,7 +173,7 @@ class Tag
                        return $tag['id'];
                }
 
-               DBA::insert('tag', $fields, true);
+               DBA::insert('tag', $fields, Database::INSERT_IGNORE);
                $tid = DBA::lastInsertId();
                if (!empty($tid)) {
                        return $tid;

diff --git a/src/Model/Verb.php b/src/Model/Verb.php
index 759c1b0f27fce4d176adfa0b231fa83b8a8a573a..6109691cd7fc870b5804175fa8a0c515e41f8432 100644 (file)
--- a/src/Model/Verb.php
+++ b/src/Model/Verb.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Model;
 
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 
 class Verb
@@ -44,7 +45,7 @@ class Verb
                        return $verb_record['id'];
                }
 
-               DBA::insert('verb', ['name' => $verb], true);
+               DBA::insert('verb', ['name' => $verb], Database::INSERT_IGNORE);
 
                return DBA::lastInsertId();
        }

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 1596e015bef1415fb1858cd3d45565eaf0dbf1ed..15186b57374bd9246444dcf484f575d6cfec7eaf 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -26,6 +26,7 @@ use DOMXPath;
 use Friendica\Content\OEmbed;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 
@@ -91,7 +92,7 @@ class ParseUrl
                                'oembed' => $do_oembed, 'content' => serialize($data),
                                'created' => DateTimeFormat::utcNow()
                        ],
-                       true
+                       Database::INSERT_UPDATE
                );
 
                return $data;

diff --git a/update.php b/update.php
index 94cb145c6480e20f69eff63bcac8e4fc71f21d80..c3c83b937b9116609e20dbb16761760fff3a5e00 100644 (file)
--- a/update.php
+++ b/update.php
@@ -44,6 +44,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Logger;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
@@ -429,7 +430,7 @@ function update_1332()
 function update_1347()
 {
        foreach (Item::ACTIVITIES as $index => $activity) {
-               DBA::insert('verb', ['id' => $index + 1, 'name' => $activity], true);
+               DBA::insert('verb', ['id' => $index + 1, 'name' => $activity], Database::INSERT_IGNORE);
        }
 
        return Update::SUCCESS;