diff options
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 88 | ||||
| -rw-r--r-- | install/update.php | 3 |
2 files changed, 3 insertions, 88 deletions
diff --git a/install/database.sql b/install/database.sql index 342d93055..edb2bc2c4 100644 --- a/install/database.sql +++ b/install/database.sql @@ -208,94 +208,6 @@ CREATE TABLE IF NOT EXISTS `config` ( UNIQUE KEY `access` (`cat`,`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `contact` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `aid` int(10) unsigned NOT NULL DEFAULT '0', - `uid` int(11) NOT NULL COMMENT 'owner uid', - `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `my_perms` int(10) unsigned NOT NULL DEFAULT '0', - `their_perms` int(10) unsigned NOT NULL DEFAULT '0', - `self` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'boolean 1 == info for local UID, primarily name and photo to use in item displays.', - `remote_self` tinyint(1) NOT NULL DEFAULT '0', - `rel` tinyint(1) NOT NULL DEFAULT '0', - `duplex` tinyint(1) NOT NULL DEFAULT '0', - `network` char(255) NOT NULL, - `name` char(255) NOT NULL, - `nick` char(255) NOT NULL, - `attag` char(255) NOT NULL, - `photo` text NOT NULL COMMENT 'remote photo URL initially until approved', - `thumb` text NOT NULL, - `micro` text NOT NULL, - `site_pubkey` text NOT NULL, - `issued_id` char(255) NOT NULL, - `dfrn_id` char(255) NOT NULL, - `url` char(255) NOT NULL, - `nurl` char(255) NOT NULL, - `addr` char(255) NOT NULL, - `alias` char(255) NOT NULL, - `pubkey` text NOT NULL, - `prvkey` text NOT NULL, - `batch` char(255) NOT NULL, - `request` text NOT NULL, - `notify` char(255) NOT NULL, - `poll` text NOT NULL, - `confirm` text NOT NULL, - `poco` text NOT NULL, - `aes_allow` tinyint(1) NOT NULL DEFAULT '0', - `last_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `success_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `name_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `uri_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `avatar_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `term_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `priority` tinyint(3) NOT NULL, - `blocked` tinyint(1) NOT NULL DEFAULT '1', - `readonly` tinyint(1) NOT NULL DEFAULT '0', - `writable` tinyint(1) NOT NULL DEFAULT '0', - `forum` tinyint(1) NOT NULL DEFAULT '0', - `prv` tinyint(1) NOT NULL DEFAULT '0', - `hidden` tinyint(1) NOT NULL DEFAULT '0', - `archive` tinyint(1) NOT NULL DEFAULT '0', - `pending` tinyint(1) NOT NULL DEFAULT '1', - `rating` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0-5 reputation, 0 unknown, 1 call police, 5 inscrutable', - `reason` text NOT NULL COMMENT 'why a rating was given - will help friends decide to make friends or not', - `closeness` tinyint(2) NOT NULL DEFAULT '99', - `info` mediumtext NOT NULL, - `profile_id` int(11) NOT NULL DEFAULT '0' COMMENT 'which profile to display - 0 is public default', - `bdyear` char(4) NOT NULL COMMENT 'birthday notify flag', - `bd` date NOT NULL, - PRIMARY KEY (`id`), - KEY `uid` (`uid`), - KEY `self` (`self`), - KEY `blocked` (`blocked`), - KEY `readonly` (`readonly`), - KEY `network` (`network`), - KEY `name` (`name`), - KEY `nick` (`nick`), - KEY `attag` (`attag`), - KEY `addr` (`addr`), - KEY `url` (`url`), - KEY `batch` (`batch`), - KEY `nurl` (`nurl`), - KEY `pending` (`pending`), - KEY `hidden` (`hidden`), - KEY `archive` (`archive`), - KEY `forum` (`forum`), - KEY `notify` (`notify`), - KEY `my_perms` (`my_perms`), - KEY `their_perms` (`their_perms`), - KEY `aid` (`aid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - -CREATE TABLE IF NOT EXISTS `deliverq` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `cmd` char(32) NOT NULL, - `item` int(11) NOT NULL, - `contact` int(11) NOT NULL, - PRIMARY KEY (`id`), - KEY `item` (`item`), - KEY `contact` (`contact`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `event` ( `id` int(11) NOT NULL AUTO_INCREMENT, diff --git a/install/update.php b/install/update.php index e3394b5bc..ad21d9b45 100644 --- a/install/update.php +++ b/install/update.php @@ -67,6 +67,9 @@ function update_r1002() { $r = q("ALTER TABLE `event` CHANGE `account` `aid` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'"); $r2 = q("alter table `event` drop index `account`, add index (`aid`)"); + q("drop table contact"); + q("drop table deliverq"); + if($r && $r2) return UPDATE_SUCCESS; return UPDATE_FAILED; |