From 9d51318c53e1adc2e4d4c8586f8783819516991e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 19 Oct 2017 17:24:11 -0700
Subject: table structure for pseudo or proxy channels (pchan)

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

(limited to 'install/update.php')

diff --git a/install/update.php b/install/update.php
index 07675a973..80d987a19 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1196 );
+define( 'UPDATE_VERSION' , 1197 );
 
 /**
  *
@@ -3022,3 +3022,41 @@ function update_r1195() {
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 }
+
+function update_r1196() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("CREATE TABLE \"pchan\" (
+  \"pchan_id\" serial NOT NULL,
+  \"pchan_guid\" text NOT NULL,
+  \"pchan_hash\" text NOT NULL,
+  \"pchan_pubkey\" text NOT NULL,
+  \"pchan_prvkey\" text NOT NULL,
+  PRIMARY KEY (\"pchan_id\")
+)");
+
+		$r2 = q("create index \"pchan_guid\" on pchan (\"pchan_guid\")");
+		$r3 = q("create index \"pchan_hash\" on pchan (\"pchan_hash\");
+
+		if($r1 && $r2 && $r3) {
+			return UPDATE_SUCCESS;
+		}
+	}
+	else {
+		$r1 = q("CREATE TABLE IF NOT EXISTS pchan (
+  pchan_id int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  pchan_guid char(191) NOT NULL DEFAULT '',
+  pchan_hash char(191) NOT NULL DEFAULT '',
+  pchan_pubkey text NOT NULL,
+  pchan_prvkey text NOT NULL,
+  PRIMARY KEY (pchan_id),
+  KEY pchan_guid (pchan_guid),
+  KEY pchan_hash (pchan_hash)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
+		if($r1) {
+			return UPDATE_SUCCESS;
+		}
+	}
+
+	return UPDATE_FAILED;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 7d92e9026e55d0e67cab237c5ced39480074a7f6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 19 Oct 2017 18:48:01 -0700
Subject: typo

---
 install/update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'install/update.php')

diff --git a/install/update.php b/install/update.php
index 80d987a19..7d59555d3 100644
--- a/install/update.php
+++ b/install/update.php
@@ -3036,7 +3036,7 @@ function update_r1196() {
 )");
 
 		$r2 = q("create index \"pchan_guid\" on pchan (\"pchan_guid\")");
-		$r3 = q("create index \"pchan_hash\" on pchan (\"pchan_hash\");
+		$r3 = q("create index \"pchan_hash\" on pchan (\"pchan_hash\")");
 
 		if($r1 && $r2 && $r3) {
 			return UPDATE_SUCCESS;
-- 
cgit v1.2.3


From 7386fa57c8fd8422b6aa2c947603c8c2f945ba62 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 16 Nov 2017 17:13:48 -0800
Subject: remove column item.diaspora_meta, action items 2 and 3 of hubzilla
 issue #828

---
 install/update.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'install/update.php')

diff --git a/install/update.php b/install/update.php
index 7d59555d3..f7b9b03ed 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1197 );
+define( 'UPDATE_VERSION' , 1198 );
 
 /**
  *
@@ -3059,4 +3059,14 @@ function update_r1196() {
 	}
 
 	return UPDATE_FAILED;
-}
\ No newline at end of file
+}
+
+function update_r1197() {
+
+	$r = q("select diaspora_meta from item where true limit 1");
+	if($r) {
+		$r = q("ALTER TABLE item DROP diaspora_meta");
+	}
+
+	return UPDATE_SUCCESS;
+}
-- 
cgit v1.2.3