From 1ed98105a10b99ce50d8d0f7d11352a2eb940d83 Mon Sep 17 00:00:00 2001
From: Yehonal <yehonal.azeroth@gmail.com>
Date: Sun, 20 Aug 2017 06:03:34 +0200
Subject: [PATCH] importing pending sql

---
 .../2017_08_20_00.sql}                        | 24 ++++++++++++++
 data/sql/updates/db_world/2017_08_20_00.sql   | 33 +++++++++++++++++++
 .../rev_1498796247453520600.sql               |  9 -----
 3 files changed, 57 insertions(+), 9 deletions(-)
 rename data/sql/updates/{pending_db_auth/rev_1498796201292521600.sql => db_auth/2017_08_20_00.sql} (52%)
 create mode 100644 data/sql/updates/db_world/2017_08_20_00.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1498796247453520600.sql

diff --git a/data/sql/updates/pending_db_auth/rev_1498796201292521600.sql b/data/sql/updates/db_auth/2017_08_20_00.sql
similarity index 52%
rename from data/sql/updates/pending_db_auth/rev_1498796201292521600.sql
rename to data/sql/updates/db_auth/2017_08_20_00.sql
index a57efdf16..3a2c0f2ba 100644
--- a/data/sql/updates/pending_db_auth/rev_1498796201292521600.sql
+++ b/data/sql/updates/db_auth/2017_08_20_00.sql
@@ -1,3 +1,18 @@
+-- DB update 2017_08_19_00 -> 2017_08_20_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_auth' AND COLUMN_NAME = '2017_08_19_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_auth CHANGE COLUMN 2017_08_19_00 2017_08_20_00 bit;
+SELECT sql_rev INTO OK FROM version_db_auth WHERE sql_rev = '1498796201292521600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
 INSERT INTO version_db_auth (`sql_rev`) VALUES ('1498796201292521600');
 
 ALTER TABLE `account` ADD COLUMN `lock_country` VARCHAR(2) NOT NULL DEFAULT '00' AFTER `locked`;
@@ -21,3 +36,12 @@ CREATE TABLE `ip2nationCountries` (
   PRIMARY KEY  (`code`),
   KEY `code` (`code`)
 )ENGINE=InnoDB DEFAULT CHARSET=utf8;
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_20_00.sql b/data/sql/updates/db_world/2017_08_20_00.sql
new file mode 100644
index 000000000..ad1bd8c62
--- /dev/null
+++ b/data/sql/updates/db_world/2017_08_20_00.sql
@@ -0,0 +1,33 @@
+-- DB update 2017_08_19_19 -> 2017_08_20_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2017_08_19_19';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2017_08_19_19 2017_08_20_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1498796247453520600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1498796247453520600');
+
+DROP TABLE IF EXISTS ip2nation;
+DROP TABLE IF EXISTS ip2nationCountries;
+
+DELETE FROM `command` WHERE `name` in ('account lock', 'account lock ip', 'account lock country');
+INSERT INTO `command` (`name`,`security`,`help`) VALUES
+('account lock ip', 0, 'Syntax: .account lock ip [on|off]\nAllow login from account only from current used IP or remove this requirement.'),
+('account lock country', 0, 'Syntax: .account lock country [on|off]\nAllow login from account only from current used Country or remove this requirement.');
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1498796247453520600.sql b/data/sql/updates/pending_db_world/rev_1498796247453520600.sql
deleted file mode 100644
index aecf0fd2d..000000000
--- a/data/sql/updates/pending_db_world/rev_1498796247453520600.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1498796247453520600');
-
-DROP TABLE IF EXISTS ip2nation;
-DROP TABLE IF EXISTS ip2nationCountries;
-
-DELETE FROM `command` WHERE `name` in ('account lock', 'account lock ip', 'account lock country');
-INSERT INTO `command` (`name`,`security`,`help`) VALUES
-('account lock ip', 0, 'Syntax: .account lock ip [on|off]\nAllow login from account only from current used IP or remove this requirement.'),
-('account lock country', 0, 'Syntax: .account lock country [on|off]\nAllow login from account only from current used Country or remove this requirement.');