From bca771a1fae25ed2cdfb870963ed5e43d9519c06 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 28 Apr 2018 19:10:42 -0300 Subject: Merge evol-server-data with TMW2. Unexpected bugs may show up, beware. Conversion scripts were NOT used --- sql-files/main.sql | 3 +++ sql-files/upgrades/2018-03-10--04-06.sql | 24 ++++++++++++++++++++++++ sql-files/upgrades/index.txt | 1 + 3 files changed, 28 insertions(+) create mode 100644 sql-files/upgrades/2018-03-10--04-06.sql (limited to 'sql-files') diff --git a/sql-files/main.sql b/sql-files/main.sql index 5546c0271..2e51d6a12 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -219,6 +219,8 @@ CREATE TABLE IF NOT EXISTS `char` ( `uniqueitem_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', `sex` ENUM('M','F','U') NOT NULL DEFAULT 'U', `hotkey_rowshift` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0', + `attendance_count` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0', + `attendance_timer` BIGINT(20) NULL DEFAULT '0', PRIMARY KEY (`char_id`), UNIQUE KEY `name_key` (`name`), KEY `account_id` (`account_id`), @@ -890,6 +892,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1496588640); -- 2017-06-0 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1496588700); -- 2017-06-04--15-05.sql INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1509835214); -- 2017-11-04--10-39.sql INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1519671456); -- 2018-02-26--15-57.sql +INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1520654809); -- 2018-03-10--04-06.sql -- -- Table structure for table `storage` -- diff --git a/sql-files/upgrades/2018-03-10--04-06.sql b/sql-files/upgrades/2018-03-10--04-06.sql new file mode 100644 index 000000000..ee827735d --- /dev/null +++ b/sql-files/upgrades/2018-03-10--04-06.sql @@ -0,0 +1,24 @@ +#1520654809 + +-- This file is part of Hercules. +-- http://herc.ws - http://github.com/HerculesWS/Hercules +-- +-- Copyright (C) 2017 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 . + +ALTER TABLE `char` ADD COLUMN `attendance_count` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `hotkey_rowshift`; +ALTER TABLE `char` ADD COLUMN `attendance_timer` BIGINT(20) NULL DEFAULT '0' AFTER `attendance_count`; + +INSERT INTO `sql_updates` (`timestamp`, `ignored`) VALUES (1520654809 , 'No'); diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt index 976df13f6..dd474ea9d 100644 --- a/sql-files/upgrades/index.txt +++ b/sql-files/upgrades/index.txt @@ -43,3 +43,4 @@ 2017-06-04--15-05.sql 2017-11-04--10-39.sql 2018-02-26--15-57.sql +2018-03-10--04-06.sql -- cgit v1.2.3-60-g2f50