michalks/server-sdk
1
0
Fork 0
forked from ondra/server-sdk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into possible-change

Browse Source 
# Conflicts:
#	src/serversdk/databaseutils.h
This commit is contained in:
Filip Bucek 2019-11-14 14:56:13 +01:00
commit 4dfd4227cb
6 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/serversdk/databasetable.cpp
View File

@ -64,6 +64,7 @@ bool DatabaseTable::fromVariantMap(const QVariantMap &variantMap)
return true;
}
QList<std::shared_ptr<DatabaseTable> > DatabaseTable::fromListVariantMap(const QList<QVariantMap> &listMap)
{
QList<std::shared_ptr<DatabaseTable>> list;
@ -134,5 +135,4 @@ QString DatabaseTable::textPostgresType(QVariant::Type type) const
}
}
} // namespace serversdk

4
src/serversdk/databasetable.h
View File

@ -59,8 +59,7 @@ namespace serversdk {
// SELECT FROM TABLE
QSqlQuery selectSQL = db.execPlainSql("SELECT * FROM names");
auto listVariantMap = utils.listMapFromQuery(selectSQL);
auto list = Names::fromListVariantMap(listVariantMap);
auto list = utils.tableFromQuery<Names>(selectSQL);
}
*
* @endcode
@ -156,5 +155,6 @@ public:
};
} // namespace serversdk

15
src/serversdk/databaseutils.cpp
View File

@ -4,7 +4,6 @@
#include "logger.h"
#include <QMetaProperty>
#include <QSqlRecord>
namespace serversdk {
@ -174,20 +173,6 @@ QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString t
}
QList<QMap<QString, QVariant>> DatabaseUtils::listMapFromQuery(QSqlQuery query) const
{
QList<QMap<QString, QVariant>> list;
while (query.next()) {
auto rec = query.record();
int total = rec.count();
QMap<QString, QVariant> map;
for (int column = 0; column < total; ++column) {
map.insert(rec.fieldName(column), query.value(column));
}
list << map;
}
return list;
}
QString DatabaseUtils::sqlType() const
{

20
src/serversdk/databaseutils.h
View File

@ -4,6 +4,7 @@
#include <QObject>
#include <QSqlQuery>
#include <QSqlRecord>
class DatabaseUtilsTest;
@ -25,7 +26,24 @@ public:
QSqlQuery updateTable(const DatabaseTable *table, const QString table_name) const;
QList<QMap<QString, QVariant>> listMapFromQuery(QSqlQuery query) const;
template <class T>
QList<std::shared_ptr<T>> tableFromQuery(QSqlQuery query) const {
QList<std::shared_ptr<T>> list;
while (query.next()) {
auto rec = query.record();
int total = rec.count();
QMap<QString, QVariant> map;
for (int column = 0; column < total; ++column) {
map.insert(rec.fieldName(column), query.value(column));
}
auto data = std::make_shared<T>();
data->fromVariantMap(map);
list << data;
}
return list;
}
QString sqlType() const;
void setSqlType(const QString &sqlType);

3
test/auto/database/tst_postgresql.cpp
View File

@ -87,8 +87,7 @@ void PostgresqlTest::createTable_test()
// SELECT FROM TABLE
QSqlQuery selectSQL = db.execPlainSql("SELECT * FROM names");
auto listVariantMap = utils.listMapFromQuery(selectSQL);
auto list = Names::fromListVariantMap(listVariantMap);
auto list = utils.tableFromQuery<Names>(selectSQL);
// ENSURE SAME
auto first = list.first();

9
test/auto/database/tst_sqlite.cpp
View File

@ -86,13 +86,14 @@ void SqliteTest::createTable_test()
// SELECT FROM TABLE
QSqlQuery selectSQL = db.execPlainSql("SELECT * FROM names");
auto listVariantMap = utils.listMapFromQuery(selectSQL);
auto list = Names::fromListVariantMap(listVariantMap);
auto list = utils.tableFromQuery<Names>(selectSQL);
// ENSURE SAME
auto first = list.first();
auto names_tab = std::dynamic_pointer_cast<Names>(first);
QCOMPARE(list.count(), 1);
auto first = list.first();
QVERIFY(first);
auto names_tab = std::dynamic_pointer_cast<Names>(first);
QVERIFY(names_tab);
QCOMPARE(names_tab->name(), QStringLiteral("Testname"));
QCOMPARE(list.first()->jsonData(), names.jsonData());