Merge pull request #2205 from dastgirp/issue/2187

Fixed issue #2187

3 files changed, 94 insertions, 28 deletions

diff --git a/sql-files/main.sql b/sql-files/main.sql
index 2fa6f1332..d918d4a35 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -75,10 +75,10 @@ CREATE TABLE IF NOT EXISTS `auction` (
   `type` SMALLINT(6) NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -152,10 +152,10 @@ CREATE TABLE IF NOT EXISTS `cart_inventory` (
   `identify` SMALLINT(6) NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -512,10 +512,10 @@ CREATE TABLE IF NOT EXISTS `guild_storage` (
   `identify` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -587,10 +587,10 @@ CREATE TABLE IF NOT EXISTS `inventory` (
   `identify` SMALLINT(6) NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -711,10 +711,10 @@ CREATE TABLE IF NOT EXISTS `mail` (
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
   `identify` SMALLINT(6) NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -921,6 +921,8 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1527964800); -- 2018-06-0
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1528026381); -- 2018-06-03--17-16.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1528180320); -- 2018-06-05--12-02.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1532403228); -- 2018-07-24--03-23.sql
+INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1535865732); -- 2018-09-01--05-22.sql
+
 --
 -- Table structure for table `storage`
 --
@@ -934,10 +936,10 @@ CREATE TABLE IF NOT EXISTS `storage` (
   `identify` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -964,10 +966,10 @@ CREATE TABLE IF NOT EXISTS `rodex_items` (
 	`identify` SMALLINT(6) NOT NULL DEFAULT '0',
 	`refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
 	`attribute` TINYINT(4) NOT NULL DEFAULT '0',
-	`card0` SMALLINT(11) NOT NULL DEFAULT '0',
-	`card1` SMALLINT(11) NOT NULL DEFAULT '0',
-	`card2` SMALLINT(11) NOT NULL DEFAULT '0',
-	`card3` SMALLINT(11) NOT NULL DEFAULT '0',
+	`card0` INT(11) NOT NULL DEFAULT '0',
+	`card1` INT(11) NOT NULL DEFAULT '0',
+	`card2` INT(11) NOT NULL DEFAULT '0',
+	`card3` INT(11) NOT NULL DEFAULT '0',
 	`opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
 	`opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
 	`opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
diff --git a/sql-files/upgrades/2018-09-01--05-22.sql b/sql-files/upgrades/2018-09-01--05-22.sql
new file mode 100644
index 000000000..7a834edd4
--- /dev/null
+++ b/sql-files/upgrades/2018-09-01--05-22.sql
@@ -0,0 +1,63 @@
+#1535865732
+
+-- This file is part of Hercules.
+-- http://herc.ws - http://github.com/HerculesWS/Hercules
+--
+-- Copyright (C) 2018  Hercules Dev Team
+--
+-- Hercules is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ALTER TABLE `auction`
+	MODIFY `card0` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card1` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card2` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card3` INT(11) NOT NULL DEFAULT '0';
+
+ALTER TABLE `cart_inventory`
+	MODIFY `card0` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card1` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card2` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card3` INT(11) NOT NULL DEFAULT '0';
+
+ALTER TABLE `guild_storage`
+	MODIFY `card0` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card1` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card2` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card3` INT(11) NOT NULL DEFAULT '0';
+	
+ALTER TABLE `inventory`
+	MODIFY `card0` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card1` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card2` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card3` INT(11) NOT NULL DEFAULT '0';
+	
+ALTER TABLE `mail`
+	MODIFY `card0` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card1` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card2` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card3` INT(11) NOT NULL DEFAULT '0';
+
+ALTER TABLE `rodex_items`
+	MODIFY `card0` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card1` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card2` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card3` INT(11) NOT NULL DEFAULT '0';
+	
+ALTER TABLE `storage`
+	MODIFY `card0` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card1` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card2` INT(11) NOT NULL DEFAULT '0',
+	MODIFY `card3` INT(11) NOT NULL DEFAULT '0';
+ 
+INSERT INTO `sql_updates` (`timestamp`, `ignored`) VALUES (1535865732, 'No');
diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt
index 705234d01..2c88535cc 100644
--- a/sql-files/upgrades/index.txt
+++ b/sql-files/upgrades/index.txt
@@ -49,3 +49,4 @@
 2018-06-03--17-16.sql
 2018-06-05--12-02.sql
 2018-07-24--03-23.sql
+2018-09-01--05-22.sql