Remove unnecessary hash function.

- Was introduced for getting the last inserted ID before "lastInstertID()" was possible
- See https://github.com/duthied/Free-Friendika/commit/b821399f001cd4082707ba9fb6df9c419e0b8e5e#diff-a8e86a3c07531e66a3b0b4c8b4b07879R148

diff --git a/database.sql b/database.sql
index d42f61f902ac7f5651d6cf8207a952c0f9384da4..b09b8290e09f4cd81f77fa924df7655ca82435b7 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -793,7 +793,6 @@ CREATE TABLE IF NOT EXISTS `manage` (
 --
 CREATE TABLE IF NOT EXISTS `notify` (
        `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
-       `hash` varchar(64) NOT NULL DEFAULT '' COMMENT '',
        `type` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
        `name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -810,7 +809,6 @@ CREATE TABLE IF NOT EXISTS `notify` (
        `name_cache` tinytext COMMENT 'Cached bbcode parsing of name',
        `msg_cache` mediumtext COMMENT 'Cached bbcode parsing of msg',
         PRIMARY KEY(`id`),
-        INDEX `hash_uid` (`hash`,`uid`),
         INDEX `seen_uid_date` (`seen`,`uid`,`date`),
         INDEX `uid_date` (`uid`,`date`),
         INDEX `uid_type_link` (`uid`,`type`,`link`(190))

diff --git a/include/enotify.php b/include/enotify.php
index a8090e35f8969a05b7ea784a57e8283f5ab6523b..2f3b6b49b2925986793c8dfd6e364f5262a6d367 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -503,17 +503,9 @@ function notification($params)
 
        if ($show_in_notification_page) {
                Logger::log("adding notification entry", Logger::DEBUG);
-               do {
-                       $dups = false;
-                       $hash = Strings::getRandomHex();
-                       if (DBA::exists('notify', ['hash' => $hash])) {
-                               $dups = true;
-                       }
-               } while ($dups == true);
 
                /// @TODO One statement is enough
                $datarray = [];
-               $datarray['hash']  = $hash;
                $datarray['name']  = $params['source_name'];
                $datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name']));
                $datarray['url']   = $params['source_link'];
@@ -536,7 +528,7 @@ function notification($params)
                }
 
                // create notification entry in DB
-               $fields = ['hash' => $datarray['hash'], 'name' => $datarray['name'], 'url' => $datarray['url'],
+               $fields = ['name' => $datarray['name'], 'url' => $datarray['url'],
                        'photo' => $datarray['photo'], 'date' => $datarray['date'], 'uid' => $datarray['uid'],
                        'link' => $datarray['link'], 'iid' => $datarray['iid'], 'parent' => $datarray['parent'],
                        'type' => $datarray['type'], 'verb' => $datarray['verb'], 'otype' => $datarray['otype'],

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 53f8a8ed44b8b1a3a36b8e057ec5bfcadedb5b7a..e87a84ef9218b4d2e24d08ed3f01011b1c97b032 100755 (executable)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -34,7 +34,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1323);
+       define('DB_UPDATE_VERSION', 1324);
 }
 
 return [
@@ -868,7 +868,6 @@ return [
                "comment" => "notifications",
                "fields" => [
                        "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
-                       "hash" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => ""],
                        "type" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
                        "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                        "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
@@ -887,7 +886,6 @@ return [
                ],
                "indexes" => [
                        "PRIMARY" => ["id"],
-                       "hash_uid" => ["hash", "uid"],
                        "seen_uid_date" => ["seen", "uid", "date"],
                        "uid_date" => ["uid", "date"],
                        "uid_type_link" => ["uid", "type", "link(190)"],