Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2 files changed, 31 insertions, 9 deletions

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 673e4cd75..ea13e0de6 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -644,7 +644,6 @@ CREATE TABLE IF NOT EXISTS `item` (
   `item_pending_remove` tinyint(1) NOT NULL DEFAULT 0 ,
   `item_blocked` tinyint(1) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
-  KEY `uid` (`uid`),
   KEY `parent` (`parent`),
   KEY `created` (`created`),
   KEY `edited` (`edited`),
@@ -690,14 +689,8 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `item_verified` (`item_verified`),
   KEY `item_retained` (`item_retained`),
   KEY `item_rss` (`item_rss`),
-  KEY `item_deleted` (`item_deleted`),
-  KEY `item_type` (`item_type`),
-  KEY `item_hidden` (`item_hidden`),
   KEY `item_consensus` (`item_consensus`),
-  KEY `item_unpublished` (`item_unpublished`),
-  KEY `item_delayed` (`item_delayed`),
-  KEY `item_pending_remove` (`item_pending_remove`),
-  KEY `item_blocked` (`item_blocked`)
+  KEY `item_type` (`item_type`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `item_id` (
diff --git a/install/update.php b/install/update.php
index f7b9b03ed..ceaccdfa3 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1198 );
+define( 'UPDATE_VERSION' , 1200 );
 
 /**
  *
@@ -3070,3 +3070,32 @@ function update_r1197() {
 
 	return UPDATE_SUCCESS;
 }
+
+function update_r1198() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+		$r = q("ALTER TABLE item 
+			DROP INDEX item_blocked,
+			DROP INDEX item_unpublished,
+			DROP INDEX item_deleted,
+			DROP INDEX item_delayed,
+			DROP INDEX item_hidden,
+			DROP INDEX item_pending_remove,
+			DROP INDEX item_type
+		");
+	}
+
+	return UPDATE_SUCCESS;
+}
+
+function update_r1199() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+		$r = q("ALTER TABLE item 
+			DROP INDEX uid,
+			ADD INDEX (item_type)
+		");
+	}
+
+	return UPDATE_SUCCESS;
+}