diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-09-15 03:21:19 +0200 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-09-15 03:21:19 +0200 |
| commit | 4132d1cd8e59d2cf84d7578ac700c65d7954edd6 (patch) | |
| tree | 5586bb1bf97ad9e457de2eacb298d28e22c854ee /install | |
| parent | 496f869157ab76139d14a3c67fd8276ee6557517 (diff) | |
| parent | aefb0f823353d15a281d3c94ec6fc044e1b62580 (diff) | |
| download | volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.tar.gz volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.tar.bz2 volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.zip | |
Upstream merge
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 6 | ||||
| -rw-r--r-- | install/update.php | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/install/database.sql b/install/database.sql index ce46149c4..41fb968c8 100644 --- a/install/database.sql +++ b/install/database.sql @@ -367,6 +367,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( `hubloc_hash` char(255) NOT NULL, `hubloc_addr` char(255) NOT NULL DEFAULT '', `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0', + `hubloc_status` int(10) unsigned NOT NULL DEFAULT '0', `hubloc_url` char(255) NOT NULL DEFAULT '', `hubloc_url_sig` text NOT NULL, `hubloc_host` char(255) NOT NULL DEFAULT '', @@ -379,6 +380,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( KEY `hubloc_url` (`hubloc_url`), KEY `hubloc_guid` (`hubloc_guid`), KEY `hubloc_flags` (`hubloc_flags`), + KEY `hubloc_status` (`hubloc_status`), KEY `hubloc_connect` (`hubloc_connect`), KEY `hubloc_host` (`hubloc_host`), KEY `hubloc_addr` (`hubloc_addr`), @@ -883,10 +885,12 @@ CREATE TABLE IF NOT EXISTS `tokens` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `updates` ( + `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `ud_hash` char(128) NOT NULL, `ud_guid` char(255) NOT NULL DEFAULT '', `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (`ud_hash`), + PRIMARY KEY (`ud_id`), + KEY `ud_hash` (`ud_hash`), KEY `ud_guid` (`ud_guid`), KEY `ud_date` (`ud_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index 36a85afec..24aed374d 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1067 ); +define( 'UPDATE_VERSION' , 1069 ); /** * @@ -775,3 +775,17 @@ ADD INDEX ( `site_access` )"); return UPDATE_FAILED; } +function update_r1067() { + $r = q("ALTER TABLE `updates` DROP PRIMARY KEY , ADD `ud_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST, ADD INDEX ( `ud_hash` ) "); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + +function update_r1068(){ + $r = q("ALTER TABLE `hubloc` ADD `hubloc_status` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `hubloc_flags` , ADD INDEX ( `hubloc_status` )"); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + |