"item_id" and "spam" aren't used

diff --git a/database.sql b/database.sql
index c058c06f51803750bde65d6fe233ae8825bf85fa..b41c0bc5459f9490346192d3acd74c811d32d458 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -535,22 +535,6 @@ CREATE TABLE IF NOT EXISTS `item` (
         INDEX `uid_ownerlink` (`uid`,`owner-link`(190))
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
---
--- TABLE item_id
---
-CREATE TABLE IF NOT EXISTS `item_id` (
-       `id` int(11) NOT NULL auto_increment,
-       `iid` int(11) NOT NULL DEFAULT 0,
-       `uid` int(11) NOT NULL DEFAULT 0,
-       `sid` varchar(255) NOT NULL DEFAULT '',
-       `service` varchar(255) NOT NULL DEFAULT '',
-        PRIMARY KEY(`id`),
-        INDEX `uid` (`uid`),
-        INDEX `sid` (`sid`(32)),
-        INDEX `service` (`service`(32)),
-        INDEX `iid` (`iid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
-
 --
 -- TABLE locks
 --

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 1e47ee9edbea3f6dcbb7a462255f40ef97e41813..dae54835f0ad585d3390682257138744568c2bff 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1149,22 +1149,6 @@ function db_definition() {
                                        "uid_ownerlink" => array("uid","owner-link(190)"),
                                        )
                        );
-       $database["item_id"] = array(
-                       "fields" => array(
-                                       "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                       "iid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("item" => "id")),
-                                       "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
-                                       "sid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "service" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       ),
-                       "indexes" => array(
-                                       "PRIMARY" => array("id"),
-                                       "uid" => array("uid"),
-                                       "sid" => array("sid(32)"),
-                                       "service" => array("service(32)"),
-                                       "iid" => array("iid"),
-                                       )
-                       );
        $database["locks"] = array(
                        "fields" => array(
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
@@ -1539,23 +1523,6 @@ function db_definition() {
                                        "iid" => array("UNIQUE", "iid"),
                                        )
                        );
-       $database["spam"] = array(
-                       "fields" => array(
-                                       "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                       "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
-                                       "spam" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "ham" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "term" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
-                                       ),
-                       "indexes" => array(
-                                       "PRIMARY" => array("id"),
-                                       "uid" => array("uid"),
-                                       "spam" => array("spam"),
-                                       "ham" => array("ham"),
-                                       "term" => array("term(32)"),
-                                       )
-                       );
        $database["term"] = array(
                        "fields" => array(
                                        "tid" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),

diff --git a/include/items.php b/include/items.php
index 63c3218199a4c7e7b5aacd9e3c759c1825c63a6a..61a9c7a1fab5fab034050cd703a73f50df9b2e52 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2233,7 +2233,6 @@ function drop_item($id, $interactive = true) {
 
                // Now delete them
                if ($parentid != "") {
-                       $r = q("DELETE FROM `item_id` WHERE `iid` IN (%s)", dbesc($parentid));
                        $r = q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid));
                }