harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix update 1131 for postgres databases

Browse Source
This commit is contained in:
Habeas Codice
2015-01-18 18:33:32 -08:00
parent 89a2012f7f
commit 547d852ef7
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@@ -49,7 +49,7 @@ define ( 'RED_PLATFORM', 'redmatrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1132 ); define ( 'DB_UPDATE_VERSION', 1133 );
/** /**
* Constant with a HTML line break. * Constant with a HTML line break.

15
install/update.php
View File

@@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1132 ); define( 'UPDATE_VERSION' , 1133 );
/** /**
* *
@@ -1486,6 +1486,9 @@ function update_r1130() {
} }
function update_r1131() { 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` "); $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` "); $r2 = q("ALTER TABLE `xlink` ADD `xlink_rating_text` TEXT NOT NULL DEFAULT '' AFTER `xlink_rating` ");
@@ -1494,3 +1497,13 @@ function update_r1131() {
return UPDATE_FAILED; 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;
}