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

QSqlTableModel::setData(): no longer autosubmit for OnRowChange

Browse Source 
The model can never do a good job of knowing when user moves to a
new row in the view. Faking it by detecting when another row
is changed was not a good solution because it cannot detect
when the last edited row is left.

Either the view should automatically submit when the user leaves
a row or the application should provide a way to submit.

This change made it possible to reuse the logic of flags() in
setData().

Change-Id: I2550e5b113bceba1a852fc21203babeca07c5748
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
This commit is contained in:
Mark Brand 2012-03-13 01:28:35 +01:00 committed by Qt by Nokia
parent 3d7cec6577
commit 108748404b
4 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/changes-5.0.0 vendored
View File

@ -446,6 +446,8 @@ Instead, pending (failed) changes cause new changes inappropriate to the
edit strategy to be refused. The application should resolve or revert pending
changes. insertRows() and insertRecord() also respect the edit strategy.
* QSqlTableModel::setData() and setRecord() in OnRowChange no longer have the
side effect of submitting the cached row when invoked on a different row.
****************************************************************************
* Database Drivers *
****************************************************************************

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

@ -516,14 +516,12 @@ bool QSqlTableModel::isDirty(const QModelIndex &index) const
For edit strategy OnFieldChange, an index may receive a change
only if no other index has a cached change. Changes are
submitted immediately. However, rows that have not yet been
inserted in the database may be freely changed and and are not
submitted automatically.
inserted in the database may be freely changed and are not
submitted automatically. Submitted changes are not reverted upon
failure.
For OnRowChange, the first change to a row will cause cached
operations on other rows to be submitted. If submitting fails,
the new change is rejected.
Submitted changes are not reverted upon failure.
For OnRowChange, an index may receive a change only if no other
row has a cached change. Changes are not submitted automatically.
Returns true if the value could be set or false on error, for
example if \a index is out of bounds.
@ -542,21 +540,9 @@ bool QSqlTableModel::setData(const QModelIndex &index, const QVariant &value, in
if (!index.isValid() || index.column() >= d->rec.count() || index.row() >= rowCount())
return false;
if (d->cache.value(index.row()).op() == QSqlTableModelPrivate::Delete)
if (!(flags(index) & Qt::ItemIsEditable))
return false;
if (d->strategy == OnFieldChange) {
if (d->cache.value(index.row()).op() != QSqlTableModelPrivate::Insert
&& !isDirty(index) && isDirty())
return false;
}
else if (d->strategy == OnRowChange) {
if (d->cache.value(index.row()).submitted()) {
if (!submit())
return false;
}
}
QSqlTableModelPrivate::ModifiedRow &row = d->cache[index.row()];
if (row.op() == QSqlTableModelPrivate::None)
@ -1249,16 +1235,32 @@ Qt::ItemFlags QSqlTableModel::flags(const QModelIndex &index) const
if (index.internalPointer() || index.column() < 0 || index.column() >= d->rec.count()
|| index.row() < 0)
return 0;
if (d->rec.field(index.column()).isReadOnly())
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
if (d->cache.value(index.row()).op() == QSqlTableModelPrivate::Delete)
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
if (d->strategy == OnFieldChange
&& d->cache.value(index.row()).op() != QSqlTableModelPrivate::Insert
&& !isDirty(index) && isDirty())
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
bool editable = true;
if (d->rec.field(index.column()).isReadOnly()) {
editable = false;
}
else {
const QSqlTableModelPrivate::ModifiedRow mrow = d->cache.value(index.row());
if (mrow.op() == QSqlTableModelPrivate::Delete) {
editable = false;
}
else if (d->strategy == OnFieldChange) {
if (mrow.op() != QSqlTableModelPrivate::Insert)
if (!isDirty(index) && isDirty())
editable = false;
}
else if (d->strategy == OnRowChange) {
if (mrow.submitted() && isDirty())
editable = false;
}
}
if (!editable)
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
else
return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
}
/*!

2
tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
View File

@ -1537,7 +1537,9 @@ void tst_QSqlRelationalTableModel::relationOnFirstColumn()
//modify the model data
QVERIFY_SQL(model, setData(model.index(0, 0), 40));
QVERIFY_SQL(model, submit());
QVERIFY_SQL(model, setData(model.index(1, 0), 50));
QVERIFY_SQL(model, submit());
QVERIFY_SQL(model, setData(model.index(2, 0), 30));
//verify the data after modificaiton

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

@ -1067,6 +1067,26 @@ void tst_QSqlTableModel::isDirty()
QFAIL_SQL(model, isDirty(model.index(0, 1)));
}
if (submitpolicy == QSqlTableModel::OnRowChange) {
// dirty row must block change on other rows
QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
QVERIFY(model.rowCount() > 1);
QVERIFY_SQL(model, setData(model.index(0, 1), QString("sam i am")));
QCOMPARE(model.data(model.index(0, 1)).toString(), QString("sam i am"));
QVERIFY_SQL(model, isDirty());
QVERIFY_SQL(model, isDirty(model.index(0, 1)));
QVERIFY(!(model.flags(model.index(1, 1)) & Qt::ItemIsEditable));
QFAIL_SQL(model, setData(model.index(1, 1), QString("sam i am")));
QFAIL_SQL(model, setRecord(1, model.record(1)));
QFAIL_SQL(model, insertRow(1));
QFAIL_SQL(model, isDirty(model.index(1, 1)));
model.revertAll();
QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
QFAIL_SQL(model, isDirty());
QFAIL_SQL(model, isDirty(model.index(0, 1)));
}
// setData() followed by submitAll()
QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
QVERIFY_SQL(model, setData(model.index(0, 1), QString("sam i am")));