diff options
| author | Thomas Willingham <founder@kakste.com> | 2014-05-22 19:39:28 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2014-05-22 19:39:28 +0100 |
| commit | 292601728430469f21b81d7055cd485a0efb491c (patch) | |
| tree | 4d35371f101a26b69eb8dc6dc15c3be4a884258e /install | |
| parent | b06fd69da84626c1e8c1d8b5dbda6f181027a782 (diff) | |
| parent | 8e2771cbd409d56917e7d249d80a2c422609f540 (diff) | |
| download | volse-hubzilla-292601728430469f21b81d7055cd485a0efb491c.tar.gz volse-hubzilla-292601728430469f21b81d7055cd485a0efb491c.tar.bz2 volse-hubzilla-292601728430469f21b81d7055cd485a0efb491c.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 23 |
2 files changed, 22 insertions, 3 deletions
diff --git a/install/database.sql b/install/database.sql index 0de5879a2..d03cebd4b 100644 --- a/install/database.sql +++ b/install/database.sql @@ -85,7 +85,7 @@ CREATE TABLE IF NOT EXISTS `addon` ( CREATE TABLE IF NOT EXISTS `app` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `app_id` char(64) NOT NULL DEFAULT '', + `app_id` char(255) NOT NULL DEFAULT '', `app_sig` char(255) NOT NULL DEFAULT '', `app_author` char(255) NOT NULL DEFAULT '', `app_name` char(255) NOT NULL DEFAULT '', diff --git a/install/update.php b/install/update.php index 561070ba4..cc755c8c2 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1109 ); +define( 'UPDATE_VERSION' , 1111 ); /** * @@ -1216,7 +1216,7 @@ function update_r1107() { } -function update_r11108() { +function update_r1108() { $r = q("ALTER TABLE `app` ADD `app_addr` CHAR( 255 ) NOT NULL DEFAULT '', ADD `app_price` CHAR( 255 ) NOT NULL DEFAULT '', ADD `app_page` CHAR( 255 ) NOT NULL DEFAULT '', @@ -1225,3 +1225,22 @@ ADD INDEX ( `app_price` )"); return UPDATE_SUCCESS; return UPDATE_FAILED; } + +function update_r1109() { + $r = q("ALTER TABLE `app` CHANGE `app_id` `app_id` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''"); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + +// We ended up with an extra zero in the name for 1108, so do it over and ignore the result. + +function update_r1110() { + $r = q("ALTER TABLE `app` ADD `app_addr` CHAR( 255 ) NOT NULL DEFAULT '', +ADD `app_price` CHAR( 255 ) NOT NULL DEFAULT '', +ADD `app_page` CHAR( 255 ) NOT NULL DEFAULT '', +ADD INDEX ( `app_price` )"); + + return UPDATE_SUCCESS; + +} |