From 6602ff83dd54d0e17c985a5f527654fc2ed83eea Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 30 May 2016 19:44:30 -0700
Subject: start removing reserved words from database column names (this run:
 addon and hook)

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

(limited to 'install/update.php')

diff --git a/install/update.php b/install/update.php
index 983db1bb9..686c199b5 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1169 );
+define( 'UPDATE_VERSION' , 1170 );
 
 /**
  *
@@ -2114,3 +2114,21 @@ function update_r1168() {
 	return UPDATE_FAILED;
 }
 
+function update_r1169() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("ALTER TABLE `addon` CHANGE `timestamp` `tstamp` numeric( 20 ) UNSIGNED NOT NULL DEFAULT '0' ");
+		$r2 = q("ALTER TABLE `addon` CHANGE `name` `aname` text NOT NULL DEFAULT '' ");
+		$r3 = q("ALTER TABLE `hook` CHANGE `function` `fn` text NOT NULL DEFAULT '' ");
+
+	}
+	else {
+		$r1 = q("ALTER TABLE `addon` CHANGE `timestamp` `tstamp` BIGINT( 20 ) UNSIGNED NOT NULL DEFAULT '0' ");
+		$r2 = q("ALTER TABLE `addon` CHANGE `name` `aname` CHAR(255) NOT NULL DEFAULT '' ");
+		$r3 = q("ALTER TABLE `hook` CHANGE `function` `fn` CHAR(255) NOT NULL DEFAULT '' ");
+	}
+
+	if($r1 && $r2 && $r3)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From ca78374f30bd1b3a98b8b82552741a54b131cbf8 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 30 May 2016 22:41:45 -0700
Subject: remove unused tables

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

(limited to 'install/update.php')

diff --git a/install/update.php b/install/update.php
index 686c199b5..0bd8d59f9 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1170 );
+define( 'UPDATE_VERSION' , 1171 );
 
 /**
  *
@@ -2131,4 +2131,19 @@ function update_r1169() {
 	if($r1 && $r2 && $r3)
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
+}
+
+
+function update_r1170() {
+
+	$r1 = q("drop table fcontact");	
+	$r2 = q("drop table ffinder");	
+	$r3 = q("drop table fserver");	
+	$r4 = q("drop table fsuggest");	
+	$r5 = q("drop table spam");	
+
+	if($r1 && $r2 && $r3 && $r4 && $r5)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
 }
\ No newline at end of file
-- 
cgit v1.2.3


From dfb6255f59980835d364402b372dd39f2b41ee7c Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 31 May 2016 17:50:47 -0700
Subject: more removal of reserved words from DB schemas

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

(limited to 'install/update.php')

diff --git a/install/update.php b/install/update.php
index 0bd8d59f9..4883d6561 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1171 );
+define( 'UPDATE_VERSION' , 1172 );
 
 /**
  *
@@ -2146,4 +2146,21 @@ function update_r1170() {
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 
+}
+
+function update_r1171() {
+
+		$r1 = q("ALTER TABLE verify CHANGE `type` `vtype` varchar(32) NOT NULL DEFAULT '' ");
+		$r2 = q("ALTER TABLE tokens CHANGE `scope` `auth_scope` varchar(512) NOT NULL DEFAULT '' ");
+		$r3 = q("ALTER TABLE auth_codes CHANGE `scope` `auth_scope` varchar(512) NOT NULL DEFAULT '' ");
+		$r4 = q("ALTER TABLE clients CHANGE `name` `clname` TEXT ");
+		$r5 = q("ALTER TABLE session CHANGE `data` `sess_data` TEXT NOT NULL ");
+		$r6 = q("ALTER TABLE register CHANGE `language` `lang` varchar(16) NOT NULL DEFAULT '' ");
+
+	if($r1 && $r2 && $r3 && $r4 && $r5 && $r6)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+
+
 }
\ No newline at end of file
-- 
cgit v1.2.3


From b1259876bf398880e7b0c1b44d90f94983243e72 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 31 May 2016 21:45:33 -0700
Subject: more db column renames

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

(limited to 'install/update.php')

diff --git a/install/update.php b/install/update.php
index 4883d6561..dd0131ee8 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1172 );
+define( 'UPDATE_VERSION' , 1173 );
 
 /**
  *
@@ -2163,4 +2163,26 @@ function update_r1171() {
 
 
 
-}
\ No newline at end of file
+}
+
+function update_r1172() {
+
+	$r1 = q("ALTER TABLE term CHANGE `type` `ttype` int(3) NOT NULL DEFAULT '0' ");
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r2 = q("ALTER TABLE groups CHANGE `name` `gname` TEXT NOT NULL ");
+		$r3 = q("ALTER TABLE profile CHANGE `name` `fullname` TEXT NOT NULL ");
+		$r4 = q("ALTER TABLE profile CHANGE `with` `partner` TEXT NOT NULL ");
+		$r5 = q("ALTER TABLE profile CHANGE `work` `employment` TEXT NOT NULL ");
+	}
+	else {
+		$r2 = q("ALTER TABLE groups CHANGE `name` `gname` char(255) NOT NULL DEFAULT '' ");
+		$r3 = q("ALTER TABLE profile CHANGE `name` `fullname` char(255) NOT NULL DEFAULT '' ");
+		$r4 = q("ALTER TABLE profile CHANGE `with` `partner` char(255) NOT NULL DEFAULT '' ");
+		$r5 = q("ALTER TABLE profile CHANGE `work` `employment` TEXT NOT NULL ");
+	}
+	if($r1 && $r2 && $r3 && $r4 && $r5)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}
-- 
cgit v1.2.3


From a9d7acda279ebb7f2b3cd61a91a5e1d8b590dcf2 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 1 Jun 2016 21:48:54 -0700
Subject: the rest of the schema updates - WARNING: some third party plugins
 may fail; e.g. embedphotos and chess. $item['object'] is now $item['obj'] and
 $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale']
 and $photo['data'] is now $photo['content']. There are a number of other
 changes, but these are the ones noted to cause issues with third-party
 plugins. The project plugins have been updated. Please note any new issues as
 this effort touched a lot of code in a lot of files.

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

(limited to 'install/update.php')

diff --git a/install/update.php b/install/update.php
index dd0131ee8..3e18c9840 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1173 );
+define( 'UPDATE_VERSION' , 1176 );
 
 /**
  *
@@ -2186,3 +2186,71 @@ function update_r1172() {
 	return UPDATE_FAILED;
 
 }
+
+function update_r1173() {
+
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("ALTER TABLE notify CHANGE `name` `xname` TEXT NOT NULL ");
+		$r2 = q("ALTER TABLE notify CHANGE `date` `created` timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' ");
+		$r3 = q("ALTER TABLE notify CHANGE `type` `ntype` numeric(3) NOT NULL DEFAULT '0' ");
+	}
+	else {
+		$r1 = q("ALTER TABLE notify CHANGE `name` `xname` char(255) NOT NULL DEFAULT '' ");
+		$r2 = q("ALTER TABLE notify CHANGE `date` `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' ");
+		$r3 = q("ALTER TABLE notify CHANGE `type` `ntype` smallint(3) NOT NULL DEFAULT '0' ");
+	}
+
+	if($r1 && $r2 && $r3)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}
+
+function update_r1174() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("ALTER TABLE event CHANGE `type` `etype` varchar(255) NOT NULL DEFAULT '' ");
+		$r2 = q("ALTER TABLE event CHANGE `start` `dtstart` timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' ");
+		$r3 = q("ALTER TABLE event CHANGE `finish` `dtend` timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' ");
+		$r4 = q("ALTER TABLE event CHANGE `ignore` `dismissed` numeric(1) NOT NULL DEFAULT '0' ");
+		$r5 = q("ALTER TABLE attach CHANGE `data` `content` bytea NOT NULL ");
+		$r6 = q("ALTER TABLE photo CHANGE `data` `content` bytea NOT NULL ");
+	}
+	else {
+		$r1 = q("ALTER TABLE event CHANGE `type` `etype` char(255) NOT NULL DEFAULT '' ");
+		$r2 = q("ALTER TABLE event CHANGE `start` `dtstart` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' ");
+		$r3 = q("ALTER TABLE event CHANGE `finish` `dtend` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' ");
+		$r4 = q("ALTER TABLE event CHANGE `ignore` `dismissed` tinyint(1) NOT NULL DEFAULT '0' ");
+		$r5 = q("ALTER TABLE attach CHANGE `data` `content` longblob NOT NULL ");
+		$r6 = q("ALTER TABLE photo CHANGE `data` `content` mediumblob NOT NULL ");
+	}
+
+	if($r1 && $r2 && $r3 && $r4 && $r5 && $r6)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}
+
+function update_r1175() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("ALTER TABLE item CHANGE `object` `obj` text NOT NULL");
+		$r2 = q("ALTER TABLE photo CHANGE `size` `filesize` bigint NOT NULL DEFAULT '0' ");
+		$r3 = q("ALTER TABLE photo CHANGE `scale` `imgscale` numeric(3) NOT NULL DEFAULT '0' ");
+		$r4 = q("ALTER TABLE photo CHANGE `type` `mimetype` varchar(128) NOT NULL DEFAULT 'image/jpeg' ");
+
+	}
+	else {
+		$r1 = q("ALTER TABLE item CHANGE `object` `obj` text NOT NULL");
+		$r2 = q("ALTER TABLE photo CHANGE `size` `filesize` int(10) unsigned NOT NULL DEFAULT '0' ");
+		$r3 = q("ALTER TABLE photo CHANGE `scale` `imgscale` tinyint(3) unsigned NOT NULL DEFAULT '0' ");
+		$r4 = q("ALTER TABLE photo CHANGE `type` `mimetype` char(128) NOT NULL DEFAULT 'image/jpeg' ");
+
+	}
+
+	if($r1)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}
-- 
cgit v1.2.3


From 05d9e1bee565ac0448c779a00d8d637341390cf7 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 1 Jun 2016 22:05:17 -0700
Subject: check all return values

---
 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 3e18c9840..908f60498 100644
--- a/install/update.php
+++ b/install/update.php
@@ -2249,7 +2249,7 @@ function update_r1175() {
 
 	}
 
-	if($r1)
+	if($r1 && $r2 && $r3 && $r4)
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 
-- 
cgit v1.2.3