aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2099 from woogerboy21/serverid_roomdbgtable_fix

Browse source 
Servatrice rooms table respect Server ID
This commit is contained in:
woogerboy21 2016-07-21 09:54:20 -04:00 committed by GitHub
commit 8060c8f37b
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servatrice/migrations/servatrice_0014_to_0015.sql Normal file
View file

@ -0,0 +1,6 @@
-- Servatrice db migration from version 14 to version 15
alter table cockatrice_rooms add `id_server` tinyint(3) not null default 0;
alter table cockatrice_rooms_gametypes add `id_server` tinyint(3) not null default 0;
UPDATE cockatrice_schema_version SET version=15 WHERE version=14;

2
servatrice/servatrice.sql
View file

@ -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(14);
INSERT INTO cockatrice_schema_version VALUES(15);
-- users and user data tables
CREATE TABLE IF NOT EXISTS `cockatrice_users` (

6
servatrice/src/servatrice.cpp
View file

@ -276,10 +276,12 @@ bool Servatrice::initServer()
const QString roomMethod = settingsCache->value("rooms/method").toString();
if (roomMethod == "sql") {
QSqlQuery *query = servatriceDatabaseInterface->prepareQuery("select id, name, descr, permissionlevel, auto_join, join_message, chat_history_size from {prefix}_rooms order by id asc");
QSqlQuery *query = servatriceDatabaseInterface->prepareQuery("select id, name, descr, permissionlevel, auto_join, join_message, chat_history_size from {prefix}_rooms where id_server = :id_server order by id asc");
query->bindValue(":id_server", serverId);
servatriceDatabaseInterface->execSqlQuery(query);
while (query->next()) {
QSqlQuery *query2 = servatriceDatabaseInterface->prepareQuery("select name from {prefix}_rooms_gametypes where id_room = :id_room");
QSqlQuery *query2 = servatriceDatabaseInterface->prepareQuery("select name from {prefix}_rooms_gametypes where id_room = :id_room AND id_server = :id_server");
query2->bindValue(":id_server", serverId);
query2->bindValue(":id_room", query->value(0).toInt());
servatriceDatabaseInterface->execSqlQuery(query2);
QStringList gameTypes;

2
servatrice/src/servatrice_database_interface.h
View file

@ -9,7 +9,7 @@
#include "server.h"
#include "server_database_interface.h"
#define DATABASE_SCHEMA_VERSION 14
#define DATABASE_SCHEMA_VERSION 15
class Servatrice;