1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor QSqlTableModel::setRecord()

Browse Source 
-Do not use setData()
We're using ModifiedRow now so it makes sense to buffer the changes
and submit the row at once. This improves readability and
encourages further haromonization of the editing strategies.

-No longer need temporary change to OnRowChange
Previously, the strategy was temporarily changed from OnFieldChange
to OnRowChange in order to obtain the desired behavior from setData().
Now, since we don't use setData(), we can program the desired behavior
here and don't need this trick.

-Comment historical idiosyncracies/bugs

Change-Id: I6d9e2a69e1571a74c630ad1392e15b60fc0ad3f2
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
This commit is contained in:
Mark Brand 2011-07-06 21:10:45 +02:00 committed by Qt by Nokia
parent ccaa6734f1
commit 11bd543d90
1 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1203,52 +1203,49 @@ bool QSqlTableModel::setRecord(int row, const QSqlRecord &record)
if (row >= rowCount()) if (row >= rowCount())
return false; return false;
if (d->strategy == OnFieldChange && d->cache.value(row).op != QSqlTableModelPrivate::Insert)
d->cache.clear();
else if (d->strategy == OnRowChange && !d->cache.isEmpty() && !d->cache.contains(row))
submit();
QSqlTableModelPrivate::ModifiedRow &mrow = d->cache[row];
if (mrow.op == QSqlTableModelPrivate::None)
mrow = QSqlTableModelPrivate::ModifiedRow(QSqlTableModelPrivate::Update,
d->rec,
d->primaryValues(indexInQuery(createIndex(row, 0)).row()));
bool isOk = true; bool isOk = true;
switch (d->strategy) { for (int i = 0; i < record.count(); ++i) {
case OnFieldChange: int idx = d->nameToIndex(record.fieldName(i));
case OnRowChange: { if (idx == -1) {
EditStrategy oldStrategy = d->strategy; isOk = false;
} else if (d->strategy != OnManualSubmit) {
// FieldChange strategy makes no sense when setting an entire row // historical bug: this could all be simple like OnManualSubmit, but isn't
if (d->strategy == OnFieldChange) const QModelIndex cIndex = createIndex(row, idx);
d->strategy = OnRowChange; // historical bug: comparing EditRole with DisplayRole values here
for (int i = 0; i < record.count(); ++i) { const QVariant oldValue = data(cIndex);
int idx = d->nameToIndex(record.fieldName(i)); const QVariant value = record.value(i);
if (idx == -1) // historical bug: it's a bad idea to check for change here
continue; // historical bug: should test oldValue.isNull() != value.isNull()
QModelIndex cIndex = createIndex(row, idx); if (oldValue.isNull() || oldValue != value) {
QVariant value = record.value(i); // historical bug: dataChanged() is suppressed for Insert. See also setData().
QVariant oldValue = data(cIndex);
if (oldValue.isNull() || oldValue != value)
isOk &= setData(cIndex, value, Qt::EditRole);
}
if (isOk && oldStrategy == OnFieldChange)
submitAll();
d->strategy = oldStrategy;
return isOk;
}
case OnManualSubmit: {
QSqlTableModelPrivate::ModifiedRow &mrow = d->cache[row];
if (mrow.op == QSqlTableModelPrivate::None)
mrow = QSqlTableModelPrivate::ModifiedRow(QSqlTableModelPrivate::Update,
d->rec,
d->primaryValues(indexInQuery(createIndex(row, 0)).row()));
for (int i = 0; i < record.count(); ++i) {
int idx = d->nameToIndex(record.fieldName(i));
if (idx == -1) {
isOk = false;
} else {
mrow.setValue(idx, record.value(i)); mrow.setValue(idx, record.value(i));
if (mrow.op != QSqlTableModelPrivate::Insert)
emit dataChanged(cIndex, cIndex);
} }
} else {
mrow.setValue(idx, record.value(i));
} }
}
if (isOk) if (d->strategy == OnManualSubmit && isOk)
emit dataChanged(createIndex(row, 0), createIndex(row, columnCount() - 1)); emit dataChanged(createIndex(row, 0), createIndex(row, columnCount() - 1));
else if (d->strategy == OnFieldChange)
return submitAll();
else if (d->strategy == OnManualSubmit)
return isOk; return isOk;
}
} return true;
return false;
} }
QT_END_NAMESPACE QT_END_NAMESPACE