From fba5a19e5885e3f4ddca2c249a96fbbe24c846b8 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Tue, 1 Nov 2011 04:13:56 +0100 Subject: Renamed the db update 15 to 18 as requested by Bjorn. --- src/common/manaserv_protocol.h | 2 +- src/sql/mysql/createTables.sql | 2 +- src/sql/mysql/updates/update_14_to_15.sql | 22 ---------------------- src/sql/mysql/updates/update_17_to_18.sql | 22 ++++++++++++++++++++++ src/sql/sqlite/createTables.sql | 2 +- src/sql/sqlite/updates/update_14_to_15.sql | 21 --------------------- src/sql/sqlite/updates/update_17_to_18.sql | 21 +++++++++++++++++++++ 7 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 src/sql/mysql/updates/update_14_to_15.sql create mode 100644 src/sql/mysql/updates/update_17_to_18.sql delete mode 100644 src/sql/sqlite/updates/update_14_to_15.sql create mode 100644 src/sql/sqlite/updates/update_17_to_18.sql diff --git a/src/common/manaserv_protocol.h b/src/common/manaserv_protocol.h index 8946a394..cfc2f4c1 100644 --- a/src/common/manaserv_protocol.h +++ b/src/common/manaserv_protocol.h @@ -26,7 +26,7 @@ namespace ManaServ { enum { PROTOCOL_VERSION = 1, - SUPPORTED_DB_VERSION = 17 + SUPPORTED_DB_VERSION = 18 }; /** diff --git a/src/sql/mysql/createTables.sql b/src/sql/mysql/createTables.sql index b75fc0ed..dffbf8f0 100644 --- a/src/sql/mysql/createTables.sql +++ b/src/sql/mysql/createTables.sql @@ -437,7 +437,7 @@ AUTO_INCREMENT=0 ; INSERT INTO mana_world_states VALUES('accountserver_startup',NULL,NULL, NOW()); INSERT INTO mana_world_states VALUES('accountserver_version',NULL,NULL, NOW()); -INSERT INTO mana_world_states VALUES('database_version', NULL,'17', NOW()); +INSERT INTO mana_world_states VALUES('database_version', NULL,'18', NOW()); -- all known transaction codes diff --git a/src/sql/mysql/updates/update_14_to_15.sql b/src/sql/mysql/updates/update_14_to_15.sql deleted file mode 100644 index 1036817b..00000000 --- a/src/sql/mysql/updates/update_14_to_15.sql +++ /dev/null @@ -1,22 +0,0 @@ - --- Dropping the table will only unequip characters, so it's not an issue. -DROP TABLE mana_char_equips; - --- Recreate the table using the latest definition. -CREATE TABLE IF NOT EXISTS `mana_char_equips` ( - `id` int(10) unsigned NOT NULL auto_increment, - `owner_id` int(10) unsigned NOT NULL, - `slot_type` int(10) unsigned NOT NULL, - `item_id` int(10) unsigned NOT NULL, - `item_instance` int(10) unsigned NOT NULL, - -- - PRIMARY KEY (`id`), - FOREIGN KEY (`owner_id`) REFERENCES `mana_characters` (`id`) -) ENGINE=InnoDB -DEFAULT CHARSET=utf8; - --- Update database version. -UPDATE mana_world_states -SET value = '15', -moddate = UNIX_TIMESTAMP() -WHERE state_name = 'database_version'; diff --git a/src/sql/mysql/updates/update_17_to_18.sql b/src/sql/mysql/updates/update_17_to_18.sql new file mode 100644 index 00000000..9614389c --- /dev/null +++ b/src/sql/mysql/updates/update_17_to_18.sql @@ -0,0 +1,22 @@ + +-- Dropping the table will only unequip characters, so it's not an issue. +DROP TABLE mana_char_equips; + +-- Recreate the table using the latest definition. +CREATE TABLE IF NOT EXISTS `mana_char_equips` ( + `id` int(10) unsigned NOT NULL auto_increment, + `owner_id` int(10) unsigned NOT NULL, + `slot_type` int(10) unsigned NOT NULL, + `item_id` int(10) unsigned NOT NULL, + `item_instance` int(10) unsigned NOT NULL, + -- + PRIMARY KEY (`id`), + FOREIGN KEY (`owner_id`) REFERENCES `mana_characters` (`id`) +) ENGINE=InnoDB +DEFAULT CHARSET=utf8; + +-- Update database version. +UPDATE mana_world_states +SET value = '18', +moddate = UNIX_TIMESTAMP() +WHERE state_name = 'database_version'; diff --git a/src/sql/sqlite/createTables.sql b/src/sql/sqlite/createTables.sql index 2d7360da..b2d94fb5 100644 --- a/src/sql/sqlite/createTables.sql +++ b/src/sql/sqlite/createTables.sql @@ -419,7 +419,7 @@ AS INSERT INTO mana_world_states VALUES('accountserver_startup',NULL,NULL, strftime('%s','now')); INSERT INTO mana_world_states VALUES('accountserver_version',NULL,NULL, strftime('%s','now')); -INSERT INTO mana_world_states VALUES('database_version', NULL,'17', strftime('%s','now')); +INSERT INTO mana_world_states VALUES('database_version', NULL,'18', strftime('%s','now')); -- all known transaction codes diff --git a/src/sql/sqlite/updates/update_14_to_15.sql b/src/sql/sqlite/updates/update_14_to_15.sql deleted file mode 100644 index 777764d8..00000000 --- a/src/sql/sqlite/updates/update_14_to_15.sql +++ /dev/null @@ -1,21 +0,0 @@ - --- Dropping the table will only unequip characters, so it's not an issue. -DROP TABLE mana_char_equips; - --- Recreate the table using the latest definition. -CREATE TABLE mana_char_equips -( - id INTEGER PRIMARY KEY, - owner_id INTEGER NOT NULL, - slot_type INTEGER NOT NULL, - item_id INTEGER NOT NULL, - item_instance INTEGER NOT NULL, - -- - FOREIGN KEY (owner_id) REFERENCES mana_characters(id) -); - --- Update the database version, and set date of update -UPDATE mana_world_states - SET value = '15', - moddate = strftime('%s','now') - WHERE state_name = 'database_version'; diff --git a/src/sql/sqlite/updates/update_17_to_18.sql b/src/sql/sqlite/updates/update_17_to_18.sql new file mode 100644 index 00000000..3fa75c6a --- /dev/null +++ b/src/sql/sqlite/updates/update_17_to_18.sql @@ -0,0 +1,21 @@ + +-- Dropping the table will only unequip characters, so it's not an issue. +DROP TABLE mana_char_equips; + +-- Recreate the table using the latest definition. +CREATE TABLE mana_char_equips +( + id INTEGER PRIMARY KEY, + owner_id INTEGER NOT NULL, + slot_type INTEGER NOT NULL, + item_id INTEGER NOT NULL, + item_instance INTEGER NOT NULL, + -- + FOREIGN KEY (owner_id) REFERENCES mana_characters(id) +); + +-- Update the database version, and set date of update +UPDATE mana_world_states + SET value = '18', + moddate = strftime('%s','now') + WHERE state_name = 'database_version'; -- cgit v1.2.3-70-g09d2