diff options
| author |   Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-16 18:16:04 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-16 18:16:04 +0300 |
| commit | 231d3670981a33ec42b91ad1cb33c1fc50551066 (patch) | |
| tree | b1ef1096f4e279baaa2ea0d2daf14b5c4185a82f /src/sql/models/qsqltablemodel.cpp | |
| parent | tst_QSslCertificate::verify - remove QSKIP (diff) | |
| parent | Android: Fix Application becomes unresponsive issue (diff) | |
| download | qtbase-231d3670981a33ec42b91ad1cb33c1fc50551066.tar.xz qtbase-231d3670981a33ec42b91ad1cb33c1fc50551066.zip | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: I0cdb390124e783dc9cd832a9954baa76a0e9eb6b
Diffstat (limited to 'src/sql/models/qsqltablemodel.cpp')
| -rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index 4ce99e2968..e1b95e4639 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -1003,7 +1003,8 @@ QString QSqlTableModel::orderByClause() const //we can safely escape the field because it would have been obtained from the database //and have the correct case - QString field = d->tableName + QLatin1Char('.') + QString field = d->db.driver()->escapeIdentifier(d->tableName, QSqlDriver::TableName) + + QLatin1Char('.') + d->db.driver()->escapeIdentifier(f.name(), QSqlDriver::FieldName); field = d->sortOrder == Qt::AscendingOrder ? Sql::asc(field) : Sql::desc(field); return Sql::orderBy(field); |