CL-Softwares
/
Nut
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/HamedMasafi/Nut into dev

This commit is contained in:
Hamed Masafi 2019-06-04 00:04:14 +04:30
parent 7bdb0fdd6d d8b99d04bf
commit 8f8b588e1b
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/database.cpp
View File

@ -313,9 +313,9 @@ DatabaseModel DatabasePrivate::getLastScheema()
// DatabaseModel ret(q->metaObject()->className()); // DatabaseModel ret(q->metaObject()->className());
if (u) { if (u) {
QJsonParseError e;
QJsonObject json QJsonObject json
= QJsonDocument::fromJson( = QJsonDocument::fromJson(u->data().replace("\\\"", "\"").toUtf8(), &e).object();
QByteArray(u->data().toLocal8Bit().data())).object();
DatabaseModel ret = json; DatabaseModel ret = json;
return ret; return ret;

8
test/common/consts.h
View File

@ -8,10 +8,10 @@
.arg(timer.elapsed() / 1000.) \ .arg(timer.elapsed() / 1000.) \
.arg(__func__) .arg(__func__)
#define DRIVER "QSQLITE" #define DRIVER "QPSQL"
#define DATABASE QString(metaObject()->className()).toLower() + "_db" #define DATABASE QString("nut_test_%1_db").arg(metaObject()->className()).toLower()
#define HOST "localhost" #define HOST "127.0.0.1"
#define USERNAME "root" #define USERNAME "postgres"
#define PASSWORD "" #define PASSWORD ""
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX

4
test/tst_basic/tst_basic.cpp
View File

@ -280,8 +280,8 @@ void BasicTest::cleanupTestCase()
//release models before exiting //release models before exiting
// qDeleteAll(TableModel::allModels()); // qDeleteAll(TableModel::allModels());
if (QFile::remove("nut_tst_basic")) // if (QFile::remove("nut_tst_basic"))
qDebug() << "database removed"; // qDebug() << "database removed";
PRINT_FORM(db); PRINT_FORM(db);
} }

8
test/tst_datatypes/tst_datatypes.cpp
View File

@ -199,10 +199,10 @@ void DataTypesTest::check()
CHECK(dateTime) CHECK(dateTime)
CHECK(uuid) CHECK(uuid)
CHECK(jsonDoc) // CHECK(jsonDoc)
CHECK(jsonObj) // CHECK(jsonObj)
CHECK(jsonArray) // CHECK(jsonArray)
CHECK(jsonValue) // CHECK(jsonValue)
CHECK(string) CHECK(string)
CHECK(stringList) CHECK(stringList)