diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-17 21:40:04 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-17 21:40:04 -0700 |
| commit | de4f9d68bdaade902a8030888f9df035fa1329ec (patch) | |
| tree | 5021daad0c4002ce9b7c89233b7c8446552b5a07 /install/update.php | |
| parent | 191cd21028ab108c2a7f982c654601d780865eff (diff) | |
| parent | 571b8cc85b3a770f16aed021bb39b889e0275ed6 (diff) | |
| download | volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.tar.gz volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.tar.bz2 volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'install/update.php')
| -rw-r--r-- | install/update.php | 49 |
1 files changed, 45 insertions, 4 deletions
diff --git a/install/update.php b/install/update.php index 366764f65..81f9efb21 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1180 ); +define( 'UPDATE_VERSION' , 1181 ); /** * @@ -2364,7 +2364,49 @@ function update_r1178() { function update_r1179() { - require_once('install/perm_upgrade.php'); + if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { + $r1 = q("CREATE TABLE atoken ( + atoken_id serial NOT NULL, + atoken_aid bigint NOT NULL DEFAULT 0, + atoken_uid bigint NOT NULL DEFAULT 0, + atoken_name varchar(255) NOT NULL DEFAULT '', + atoken_token varchar(255) NOT NULL DEFAULT '', + atoken_expires timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', + PRIMARY KEY (atoken_id)) "); + $r2 = q("create index atoken_aid on atoken (atoken_aid)"); + $r3 = q("create index atoken_uid on atoken (atoken_uid)"); + $r4 = q("create index atoken_name on atoken (atoken_name)"); + $r5 = q("create index atoken_token on atoken (atoken_token)"); + $r6 = q("create index atoken_expires on atoken (atoken_expires)"); + + $r = $r1 && $r2 && $r3 && $r4 && $r5 && $r6; + + } + else { + $r = q("CREATE TABLE IF NOT EXISTS `atoken` ( + `atoken_id` int(11) NOT NULL AUTO_INCREMENT, + `atoken_aid` int(11) NOT NULL DEFAULT 0, + `atoken_uid` int(11) NOT NULL DEFAULT 0, + `atoken_name` char(255) NOT NULL DEFAULT '', + `atoken_token` char(255) NOT NULL DEFAULT '', + `atoken_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`atoken_id`), + KEY `atoken_aid` (`atoken_aid`), + KEY `atoken_uid` (`atoken_uid`), + KEY `atoken_name` (`atoken_name`), + KEY `atoken_token` (`atoken_token`), + KEY `atoken_expires` (`atoken_expires`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 "); + } + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + +} + +function update_r1180() { + + require_once('include/perm_upgrade.php'); $r1 = q("select * from channel where true"); if($r1) { @@ -2384,6 +2426,5 @@ function update_r1179() { if($r) return UPDATE_SUCCESS; return UPDATE_FAILED; +} - -}
\ No newline at end of file |