ondra/server-sdk
1
0
Fork 1
mirror of https://gitlab.com/spaceti-app/integrations/common/server-sdk.git synced 2026-07-12 14:10:43 +02:00
Code Issues Projects Releases Wiki Activity

DatabaseTable new method primaryKey

Browse Source
This commit is contained in:
Filip Bucek 2019-11-19 14:15:40 +01:00
parent c038568124
commit f387b600f7
5 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/serversdk/databasetable.cpp
View File

@ -13,6 +13,18 @@ DatabaseTable::DatabaseTable(QObject *parent) : QObject(parent)
{ {
} }
QString DatabaseTable::primaryKey() const
{
const QMetaObject *metaObj = this->metaObject();
for (int i = metaObj->propertyOffset(); i < metaObj->propertyCount(); ++i) {
QMetaProperty prop = metaObj->property(i);
if (!prop.isUser())
continue;
return prop.name();
}
return QString();
}
QByteArray DatabaseTable::jsonData(const QSet<QString> &filters) const QByteArray DatabaseTable::jsonData(const QSet<QString> &filters) const
{ {
auto variantMap = this->toVariantMap(filters); auto variantMap = this->toVariantMap(filters);

2
src/serversdk/databasetable.h
View File

@ -84,6 +84,8 @@ class DatabaseTable : public QObject
public: public:
explicit DatabaseTable(QObject *parent = nullptr); explicit DatabaseTable(QObject *parent = nullptr);
QString primaryKey() const;
/** /**
* @brief Creates JSON from QMetaObject data ( Q_PROPERTY ) -> TABLE_PROPERTY * @brief Creates JSON from QMetaObject data ( Q_PROPERTY ) -> TABLE_PROPERTY
* @return text json e.g. { "id": 00344 } * @return text json e.g. { "id": 00344 }

13
src/serversdk/databaseutils.cpp
View File

@ -109,7 +109,14 @@ QSqlQuery DatabaseUtils::createTable(const DatabaseTable *table, const QString t
return mDatabaseManager->execPlainSql(sql); return mDatabaseManager->execPlainSql(sql);
} }
/**
* @brief DatabaseUtils::insertIntoTable
* @param table
* @param table_name
* @return
*
* @todo Loop VariantMap change to Loop over propertiess
*/
QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QString table_name) const QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QString table_name) const
{ {
QString columns; QString columns;
@ -145,6 +152,7 @@ QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QStri
return res; return res;
} }
QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString table_name) const QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString table_name) const
{ {
QString columnsAndValues; QString columnsAndValues;
@ -157,7 +165,8 @@ QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString t
// Primary key is first user property ( first VariantMap item ) // Primary key is first user property ( first VariantMap item )
// in ( primary key ): id // in ( primary key ): id
// out: id = :id // out: id = :id
primaryKeyCondition = keys.at(0) + " = :" + keys.at(0); const QString primaryKey = table->primaryKey();
primaryKeyCondition = primaryKey + " = :" + primaryKey;
for (auto _key : keys) { for (auto _key : keys) {
QString key = fromCamelCase(_key); QString key = fromCamelCase(_key);

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

@ -105,8 +105,11 @@ void DatabaseTableTest::constructor_test()
auto table = std::make_unique<BookTable>(); auto table = std::make_unique<BookTable>();
QCOMPARE(table->id(), 0); QCOMPARE(table->id(), 0);
QCOMPARE(table->name(), QStringLiteral("Test")); QCOMPARE(table->name(), QStringLiteral("Test"));
QCOMPARE(table->primaryKey(), QStringLiteral("uuid"));
} }
void DatabaseTableTest::qvariant_test() void DatabaseTableTest::qvariant_test()
{ {
auto table = std::make_unique<BookTable>(); auto table = std::make_unique<BookTable>();

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

@ -107,35 +107,45 @@ void SqliteTest::updateTable_test()
db.openSQLite(dbpath); db.openSQLite(dbpath);
QVERIFY(db.isOpen()); QVERIFY(db.isOpen());
Name names; Name name_A, name_B;
// CREATE TABLE // CREATE TABLE
serversdk::DatabaseUtils utils(&db); serversdk::DatabaseUtils utils(&db);
QSqlQuery query = utils.createTable(&names, "names"); QSqlQuery query = utils.createTable(&name_A, "names");
// INSERT INTO TABLE // INSERT INTO TABLE
const QString uuidA = "48f64fab-ba2a-40b5-8fbb-75361099dfb6"; const QString uuidA = "48f64fab-ba2a-40b5-8fbb-75361099dfb6";
names.set_uuid(uuidA); const QString uuidB = "d70143ab-8c14-4ee0-85cb-f0d1b72df104";
names.set_id(2); name_A.set_uuid(uuidA);
names.set_name("Testname"); name_A.set_id(2);
name_A.set_name("TestnameA");
name_B.set_uuid(uuidB);
name_B.set_id(2);
name_B.set_name("TestnameB");
utils.insertIntoTable(&name_A, "names");
utils.insertIntoTable(&name_B, "names");
utils.insertIntoTable(&names, "names");
// NOW UPDATING TABLE WITH name: NewName // NOW UPDATING TABLE WITH name: NewName
names.set_name("NewName"); name_A.set_name("TestnameA-new");
utils.updateTable(&names, "names"); utils.updateTable(&name_A, "names");
name_B.set_name("TestnameB-new");
utils.updateTable(&name_B, "names");
// SELECT FROM TABLE // SELECT FROM TABLE
QSqlQuery selectSQL = db.execPlainSql("SELECT * FROM names"); QSqlQuery selectSQL = db.execPlainSql("SELECT * FROM names");
auto list = utils.tableFromQuery<Name>(selectSQL); auto list = utils.tableFromQuery<Name>(selectSQL);
QCOMPARE(list.count(), 2);
// ENSURE SAME auto dbA = list.first();
QCOMPARE(list.count(), 1); auto dbB = list.last();
auto names_tab = list.first(); QCOMPARE(dbA->name(), name_A.name());
QVERIFY(names_tab); QCOMPARE(dbB->name(), name_B.name());
QCOMPARE(names_tab->name(), QStringLiteral("NewName"));
QCOMPARE(list.first()->jsonData(), names.jsonData()); QCOMPARE(dbA->jsonData(), name_A.jsonData());
QCOMPARE(dbB->jsonData(), name_B.jsonData());
} }
QTEST_APPLESS_MAIN(SqliteTest) QTEST_APPLESS_MAIN(SqliteTest)