From abee07f12bc1fab1b6304215662a36aedba6aada Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 20 Dec 2012 22:53:50 -0800
Subject: more DB cleanup

---
 install/database.sql | 18 ------------------
 install/update.php   |  9 ++++++++-
 2 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'install')

diff --git a/install/database.sql b/install/database.sql
index 4030eb7ea..83684c3d7 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -361,13 +361,6 @@ CREATE TABLE IF NOT EXISTS `group_member` (
   KEY `xchan` (`xchan`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `guid` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `guid` char(64) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `guid` (`guid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `hook` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `hook` char(255) NOT NULL,
@@ -564,17 +557,6 @@ CREATE TABLE IF NOT EXISTS `notify` (
   KEY `otype` (`otype`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `notify-threads` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `notify-id` int(11) NOT NULL,
-  `master-parent-item` int(10) unsigned NOT NULL DEFAULT '0',
-  `parent-item` int(10) unsigned NOT NULL DEFAULT '0',
-  `receiver-uid` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `master-parent-item` (`master-parent-item`),
-  KEY `receiver-uid` (`receiver-uid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `outq` (
   `outq_hash` char(255) NOT NULL,
   `outq_account` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/install/update.php b/install/update.php
index 48cb15c03..06e3ef9f9 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1005 );
+define( 'UPDATE_VERSION' , 1006 );
 
 /**
  *
@@ -98,4 +98,11 @@ PRIMARY KEY ( `site_url` )
 	if($r && $r2)
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
+}
+
+
+function update_r1005() {
+	q("drop table guid");
+	q("drop table `notify-threads`);
+	return UPDATE_SUCCESS;
 }
\ No newline at end of file
-- 
cgit v1.2.3