Skip to content

Commit

Permalink
Merge pull request #2205 from dastgirp/issue/2187
Browse files Browse the repository at this point in the history 
Fixed issue #2187
  • Loading branch information
@MishimaHaruna
MishimaHaruna committed Sep 23, 2018
2 parents 7e3c43a + 1da462a commit 98e2ef2
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 28 deletions.
58 changes: 30 additions & 28 deletions sql-files/main.sql
View file
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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`
--
Expand All @@ -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',
Expand All @@ -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',
Expand Down
63 changes: 63 additions & 0 deletions sql-files/upgrades/2018-09-01--05-22.sql
View file
@@ -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');
1 change: 1 addition & 0 deletions sql-files/upgrades/index.txt
View file
Expand Up @@ -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

0 comments on commit 98e2ef2

Please sign in to comment.