From 403c2e4a2d9c3aa36cd398cc61d800977b1d457e Mon Sep 17 00:00:00 2001 From: ondra Date: Thu, 10 Dec 2020 20:47:57 +0100 Subject: [PATCH] Fix quotes --- src/serversdk/databasetable.cpp | 1 - src/serversdk/databaseutils.cpp | 22 ++++++++++++++++++++-- src/serversdk/requestmanager.cpp | 8 +++----- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/serversdk/databasetable.cpp b/src/serversdk/databasetable.cpp index 49fbc13..27679a7 100644 --- a/src/serversdk/databasetable.cpp +++ b/src/serversdk/databasetable.cpp @@ -35,7 +35,6 @@ QByteArray DatabaseTable::jsonData(const QSet &filters) const bool DatabaseTable::fromJson(const QByteArray &data) { // in: JSON ( e.g. {"id": 300} ) - qDebug(sdkdb) << "Response:" << data; QJsonDocument doc = QJsonDocument::fromJson(data); QVariantMap variant = qvariant_cast(doc.toVariant()); diff --git a/src/serversdk/databaseutils.cpp b/src/serversdk/databaseutils.cpp index 6081271..751c24f 100644 --- a/src/serversdk/databaseutils.cpp +++ b/src/serversdk/databaseutils.cpp @@ -139,6 +139,8 @@ QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QStri values += ":" + key; } + + QSqlQuery query(mDatabaseManager->database()); QString queryText = QString("INSERT INTO %1 ( %2 ) VALUES ( %3 );").arg(table_name).arg(columns).arg(values); query.prepare(queryText); @@ -146,7 +148,15 @@ QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QStri for (const auto& _key : keys ) { QString key = fromCamelCase(_key); auto value = valueMap.value(_key); - query.bindValue(":"+key, value); + if (value.type() == QVariant::Type::String) { + QString temp = "'" + value.toString() + "'"; + query.bindValue(":" + key, temp); + } else if (value.type() == QVariant::Type::DateTime) { + QString temp = "'" + value.toDateTime().toString("yyyy-MM-dd hh:mm:ss") + "'"; + query.bindValue(":" + key, temp); + } else { + query.bindValue(":" + key, value); + } } QSqlQuery res = mDatabaseManager->executeQuery(query); @@ -184,7 +194,15 @@ QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString & for (const auto& _key : keys ) { QString key = fromCamelCase(_key); auto value = valueMap.value(_key); - query.bindValue(":"+key, value); + if (value.type() == QVariant::Type::String) { + QString temp = "'" + value.toString() + "'"; + query.bindValue(":" + key, temp); + } else if (value.type() == QVariant::Type::DateTime) { + QString temp = "'" + value.toDateTime().toString("yyyy-MM-dd hh:mm:ss") + "'"; + query.bindValue(":" + key, temp); + } else { + query.bindValue(":" + key, value); + } } QSqlQuery res = mDatabaseManager->executeQuery(query); diff --git a/src/serversdk/requestmanager.cpp b/src/serversdk/requestmanager.cpp index 3502e67..1672b4e 100644 --- a/src/serversdk/requestmanager.cpp +++ b/src/serversdk/requestmanager.cpp @@ -59,9 +59,9 @@ bool RequestManager::processRequest(const std::shared_ptr& request) } - foreach (auto header, reply->request().rawHeaderList()) { - qDebug(sdknetwork) << header << ":" << reply->request().rawHeader(header); - } +// foreach (auto header, reply->request().rawHeaderList()) { +// qDebug(sdknetwork) << header << ":" << reply->request().rawHeader(header); +// } Q_ASSERT(reply); // Adding reply to final request @@ -125,8 +125,6 @@ void RequestManager::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) } QByteArray data = reply->readAll(); - qDebug(sdknetwork) << data; - // Decompress gzip data #ifdef CORESDK_ZLIB if (encoding.toLower() == "gzip" && !data.isEmpty() ) {