diff options
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 59 | ||||
| -rw-r--r-- | install/update.php | 57 |
2 files changed, 94 insertions, 22 deletions
diff --git a/install/database.sql b/install/database.sql index 4030eb7ea..5581a27c6 100644 --- a/install/database.sql +++ b/install/database.sql @@ -159,6 +159,8 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_w_photos` tinyint(3) unsigned NOT NULL DEFAULT '128', `channel_w_chat` tinyint(3) unsigned NOT NULL DEFAULT '128', `channel_a_delegate` tinyint(3) unsigned NOT NULL DEFAULT '0', + `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '128', + `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128', PRIMARY KEY (`channel_id`), KEY `channel_account_id` (`channel_account_id`), KEY `channel_primary` (`channel_primary`), @@ -186,7 +188,9 @@ CREATE TABLE IF NOT EXISTS `channel` ( KEY `channel_guid` (`channel_guid`), KEY `channel_hash` (`channel_hash`), KEY `channel_expire_days` (`channel_expire_days`), - KEY `channel_a_delegate` (`channel_a_delegate`) + KEY `channel_a_delegate` (`channel_a_delegate`), + KEY `channel_r_storage` (`channel_r_storage`), + KEY `channel_w_storage` (`channel_w_storage`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `clients` ( @@ -361,13 +365,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 +561,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', @@ -768,7 +754,10 @@ CREATE TABLE IF NOT EXISTS `site` ( PRIMARY KEY (`site_url`), KEY `site_flags` (`site_flags`), KEY `site_update` (`site_update`), - KEY `site_directory` (`site_directory`) + KEY `site_directory` (`site_directory`), + KEY `site_flags_2` (`site_flags`), + KEY `site_update_2` (`site_update`), + KEY `site_directory_2` (`site_directory`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `spam` ( @@ -855,3 +844,33 @@ CREATE TABLE IF NOT EXISTS `xchan` ( KEY `xchan_url` (`xchan_url`), KEY `xchan_flags` (`xchan_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `xprof` ( + `xprof_hash` char(255) NOT NULL, + `xprof_desc` char(255) NOT NULL DEFAULT '', + `xprof_dob` char(12) NOT NULL DEFAULT '', + `xprof_gender` char(255) NOT NULL DEFAULT '', + `xprof_marital` char(255) NOT NULL DEFAULT '', + `xprof_sexual` char(255) NOT NULL DEFAULT '', + `xprof_locale` char(255) NOT NULL DEFAULT '', + `xprof_region` char(255) NOT NULL DEFAULT '', + `xprof_postcode` char(32) NOT NULL DEFAULT '', + `xprof_country` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`xprof_hash`), + KEY `xprof_desc` (`xprof_desc`), + KEY `xprof_dob` (`xprof_dob`), + KEY `xprof_gender` (`xprof_gender`), + KEY `xprof_marital` (`xprof_marital`), + KEY `xprof_sexual` (`xprof_sexual`), + KEY `xprof_locale` (`xprof_locale`), + KEY `xprof_region` (`xprof_region`), + KEY `xprof_postcode` (`xprof_postcode`), + KEY `xprof_country` (`xprof_country`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `xtag` ( + `xtag_hash` char(255) NOT NULL, + `xtag_term` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`xtag_hash`), + KEY `xtag_term` (`xtag_term`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index 48cb15c03..bdd687fb3 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1005 ); +define( 'UPDATE_VERSION' , 1008 ); /** * @@ -98,4 +98,57 @@ PRIMARY KEY ( `site_url` ) if($r && $r2) return UPDATE_SUCCESS; return UPDATE_FAILED; -}
\ No newline at end of file +} + + +function update_r1005() { + q("drop table guid"); + q("drop table `notify-threads`"); + return UPDATE_SUCCESS; +} + +function update_r1006() { + + $r = q("CREATE TABLE IF NOT EXISTS `xprof` ( + `xprof_hash` char(255) NOT NULL, + `xprof_desc` char(255) NOT NULL DEFAULT '', + `xprof_dob` char(12) NOT NULL DEFAULT '', + `xprof_gender` char(255) NOT NULL DEFAULT '', + `xprof_marital` char(255) NOT NULL DEFAULT '', + `xprof_sexual` char(255) NOT NULL DEFAULT '', + `xprof_locale` char(255) NOT NULL DEFAULT '', + `xprof_region` char(255) NOT NULL DEFAULT '', + `xprof_postcode` char(32) NOT NULL DEFAULT '', + `xprof_country` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`xprof_hash`), + KEY `xprof_desc` (`xprof_desc`), + KEY `xprof_dob` (`xprof_dob`), + KEY `xprof_gender` (`xprof_gender`), + KEY `xprof_marital` (`xprof_marital`), + KEY `xprof_sexual` (`xprof_sexual`), + KEY `xprof_locale` (`xprof_locale`), + KEY `xprof_region` (`xprof_region`), + KEY `xprof_postcode` (`xprof_postcode`), + KEY `xprof_country` (`xprof_country`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8"); + + $r2 = q("CREATE TABLE IF NOT EXISTS `xtag` ( + `xtag_hash` char(255) NOT NULL, + `xtag_term` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`xtag_hash`), + KEY `xtag_term` (`xtag_term`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8"); + + if($r && $r2) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + + +function update_r1007() { + $r = q("ALTER TABLE `channel` ADD `channel_r_storage` INT UNSIGNED NOT NULL DEFAULT '128', ADD `channel_w_storage` INT UNSIGNED NOT NULL DEFAULT '128', add index ( channel_r_storage ), add index ( channel_w_storage )"); + + if($r && $r2) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} |