AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSqlTableModel::commitAll(): replace row removal hack

Browse Source 
The purpose of the hack was to fool QSqlQueryModel into signaling the
removal of extra rows via rowsRemoved(). The extra rows are the
inserted rows generated by QSqlTableModel.

While it is important to signal the removal of all the rows before
requerying after committing changes, there is a cleaner way. The
table model should remove its rows before the query model removes its
rows.

Iterating backwards avoids having to decrement row numbers above ones
being removed.

Expected test results have been adjusted for these changes.

Change-Id: I0e8aa81f5e7b8fea5922f5ffd1cfb4a932313a10
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
This commit is contained in:
Mark Brand 2012-02-10 00:47:33 +01:00 committed by Qt by Nokia
parent 76418628f1
commit 555aa4439b
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sql/models/qsqltablemodel.cpp
View File

@ -669,7 +669,6 @@ bool QSqlTableModel::submitAll()
case QSqlTableModelPrivate::Insert:
if (!insertRowIntoTable(it.value().rec()))
return false;
d->bottom = d->bottom.sibling(d->bottom.row() + 1, d->bottom.column());
break;
case QSqlTableModelPrivate::Update:
if (!updateRowInTable(it.key(), it.value().rec()))
@ -684,6 +683,19 @@ bool QSqlTableModel::submitAll()
break;
}
}
// all changes have been committed
// clean up inserted rows
QSqlTableModelPrivate::CacheMap::Iterator it = d->cache.end();
while (it != d->cache.constBegin()) {
--it;
if (it.value().op() == QSqlTableModelPrivate::Insert) {
beginRemoveRows(QModelIndex(), it.key(), it.key());
it = d->cache.erase(it);
endRemoveRows();
}
}
d->clearCache();
return select();
}

10
tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
View File

@ -1199,9 +1199,13 @@ void tst_QSqlTableModel::insertRecordsInLoop()
model.submitAll(); // submitAll() calls select() which clears and repopulates the table
int firstRowIndex = 0, lastRowIndex = 12;
QCOMPARE(spyRowsRemoved.count(), 1);
QCOMPARE(spyRowsRemoved.at(0).at(1).toInt(), firstRowIndex);
QCOMPARE(spyRowsRemoved.at(0).at(2).toInt(), lastRowIndex);
QCOMPARE(spyRowsRemoved.count(), 11);
// QSqlTableModel emits 10 signals for its 10 inserted rows
QCOMPARE(spyRowsRemoved.at(0).at(1).toInt(), lastRowIndex);
QCOMPARE(spyRowsRemoved.at(9).at(1).toInt(), firstRowIndex + 3);
// QSqlQueryModel emits 1 signal for its 3 rows
QCOMPARE(spyRowsRemoved.at(10).at(1).toInt(), firstRowIndex);
QCOMPARE(spyRowsRemoved.at(10).at(2).toInt(), firstRowIndex + 2);
QCOMPARE(spyRowsInserted.at(10).at(1).toInt(), firstRowIndex);
QCOMPARE(spyRowsInserted.at(10).at(2).toInt(), lastRowIndex);