diff --git a/src/database.cpp b/src/database.cpp index 7701fa0..91b9b79 100644 --- a/src/database.cpp +++ b/src/database.cpp @@ -136,7 +136,7 @@ bool DatabasePrivate::updateDatabase() DatabaseModel current = currentModel; if (last == current) { - qDebug("Databse is up-to-date"); + qDebug("Database is up-to-date"); //TODO: crash without this and I don't know why! changeLogs->clearChilds(); return true; @@ -154,9 +154,9 @@ bool DatabasePrivate::updateDatabase() } } if (!last.count()) - qDebug("Databse is new"); + qDebug("Database is new"); else - qDebug("Databse is changed"); + qDebug("Database is changed"); QStringList sql = sqlGenerator->diff(last, current); @@ -607,6 +607,7 @@ int Database::saveChanges(bool cleanUp) int rowsAffected = 0; foreach (TableSetBase *ts, d->tableSets) rowsAffected += ts->save(this, cleanUp); + return rowsAffected; } diff --git a/src/generators/sqlgeneratorbase.cpp b/src/generators/sqlgeneratorbase.cpp index 4307ed9..a3ec1a0 100644 --- a/src/generators/sqlgeneratorbase.cpp +++ b/src/generators/sqlgeneratorbase.cpp @@ -102,7 +102,7 @@ QString SqlGeneratorBase::saveRecord(Table *t, QString tableName) return updateRecord(t, tableName); case Table::NewCreated: - case Table::FeatchedFromDB: + case Table::FetchedFromDB: Q_UNREACHABLE(); } diff --git a/src/query.h b/src/query.h index 4b18799..70ff85d 100644 --- a/src/query.h +++ b/src/query.h @@ -324,7 +324,7 @@ Q_OUTOFLINE_TEMPLATE RowList Query::toList(int count) tableset->add(row); } - row->setStatus(Table::FeatchedFromDB); + row->setStatus(Table::FetchedFromDB); row->setParent(this); row->clear(); diff --git a/src/sqlmodel.cpp b/src/sqlmodel.cpp index a08f4a6..24f369a 100644 --- a/src/sqlmodel.cpp +++ b/src/sqlmodel.cpp @@ -39,8 +39,10 @@ void SqlModel::setRenderer(const std::function &render _renderer = renderer; } -SqlModel::SqlModel(Database *database, TableSetBase *tableSet, QObject *parent) : - QAbstractTableModel(parent), d(new SqlModelPrivate(this)), _renderer(nullptr) +SqlModel::SqlModel(Database *database, TableSetBase *tableSet, QObject *parent) + : QAbstractTableModel(parent) + , _renderer(nullptr) + , d(new SqlModelPrivate(this)) { d->model = database->model() .tableByClassName(tableSet->childClassName()); @@ -122,7 +124,7 @@ Row SqlModel::at(const int &i) const SqlModelPrivate::SqlModelPrivate(SqlModel *parent) { - + Q_UNUSED(parent) } diff --git a/src/table.cpp b/src/table.cpp index e3a7a3d..08251bf 100644 --- a/src/table.cpp +++ b/src/table.cpp @@ -97,7 +97,7 @@ void Table::propertyChanged(const QString &propName) d.detach(); d->changedProperties.insert(propName); - if (d->status == FeatchedFromDB) + if (d->status == FetchedFromDB) d->status = Modified; if (d->status == NewCreated) @@ -181,7 +181,7 @@ int Table::save(Database *db) foreach(TableSetBase *ts, d->childTableSets) ts->save(db); - setStatus(FeatchedFromDB); + setStatus(FetchedFromDB); return q.numRowsAffected(); } diff --git a/src/table.h b/src/table.h index 957bd1d..d09b28b 100644 --- a/src/table.h +++ b/src/table.h @@ -46,7 +46,7 @@ public: enum Status{ NewCreated, - FeatchedFromDB, + FetchedFromDB, Added, Modified, Deleted diff --git a/src/tableset.h b/src/tableset.h index f9d5aef..d066584 100644 --- a/src/tableset.h +++ b/src/tableset.h @@ -60,7 +60,7 @@ public: int length() const; Row at(int i) const; - const Row operator[](int i) const; + Row operator[](int i) const; Query *query(bool autoDelete = true); BulkInserter *bulkInserter(); @@ -100,7 +100,7 @@ Q_OUTOFLINE_TEMPLATE int TableSet::length() const } template -Q_OUTOFLINE_TEMPLATE Row TableSet::at(int i) const +Q_OUTOFLINE_TEMPLATE Row TableSet::at(int i) const { #ifdef NUT_SHARED_POINTER return data->childs.at(i).template objectCast(); @@ -110,13 +110,9 @@ Q_OUTOFLINE_TEMPLATE Row TableSet::at(int i) const } template -Q_OUTOFLINE_TEMPLATE const Row TableSet::operator[](int i) const +Q_OUTOFLINE_TEMPLATE Row TableSet::operator[](int i) const { -#ifdef NUT_SHARED_POINTER - return data->childs.at(i).template objectCast(); -#else - return reinterpret_cast(data->childs.at(i)); -#endif + return at(i); } template @@ -131,7 +127,7 @@ Q_OUTOFLINE_TEMPLATE void TableSet::append(Row t) // t->setModel(_database->model().tableByClassName(t->metaObject()->className())); t->setParentTableSet(this); - if(t->status() != Table::FeatchedFromDB) + if(t->status() != Table::FetchedFromDB) t->setStatus(Table::Added); } diff --git a/src/tablesetbase.cpp b/src/tablesetbase.cpp index 5eb9b67..f0df091 100644 --- a/src/tablesetbase.cpp +++ b/src/tablesetbase.cpp @@ -53,16 +53,16 @@ int TableSetBase::save(Database *db, bool cleanUp) masterModel = db->model().tableByClassName(data->table->metaObject()->className()); foreach (Row
t, data->childs) { - if(data->table) + if (data->table) t->setParentTable(data->table, masterModel, db->model().tableByClassName(t->metaObject()->className())); - if(t->status() == Table::Added - || t->status() == Table::Modified - || t->status() == Table::Deleted){ + if (t->status() == Table::Added + || t->status() == Table::Modified + || t->status() == Table::Deleted) { rowsAffected += t->save(db); - if(cleanUp) + if (cleanUp) #ifdef NUT_SHARED_POINTER remove(t); #else diff --git a/test/tst_benckmark/tst_benchmark.cpp b/test/tst_benckmark/tst_benchmark.cpp index 63dda36..39a5376 100644 --- a/test/tst_benckmark/tst_benchmark.cpp +++ b/test/tst_benckmark/tst_benchmark.cpp @@ -41,7 +41,7 @@ void BenchmarkTest::initTestCase() void BenchmarkTest::insert1kPost() { - QTime t; + QElapsedTimer t; t.start(); for (int i = 0; i < 100; ++i) { @@ -52,7 +52,7 @@ void BenchmarkTest::insert1kPost() db.posts()->append(newPost); } db.saveChanges(); - qDebug("1k post inserted in %d ms", t.elapsed()); + qDebug("1k post inserted in %lld ms", t.elapsed()); }