From 0f0f9a1246dbc406122482682e5877951ac063cc Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Wed, 3 Aug 2016 03:58:56 +0200 Subject: [PATCH] fix #2118 (#2119) --- servatrice/migrations/servatrice_0016_to_0017.sql | 7 +++++++ servatrice/servatrice.sql | 8 ++++---- servatrice/src/servatrice_database_interface.h | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 servatrice/migrations/servatrice_0016_to_0017.sql diff --git a/servatrice/migrations/servatrice_0016_to_0017.sql b/servatrice/migrations/servatrice_0016_to_0017.sql new file mode 100644 index 00000000..c351c4c7 --- /dev/null +++ b/servatrice/migrations/servatrice_0016_to_0017.sql @@ -0,0 +1,7 @@ +-- Servatrice db migration from version 16 to version 17 + +alter table cockatrice_rooms modify column `id_server` tinyint(3) not null default 1; +alter table cockatrice_rooms_gametypes modify column `id_server` tinyint(3) not null default 1; +alter table cockatrice_servermessages modify column `id_server` tinyint(3) not null default 1; + +UPDATE cockatrice_schema_version SET version=17 WHERE version=16; diff --git a/servatrice/servatrice.sql b/servatrice/servatrice.sql index 77f9a78b..f354267d 100644 --- a/servatrice/servatrice.sql +++ b/servatrice/servatrice.sql @@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` ( PRIMARY KEY (`version`) ) ENGINE=INNODB DEFAULT CHARSET=utf8; -INSERT INTO cockatrice_schema_version VALUES(16); +INSERT INTO cockatrice_schema_version VALUES(17); -- users and user data tables CREATE TABLE IF NOT EXISTS `cockatrice_users` ( @@ -90,14 +90,14 @@ CREATE TABLE IF NOT EXISTS `cockatrice_rooms` ( `auto_join` tinyint(1) default 0, `join_message` varchar(255) NOT NULL, `chat_history_size` int(4) NOT NULL, - `id_server` tinyint(3) NOT NULL, + `id_server` tinyint(3) NOT NULL DEFAULT 1, PRIMARY KEY (`id`) ) ENGINE=INNODB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `cockatrice_rooms_gametypes` ( `id_room` int(7) unsigned NOT NULL, `name` varchar(50) NOT NULL, - `id_server` tinyint(3) NOT NULL, + `id_server` tinyint(3) NOT NULL DEFAULT 1, FOREIGN KEY(`id_room`) REFERENCES `cockatrice_rooms`(`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=INNODB DEFAULT CHARSET=utf8; @@ -167,7 +167,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_uptime` ( ) ENGINE=INNODB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `cockatrice_servermessages` ( - `id_server` tinyint(3) not null default 0, + `id_server` tinyint(3) not null default 1, `timest` datetime NOT NULL default '0000-00-00 00:00:00', `message` text, PRIMARY KEY (`timest`) diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h index 3ec8a5e5..3998812a 100644 --- a/servatrice/src/servatrice_database_interface.h +++ b/servatrice/src/servatrice_database_interface.h @@ -9,7 +9,7 @@ #include "server.h" #include "server_database_interface.h" -#define DATABASE_SCHEMA_VERSION 16 +#define DATABASE_SCHEMA_VERSION 17 class Servatrice;