diff options
| author | friendica <info@friendica.com> | 2015-01-18 19:25:10 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-18 19:25:10 -0800 |
| commit | 21da3443f30ba35225bef7e1a84fbf0ee8750b25 (patch) | |
| tree | 140040569c6cd070decfad305cf03d7fb906876a /install/update.php | |
| parent | 4c45068d70c086fc1417ab95f632a560a31efca2 (diff) | |
| parent | 7420896693589f1a4a5e91cef5c13852599464fd (diff) | |
| download | volse-hubzilla-21da3443f30ba35225bef7e1a84fbf0ee8750b25.tar.gz volse-hubzilla-21da3443f30ba35225bef7e1a84fbf0ee8750b25.tar.bz2 volse-hubzilla-21da3443f30ba35225bef7e1a84fbf0ee8750b25.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'install/update.php')
| -rw-r--r-- | install/update.php | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/install/update.php b/install/update.php index f7ccb8210..381ea0828 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1132 ); +define( 'UPDATE_VERSION' , 1133 ); /** * @@ -1486,6 +1486,9 @@ function update_r1130() { } function update_r1131() { + if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) // make sure this gets skipped for anyone who hasn't run it yet, it will fail on pg + return UPDATE_SUCCESS; + $r1 = q("ALTER TABLE `abook` ADD `abook_rating_text` TEXT NOT NULL DEFAULT '' AFTER `abook_rating` "); $r2 = q("ALTER TABLE `xlink` ADD `xlink_rating_text` TEXT NOT NULL DEFAULT '' AFTER `xlink_rating` "); @@ -1493,4 +1496,14 @@ function update_r1131() { return UPDATE_SUCCESS; return UPDATE_FAILED; +} + +function update_r1132() { + if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { // correct previous failed update + $r1 = q("ALTER TABLE abook ADD abook_rating_text TEXT NOT NULL DEFAULT '' "); + $r2 = q("ALTER TABLE xlink ADD xlink_rating_text TEXT NOT NULL DEFAULT '' "); + if(!$r1 || !$r2) + return UPDATE_FAILED; + } + return UPDATE_SUCCESS; }
\ No newline at end of file |