diff options
| author | zotlabs <mike@macgirvin.com> | 2018-02-11 19:36:37 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-02-11 19:36:37 -0800 |
| commit | 0f8d2d4e58cd085de29c630babaf7df3a35393c3 (patch) | |
| tree | 8da71ebff073f86212baf1a362063e8cdb86c4e7 /install | |
| parent | 63107f5b2f5031a7cc971063b9344592cc2257e3 (diff) | |
| parent | ba954b8cfeaf18477a5d7c17338efd909951744c (diff) | |
| download | volse-hubzilla-0f8d2d4e58cd085de29c630babaf7df3a35393c3.tar.gz volse-hubzilla-0f8d2d4e58cd085de29c630babaf7df3a35393c3.tar.bz2 volse-hubzilla-0f8d2d4e58cd085de29c630babaf7df3a35393c3.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 4 | ||||
| -rw-r--r-- | install/update.php | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index ea13e0de6..aa0ea0178 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -651,6 +651,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `uid_commented` (`uid`, `commented`), KEY `uid_created` (`uid`, `created`), KEY `uid_item_unseen` (`uid`, `item_unseen`), + KEY `uid_item_type` (`uid`, `item_type`), KEY `aid` (`aid`), KEY `owner_xchan` (`owner_xchan`), KEY `author_xchan` (`author_xchan`), @@ -689,8 +690,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `item_verified` (`item_verified`), KEY `item_retained` (`item_retained`), KEY `item_rss` (`item_rss`), - KEY `item_consensus` (`item_consensus`), - KEY `item_type` (`item_type`) + KEY `item_consensus` (`item_consensus`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `item_id` ( diff --git a/install/update.php b/install/update.php index ceaccdfa3..d5ad394f4 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1200 ); +define( 'UPDATE_VERSION' , 1201 ); /** * @@ -3099,3 +3099,17 @@ function update_r1199() { return UPDATE_SUCCESS; } + +function update_r1200() { + + if(ACTIVE_DBTYPE == DBTYPE_MYSQL) { + $r = q("ALTER TABLE item + DROP INDEX item_type, + ADD INDEX uid_item_type (uid, item_type) + "); + } + + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} |