From b39a18b4465462816649586cc6bec8b1e4c17707 Mon Sep 17 00:00:00 2001 From: woogerboy21 Date: Thu, 21 Jul 2016 10:30:38 -0400 Subject: [PATCH 1/2] Remove unused news database table --- servatrice/servatrice.sql | 13 +------------ servatrice/src/servatrice_database_interface.h | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/servatrice/servatrice.sql b/servatrice/servatrice.sql index 45f41b57..e8973d7b 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(15); +INSERT INTO cockatrice_schema_version VALUES(16); -- users and user data tables CREATE TABLE IF NOT EXISTS `cockatrice_users` ( @@ -142,17 +142,6 @@ CREATE TABLE IF NOT EXISTS `cockatrice_replays_access` ( -- server administration --- Note: unused table -CREATE TABLE IF NOT EXISTS `cockatrice_news` ( - `id` int(7) unsigned zerofill NOT NULL auto_increment, - `id_user` int(7) unsigned zerofill NOT NULL, - `news_date` datetime NOT NULL, - `subject` varchar(255) NOT NULL, - `content` text NOT NULL, - PRIMARY KEY (`id`), - FOREIGN KEY(`id_user`) REFERENCES `cockatrice_users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=INNODB DEFAULT CHARSET=utf8; - -- Note: unused table CREATE TABLE IF NOT EXISTS `cockatrice_servers` ( `id` mediumint(8) unsigned NOT NULL, diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h index 086d0ba9..3ec8a5e5 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 15 +#define DATABASE_SCHEMA_VERSION 16 class Servatrice; From 1c1192c5258c2cbec99a3e416509e95b8c34f140 Mon Sep 17 00:00:00 2001 From: woogerboy21 Date: Thu, 21 Jul 2016 10:38:46 -0400 Subject: [PATCH 2/2] Update maint script files --- servatrice/migrations/servatrice_0015_to_0016.sql | 5 +++++ servatrice/scripts/linux/db_backup_all | 1 - servatrice/scripts/linux/db_restore_all | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 servatrice/migrations/servatrice_0015_to_0016.sql diff --git a/servatrice/migrations/servatrice_0015_to_0016.sql b/servatrice/migrations/servatrice_0015_to_0016.sql new file mode 100644 index 00000000..d6029c50 --- /dev/null +++ b/servatrice/migrations/servatrice_0015_to_0016.sql @@ -0,0 +1,5 @@ +-- Servatrice db migration from version 15 to version 16 + +drop table cockatrice_news; + +UPDATE cockatrice_schema_version SET version=16 WHERE version=15; diff --git a/servatrice/scripts/linux/db_backup_all b/servatrice/scripts/linux/db_backup_all index 35aa5d41..e97b91cc 100644 --- a/servatrice/scripts/linux/db_backup_all +++ b/servatrice/scripts/linux/db_backup_all @@ -25,7 +25,6 @@ TABLES=( "cockatrice_schema_version" "cockatrice_servermessages" "cockatrice_servers" - "cockatrice_news" "cockatrice_rooms" "cockatrice_rooms_gametypes" ) diff --git a/servatrice/scripts/linux/db_restore_all b/servatrice/scripts/linux/db_restore_all index 37d1f31e..376a9fc0 100644 --- a/servatrice/scripts/linux/db_restore_all +++ b/servatrice/scripts/linux/db_restore_all @@ -25,7 +25,6 @@ TABLES=( "cockatrice_schema_version" "cockatrice_servermessages" "cockatrice_servers" - "cockatrice_news" "cockatrice_rooms" "cockatrice_rooms_gametypes" )