From f5ef43b0208c1cc784f10a8b6decad66d130e781 Mon Sep 17 00:00:00 2001
From: Guillermo Giuliana <guillermogiuliana@hotmail.com>
Date: Fri, 24 Jan 2020 17:56:38 -0300
Subject: [PATCH] add table_schema verification to 4.6.0v upgrade

---
 version_upgrades/4.6.0/4.6.0.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version_upgrades/4.6.0/4.6.0.php b/version_upgrades/4.6.0/4.6.0.php
index f3ad4f9e..0ccf699e 100644
--- a/version_upgrades/4.6.0/4.6.0.php
+++ b/version_upgrades/4.6.0/4.6.0.php
@@ -4,7 +4,7 @@ print 'Begin update v4.6.0...' . PHP_EOL;
 
 // Update Ticket table
 print '[1/3] Updating ticket table...' . PHP_EOL;
-if ($mysql->query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'ticket' AND COLUMN_NAME = 'edited_title'")->num_rows == 0) {
+if ($mysql->query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'ticket' AND COLUMN_NAME = 'edited_title' AND TABLE_SCHEMA = '$mysql_db'")->num_rows == 0) {
 	$mysql->query("ALTER TABLE ticket ADD edited_title tinyint(1)");
 } else {
 	print 'edited_title column already exists' . PHP_EOL;
@@ -12,7 +12,7 @@ if ($mysql->query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '
 
 // Update APIkey table
 print '[2/3] Updating APIkey table...' . PHP_EOL;
-if ($mysql->query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'apikey' AND COLUMN_NAME = 'type'")->num_rows == 0) {
+if ($mysql->query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'apikey' AND COLUMN_NAME = 'type' AND TABLE_SCHEMA = '$mysql_db'")->num_rows == 0) {
 	$mysql->query("ALTER TABLE apikey ADD type varchar(191)");
 } else {
 	print 'type column already  exists' . PHP_EOL;
@@ -20,7 +20,7 @@ if ($mysql->query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '
 
 // Update Log table
 print '[3/3] Updating Log table...' . PHP_EOL;
-if ($mysql->query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'log' AND COLUMN_NAME = 'author_name'")->num_rows == 0) {
+if ($mysql->query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'log' AND COLUMN_NAME = 'author_name' AND TABLE_SCHEMA = '$mysql_db'")->num_rows == 0) {
 	$mysql->query("ALTER TABLE log ADD author_name varchar(191)");
 } else {
 	print 'author_name column already exists' . PHP_EOL;