From 6d01707a724504a34b8e84e87c6601a046de9739 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 19 May 2014 16:49:11 -0700
Subject: more app backend work

---
 install/database.sql |  2 +-
 install/update.php   | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'install')

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..b91589c28 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1109 );
+define( 'UPDATE_VERSION' , 1110 );
 
 /**
  *
@@ -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,10 @@ 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;
+}
-- 
cgit v1.2.3


From 696f62331d0edb541666e5ad72b69aa26940faeb Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 20 May 2014 22:38:33 -0700
Subject: try to recover from bad update

---
 install/update.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'install')

diff --git a/install/update.php b/install/update.php
index b91589c28..cc755c8c2 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1110 );
+define( 'UPDATE_VERSION' , 1111 );
 
 /**
  *
@@ -1232,3 +1232,15 @@ function update_r1109() {
 		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;
+
+}
-- 
cgit v1.2.3