From bb1a4e56b358c36a7996be8d34b84e7f118f63f5 Mon Sep 17 00:00:00 2001 From: zephyrus Date: Mon, 1 Sep 2008 00:03:10 +0000 Subject: - Moved char server's mercenary code to a different file (int_mercenary.*) - New Sql Patch for create mercenary_owner DB. - Removed mer_id from char_db. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13166 54d463be-8e91-2dee-dedb-b68131a5f0ec --- sql-files/convert_engine_innodb.sql | 2 ++ sql-files/convert_engine_myisam.sql | 2 ++ sql-files/main.sql | 16 ++++++++++++++++ sql-files/upgrade_svn13166_mercenary_owner.sql | 21 +++++++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 sql-files/upgrade_svn13166_mercenary_owner.sql (limited to 'sql-files') diff --git a/sql-files/convert_engine_innodb.sql b/sql-files/convert_engine_innodb.sql index 1402886c7..9d8c7a85f 100644 --- a/sql-files/convert_engine_innodb.sql +++ b/sql-files/convert_engine_innodb.sql @@ -28,6 +28,8 @@ ALTER TABLE `login` ENGINE = InnoDB; ALTER TABLE `mail` ENGINE = InnoDB; ALTER TABLE `mapreg` ENGINE = InnoDB; ALTER TABLE `memo` ENGINE = InnoDB; +ALTER TABLE `mercenary` ENGINE = InnoDB; +ALTER TABLE `mercenary_owner` ENGINE = InnoDB; #ALTER TABLE `mob_db` ENGINE = InnoDB; #ALTER TABLE `mob_db2` ENGINE = InnoDB; ALTER TABLE `party` ENGINE = InnoDB; diff --git a/sql-files/convert_engine_myisam.sql b/sql-files/convert_engine_myisam.sql index 336d6ce9d..9e9080157 100644 --- a/sql-files/convert_engine_myisam.sql +++ b/sql-files/convert_engine_myisam.sql @@ -28,6 +28,8 @@ ALTER TABLE `login` ENGINE = MyISAM; ALTER TABLE `mail` ENGINE = MyISAM; ALTER TABLE `mapreg` ENGINE = MyISAM; ALTER TABLE `memo` ENGINE = MyISAM; +ALTER TABLE `mercenary` ENGINE = MyISAM; +ALTER TABLE `mercenary_owner` ENGINE = MyISAM; #ALTER TABLE `mob_db` ENGINE = MyISAM; #ALTER TABLE `mob_db2` ENGINE = MyISAM; ALTER TABLE `party` ENGINE = MyISAM; diff --git a/sql-files/main.sql b/sql-files/main.sql index a5c23421a..346e19ca1 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -497,6 +497,22 @@ CREATE TABLE IF NOT EXISTS `mercenary` ( PRIMARY KEY (`mer_id`) ) ENGINE=MyISAM; +-- +-- Table structure for table `mercenary_owner` +-- + +CREATE TABLE IF NOT EXISTS `mercenary_owner` ( + `char_id` int(11) NOT NULL, + `merc_id` int(11) NOT NULL default '0', + `arch_calls` int(11) NOT NULL default '0', + `arch_faith` int(11) NOT NULL default '0', + `spear_calls` int(11) NOT NULL default '0', + `spear_faith` int(11) NOT NULL default '0', + `sword_calls` int(11) NOT NULL default '0', + `sword_faith` int(11) NOT NULL default '0', + PRIMARY KEY (`char_id`) +) ENGINE=MyISAM; + -- -- Table structure for table `party` -- diff --git a/sql-files/upgrade_svn13166_mercenary_owner.sql b/sql-files/upgrade_svn13166_mercenary_owner.sql new file mode 100644 index 000000000..da7728cbe --- /dev/null +++ b/sql-files/upgrade_svn13166_mercenary_owner.sql @@ -0,0 +1,21 @@ +-- Removes mer_id from Char DB + +ALTER TABLE `char` DROP COLUMN `mer_id`; + +-- Clean mercenary DB + +TRUNCATE TABLE `mercenary`; + +-- Table structure for table `mercenary_owner` + +CREATE TABLE IF NOT EXISTS `mercenary_owner` ( + `char_id` int(11) NOT NULL, + `merc_id` int(11) NOT NULL default '0', + `arch_calls` int(11) NOT NULL default '0', + `arch_faith` int(11) NOT NULL default '0', + `spear_calls` int(11) NOT NULL default '0', + `spear_faith` int(11) NOT NULL default '0', + `sword_calls` int(11) NOT NULL default '0', + `sword_faith` int(11) NOT NULL default '0', + PRIMARY KEY (`char_id`) +) ENGINE=MyISAM; -- cgit v1.2.3-70-g09d2