From 055bd05953002f90aff86c5e93f6f92b560eec4a Mon Sep 17 00:00:00 2001 From: vitalif Date: Wed, 28 Nov 2012 22:16:43 +0000 Subject: [PATCH] Return STRAIGHT_JOIN back, change key in fof_item_tag --- fof-db.php | 3 +-- install.php | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fof-db.php b/fof-db.php index 12e1e60..4d88540 100644 --- a/fof-db.php +++ b/fof-db.php @@ -353,8 +353,7 @@ function fof_db_get_items($user_id = 1, $feed = NULL, $what = "unread", } $args = array(); - // FIXME Add STRAIGHT_JOIN here for MySQL < 5.5 - $select = "SELECT SQL_NO_CACHE i.* , f.*, s.subscription_prefs "; + $select = "SELECT STRAIGHT_JOIN i.* , f.*, s.subscription_prefs "; $from = "$FOF_ITEM_TABLE i, $FOF_FEED_TABLE f, $FOF_SUBSCRIPTION_TABLE s "; $where = "WHERE s.user_id=$user_id AND s.feed_id=f.feed_id AND f.feed_id=i.feed_id "; diff --git a/install.php b/install.php index ae4ad6c..0529cf2 100644 --- a/install.php +++ b/install.php @@ -221,7 +221,7 @@ CREATE TABLE IF NOT EXISTS `$FOF_ITEM_TAG_TABLE` ( `user_id` int(11) NOT NULL default '0', `item_id` int(11) NOT NULL default '0', `tag_id` int(11) NOT NULL default '0', - PRIMARY KEY (`user_id`,`item_id`,`tag_id`), + PRIMARY KEY (`tag_id`,`user_id`,`item_id`), FOREIGN KEY (`tag_id`) REFERENCES `$FOF_TAG_TABLE` (`tag_id`) ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY (`user_id`) REFERENCES `$FOF_USER_TABLE` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY (`item_id`) REFERENCES `$FOF_ITEM_TABLE` (`item_id`) ON DELETE CASCADE ON UPDATE CASCADE @@ -266,6 +266,10 @@ if (!mysql_num_rows(fof_db_query("show columns from $FOF_ITEM_TABLE like 'item_a !fof_db_query("ALTER TABLE $FOF_ITEM_TABLE ADD `item_author` text NOT NULL AFTER `item_title`;")) exit("Can't add column item_author to table $FOF_ITEM_TABLE. MySQL says: " . mysql_error() . "
"); +# FIXME: Need to update: +# alter table fof_item drop key feed_id, add key item_published (item_published); +# alter table fof_item_tag drop primary key, drop key tag_id, add primary key (tag_id, user_id, item_id), add key user_id (user_id); + ?> Schema up to date.