diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-07-03 16:10:58 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-07-03 16:10:58 +0100 |
| commit | d065135d909bf876f4c305d303de7642657f7e3e (patch) | |
| tree | c569ec28535fe5e91ab29dffe67c9a74f11fece2 /install | |
| parent | d1cae2da2abc3a602f682114bc02cce08a7e7578 (diff) | |
| parent | 429ebabfd98240fe7d69ba81879ee35769af305f (diff) | |
| download | volse-hubzilla-d065135d909bf876f4c305d303de7642657f7e3e.tar.gz volse-hubzilla-d065135d909bf876f4c305d303de7642657f7e3e.tar.bz2 volse-hubzilla-d065135d909bf876f4c305d303de7642657f7e3e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 17 | ||||
| -rw-r--r-- | install/update.php | 22 |
2 files changed, 38 insertions, 1 deletions
diff --git a/install/database.sql b/install/database.sql index 5cb0146f7..59192b753 100644 --- a/install/database.sql +++ b/install/database.sql @@ -599,6 +599,23 @@ CREATE TABLE IF NOT EXISTS `notify` ( KEY `otype` (`otype`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `obj` ( + `obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `obj_page` char(64) NOT NULL DEFAULT '', + `obj_verb` char(255) NOT NULL DEFAULT '', + `obj_type` int(10) unsigned NOT NULL DEFAULT '0', + `obj_obj` char(255) NOT NULL DEFAULT '', + `obj_channel` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`obj_id`), + KEY `obj_verb` (`obj_verb`), + KEY `obj_page` (`obj_page`), + KEY `obj_type` (`obj_type`), + KEY `obj_channel` (`obj_channel`), + KEY `obj_obj` (`obj_obj`) +) 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 ef436c688..22c069d2f 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1048 ); +define( 'UPDATE_VERSION' , 1049 ); /** * @@ -581,3 +581,23 @@ ADD INDEX ( `xprof_age` ) "); return UPDATE_FAILED; } +function update_r1048() { + $r = q("CREATE TABLE IF NOT EXISTS `obj` ( + `obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `obj_page` char(64) NOT NULL DEFAULT '', + `obj_verb` char(255) NOT NULL DEFAULT '', + `obj_type` int(10) unsigned NOT NULL DEFAULT '0', + `obj_obj` char(255) NOT NULL DEFAULT '', + `obj_channel` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`obj_id`), + KEY `obj_verb` (`obj_verb`), + KEY `obj_page` (`obj_page`), + KEY `obj_type` (`obj_type`), + KEY `obj_channel` (`obj_channel`), + KEY `obj_obj` (`obj_obj`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 "); + + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} |