From ddf5bf8968a12501939cd37898d303967b748600 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 21 Mar 2013 18:25:41 -0700
Subject: rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these
 no longer remotely resemble uri's and are actually message_id's. This change
 is potentially destabilising because it touches a lot of code and structure.
 But it has to get done and there's no better time than the present.

---
 install/database.sql | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'install/database.sql')

diff --git a/install/database.sql b/install/database.sql
index 138213fbd..7dbaff7ea 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -423,12 +423,12 @@ CREATE TABLE IF NOT EXISTS `issue` (
 
 CREATE TABLE IF NOT EXISTS `item` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `uri` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
+  `mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
   `wall` tinyint(1) NOT NULL DEFAULT '0',
   `parent` int(10) unsigned NOT NULL DEFAULT '0',
-  `parent_uri` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
+  `parent_mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
   `thr_parent` char(255) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -466,7 +466,6 @@ CREATE TABLE IF NOT EXISTS `item` (
   `item_flags` int(11) NOT NULL DEFAULT '0',
   `item_private` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
-  KEY `uri` (`uri`),
   KEY `uid` (`uid`),
   KEY `parent` (`parent`),
   KEY `created` (`created`),
@@ -475,14 +474,12 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `wall` (`wall`),
   KEY `uid_commented` (`uid`,`commented`),
   KEY `uid_created` (`uid`,`created`),
-  KEY `parent_uri` (`parent_uri`),
   KEY `aid` (`aid`),
   KEY `owner_xchan` (`owner_xchan`),
   KEY `author_xchan` (`author_xchan`),
   KEY `resource_type` (`resource_type`),
   KEY `item_restrict` (`item_restrict`),
   KEY `item_flags` (`item_flags`),
-  KEY `uid_uri` (`uri`,`uid`),
   KEY `commented` (`commented`),
   KEY `verb` (`verb`),
   KEY `item_private` (`item_private`),
@@ -490,6 +487,9 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `expires` (`expires`),
   KEY `revision` (`revision`),
   KEY `mimetype` (`mimetype`),
+  KEY `mid` (`mid`),
+  KEY `parent_mid` (`parent_mid`),
+  KEY `uid_mid` (`mid`,`uid`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
   FULLTEXT KEY `allow_cid` (`allow_cid`),
@@ -520,18 +520,18 @@ CREATE TABLE IF NOT EXISTS `mail` (
   `channel_id` int(10) unsigned NOT NULL,
   `title` char(255) NOT NULL,
   `body` mediumtext NOT NULL,
-  `uri` char(255) NOT NULL,
-  `parent_uri` char(255) NOT NULL,
+  `mid` char(255) NOT NULL,
+  `parent_mid` char(255) NOT NULL,
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`),
-  KEY `uri` (`uri`),
   KEY `created` (`created`),
   KEY `mail_flags` (`mail_flags`),
   KEY `account_id` (`account_id`),
   KEY `channel_id` (`channel_id`),
-  KEY `parent_uri` (`parent_uri`),
   KEY `from_xchan` (`from_xchan`),
-  KEY `to_xchan` (`to_xchan`)
+  KEY `to_xchan` (`to_xchan`),
+  KEY `mid` (`mid`),
+  KEY `parent_mid` (`parent_mid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `manage` (
-- 
cgit v1.2.3

