fix item_id table

diff --git a/boot.php b/boot.php
index 072d6a71419905185dedd6760430bf1975a41dbd..2119347ae54dc7a690424d54a93d800bd184e99a 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -13,7 +13,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.0.1468' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1155      );
+define ( 'DB_UPDATE_VERSION',      1156      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 1faaf5f2e09104b57a218945099e529f9a2113ac..0f82616f7b0188d89f035a27049c195ab709ec38 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -592,11 +592,13 @@ CREATE TABLE IF NOT EXISTS `item` (
 --
 
 CREATE TABLE IF NOT EXISTS `item_id` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `iid` int(11) NOT NULL,
   `uid` int(11) NOT NULL,
   `sid` char(255) NOT NULL,
   `service` char(255) NOT NULL,
-  PRIMARY KEY (`iid`),
+  PRIMARY KEY (`id`),
+  KEY `iid` (`iid`),
   KEY `uid` (`uid`),
   KEY `sid` (`sid`),
   KEY `service` (`service`)

diff --git a/update.php b/update.php
index cf6fa138eaf35ca6e27143874052e18f38bebaee..3d3eec6f97b00b69600f75ef07cb8d8520eaa573 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1155 );
+define( 'UPDATE_VERSION' , 1156 );
 
 /**
  *
@@ -1351,3 +1351,14 @@ function update_1154() {
        return UPDATE_SUCCESS;
 }
 
+function update_1155() {
+       $r1 = q("ALTER TABLE `item_id` DROP PRIMARY KEY");
+       $r2 = q("ALTER TABLE `item_id` ADD `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
+       $r3 = q("ALTER TABLE `item_id` ADD INDEX ( `iid` ) ");
+
+       if($r1 && $r2 && $r3)
+               return UPDATE_SUCCESS;
+
+       return UPDATE_FAILED;
+}
+