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

QSqlTableModelPrivate: deduplicate field stripping logic

Browse Source 
Change-Id: Ic969a192644e84d78558da0f19e588033e4af43d
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
This commit is contained in:
Mark Brand 2012-02-06 23:41:27 +01:00 committed by Qt by Nokia
parent 7e4232f10a
commit 1247683d40
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/models/qsqlrelationaltablemodel.cpp
View File

@ -299,9 +299,7 @@ void QSqlRelationalTableModelPrivate::revertCachedRow(int row)
int QSqlRelationalTableModelPrivate::nameToIndex(const QString &name) const int QSqlRelationalTableModelPrivate::nameToIndex(const QString &name) const
{ {
QString fieldname = name; QString fieldname = strippedFieldName(name);
if (db.driver()->isIdentifierEscaped(fieldname, QSqlDriver::FieldName))
fieldname = db.driver()->stripDelimiters(fieldname, QSqlDriver::FieldName);
int idx = baseRec.indexOf(fieldname); int idx = baseRec.indexOf(fieldname);
if (idx == -1) { if (idx == -1) {
// If the name is an alias we can find it here. // If the name is an alias we can find it here.

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

@ -67,11 +67,16 @@ QSqlRecord QSqlTableModelPrivate::record(const QVector<QVariant> &values) const
} }
int QSqlTableModelPrivate::nameToIndex(const QString &name) const int QSqlTableModelPrivate::nameToIndex(const QString &name) const
{
return rec.indexOf(strippedFieldName(name));
}
QString QSqlTableModelPrivate::strippedFieldName(const QString &name) const
{ {
QString fieldname = name; QString fieldname = name;
if (db.driver()->isIdentifierEscaped(fieldname, QSqlDriver::FieldName)) if (db.driver()->isIdentifierEscaped(fieldname, QSqlDriver::FieldName))
fieldname = db.driver()->stripDelimiters(fieldname, QSqlDriver::FieldName); fieldname = db.driver()->stripDelimiters(fieldname, QSqlDriver::FieldName);
return rec.indexOf(fieldname); return fieldname;
} }
void QSqlTableModelPrivate::initRecordAndPrimaryIndex() void QSqlTableModelPrivate::initRecordAndPrimaryIndex()

1
src/sql/models/qsqltablemodel_p.h
View File

@ -77,6 +77,7 @@ public:
const QSqlRecord &rec, const QSqlRecord &whereValues); const QSqlRecord &rec, const QSqlRecord &whereValues);
virtual void revertCachedRow(int row); virtual void revertCachedRow(int row);
virtual int nameToIndex(const QString &name) const; virtual int nameToIndex(const QString &name) const;
QString strippedFieldName(const QString &name) const;
void initRecordAndPrimaryIndex(); void initRecordAndPrimaryIndex();
QSqlDatabase db; QSqlDatabase db;