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

---
 boot.php                 |  2 +-
 install/schema_mysql.sql |  1 -
 install/update.php       | 14 ++++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index 0ac1d08df..3fc53a47b 100755
--- a/boot.php
+++ b/boot.php
@@ -53,7 +53,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'STD_VERSION',             '2.9' );
 define ( 'ZOT_REVISION',            '1.3' );
 
-define ( 'DB_UPDATE_VERSION',       1197  );
+define ( 'DB_UPDATE_VERSION',       1198  );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index afa3c095d..673e4cd75 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -609,7 +609,6 @@ CREATE TABLE IF NOT EXISTS `item` (
   `resource_type` char(16) NOT NULL DEFAULT '',
   `attach` mediumtext NOT NULL,
   `sig` text NOT NULL,
-  `diaspora_meta` mediumtext NOT NULL,
   `location` char(191) NOT NULL DEFAULT '',
   `coord` char(191) NOT NULL DEFAULT '',
   `public_policy` char(191) NOT NULL DEFAULT '',
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;
+}