From 1c763528aed86a24e2603b187d116b6d37c4fb21 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Tue, 28 Apr 2009 23:08:10 +0200 Subject: [PATCH] sql fix --- servatrice/src/server.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/servatrice/src/server.cpp b/servatrice/src/server.cpp index 59a36fba..9a91f4aa 100644 --- a/servatrice/src/server.cpp +++ b/servatrice/src/server.cpp @@ -36,6 +36,9 @@ Server::~Server() bool Server::openDatabase() { + if (!QSqlDatabase::connectionNames().isEmpty()) + QSqlDatabase::removeDatabase(QSqlDatabase::database().connectionNames().at(0)); + settings->beginGroup("database"); QSqlDatabase sqldb = QSqlDatabase::addDatabase("QMYSQL"); sqldb.setHostName(settings->value("hostname").toString()); @@ -78,11 +81,8 @@ void Server::incomingConnection(int socketId) AuthenticationResult Server::checkUserPassword(const QString &user, const QString &password) { - if (!QSqlDatabase::database().isOpen()) - if (!openDatabase()) { - qCritical(QString("Database error: %1").arg(QSqlDatabase::database().lastError().text()).toLatin1()); - return PasswordWrong; - } + if (!QSqlDatabase::exec("select 1").isActive()) + openDatabase(); QSqlQuery query; query.prepare("select password from players where name = :name");