BT Revert "Fix the behaviour of sql classes regarding quoted identifiers"

This reverts commit bb7bddc47dd0748b45d22180d9e3c8e5209010b3
due to forward binary compatibility issues in a point release.

1 files changed, 21 insertions, 52 deletions

diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 12eae84f24..935466bd4e 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -182,21 +182,10 @@ void QRelation::populateDictionary()
         populateModel();
 
     QSqlRecord record;
-    QString indexColumn;
-    QString displayColumn;
     for (int i=0; i < model->rowCount(); ++i) {
         record = model->record(i);
-
-        indexColumn = rel.indexColumn();
-        if (m_parent->database().driver()->isIdentifierEscaped(indexColumn, QSqlDriver::FieldName))
-            indexColumn = m_parent->database().driver()->stripDelimiters(indexColumn, QSqlDriver::FieldName);
-
-        displayColumn = rel.displayColumn();
-        if (m_parent->database().driver()->isIdentifierEscaped(displayColumn, QSqlDriver::FieldName))
-            displayColumn = m_parent->database().driver()->stripDelimiters(displayColumn, QSqlDriver::FieldName);
-
-        dictionary[record.field(indexColumn).value().toString()] =
-            record.field(displayColumn).value();
+        dictionary[record.field(rel.indexColumn()).value().toString()] =
+            record.field(rel.displayColumn()).value();
     }
     m_dictInitialized = true;
 }
@@ -226,7 +215,7 @@ public:
     QSqlRelationalTableModelPrivate()
         : QSqlTableModelPrivate()
     {}
-    QString relationField(const QString &tableName, const QString &fieldName) const;
+    QString escapedRelationField(const QString &tableName, const QString &fieldName) const;
 
     int nameToIndex(const QString &name) const;
     mutable QVector<QRelation> relations;
@@ -266,10 +255,7 @@ void QSqlRelationalTableModelPrivate::revertCachedRow(int row)
 
 int QSqlRelationalTableModelPrivate::nameToIndex(const QString &name) const
 {
-    QString fieldname = name;
-    if (db.driver()->isIdentifierEscaped(fieldname, QSqlDriver::FieldName))
-        fieldname = db.driver()->stripDelimiters(fieldname, QSqlDriver::FieldName);
-    return baseRec.indexOf(fieldname);
+    return baseRec.indexOf(name);
 }
 
 void QSqlRelationalTableModelPrivate::clearEditBuffer()
@@ -495,14 +481,14 @@ QSqlRelation QSqlRelationalTableModel::relation(int column) const
     return d->relations.value(column).rel;
 }
 
-QString QSqlRelationalTableModelPrivate::relationField(const QString &tableName,
+QString QSqlRelationalTableModelPrivate::escapedRelationField(const QString &tableName,
                         const QString &fieldName) const
 {
-    QString ret;
-    ret.reserve(tableName.size() + fieldName.size() + 1);
-    ret.append(tableName).append(QLatin1Char('.')).append(fieldName);
+    QString esc;
+    esc.reserve(tableName.size() + fieldName.size() + 1);
+    esc.append(tableName).append(QLatin1Char('.')).append(fieldName);
 
-    return ret;
+    return db.driver()->escapeIdentifier(esc, QSqlDriver::FieldName);
 }
 
 /*!
@@ -528,29 +514,15 @@ QString QSqlRelationalTableModel::selectStatement() const
 
     // Count how many times each field name occurs in the record
     QHash<QString, int> fieldNames;
-    QStringList fieldList;
     for (int i = 0; i < rec.count(); ++i) {
         QSqlRelation relation = d->relations.value(i, nullRelation).rel;
         QString name;
         if (relation.isValid())
-        {
             // Count the display column name, not the original foreign key
             name = relation.displayColumn();
-            if (d->db.driver()->isIdentifierEscaped(name, QSqlDriver::FieldName))
-                name = d->db.driver()->stripDelimiters(name, QSqlDriver::FieldName);
-
-            QSqlRecord rec = database().record(relation.tableName());
-            for (int i = 0; i < rec.count(); ++i) {
-                if (name.compare(rec.fieldName(i), Qt::CaseInsensitive) == 0) {
-                    name = rec.fieldName(i);
-                    break;
-                }
-            }
-        }
         else
             name = rec.fieldName(i);
         fieldNames.insert(name, fieldNames.value(name, 0) + 1);
-        fieldList.append(name);
     }
 
     for (int i = 0; i < rec.count(); ++i) {
@@ -559,30 +531,27 @@ QString QSqlRelationalTableModel::selectStatement() const
             QString relTableAlias = QString::fromLatin1("relTblAl_%1").arg(i);
             if (!fList.isEmpty())
                 fList.append(QLatin1String(", "));
-            fList.append(d->relationField(relTableAlias,relation.displayColumn()));
+            fList.append(d->escapedRelationField(relTableAlias, relation.displayColumn()));
 
             // If there are duplicate field names they must be aliased
-            if (fieldNames.value(fieldList[i]) > 1) {
-                QString relTableName = relation.tableName();
-                if (d->db.driver()->isIdentifierEscaped(relTableName, QSqlDriver::TableName))
-                    relTableName = d->db.driver()->stripDelimiters(relTableName, QSqlDriver::TableName);
-                QString displayColumn = relation.displayColumn();
-                if (d->db.driver()->isIdentifierEscaped(displayColumn, QSqlDriver::FieldName))
-                    displayColumn = d->db.driver()->stripDelimiters(displayColumn, QSqlDriver::FieldName);
-                fList.append(QString::fromLatin1(" AS %1_%2").arg(relTableName).arg(displayColumn));
+            if (fieldNames.value(relation.displayColumn()) > 1) {
+                fList.append(QString::fromLatin1(" AS %1_%2").arg(relation.tableName()).arg(relation.displayColumn()));
             }
 
             // this needs fixing!! the below if is borken.
-            tables.append(relation.tableName().append(QLatin1String(" ")).append(relTableAlias));
+            if (!tables.contains(relation.tableName()))
+                tables.append(d->db.driver()->escapeIdentifier(relation.tableName(),QSqlDriver::TableName)
+                        .append(QLatin1String(" "))
+                        .append(d->db.driver()->escapeIdentifier(relTableAlias, QSqlDriver::TableName)));
             if(!where.isEmpty())
                 where.append(QLatin1String(" AND "));
-            where.append(d->relationField(tableName(), d->db.driver()->escapeIdentifier(rec.fieldName(i), QSqlDriver::FieldName)));
+            where.append(d->escapedRelationField(tableName(), rec.fieldName(i)));
             where.append(QLatin1String(" = "));
-            where.append(d->relationField(relTableAlias, relation.indexColumn()));
+            where.append(d->escapedRelationField(relTableAlias, relation.indexColumn()));
         } else {
             if (!fList.isEmpty())
                 fList.append(QLatin1String(", "));
-            fList.append(d->relationField(tableName(), d->db.driver()->escapeIdentifier(rec.fieldName(i), QSqlDriver::FieldName)));
+            fList.append(d->escapedRelationField(tableName(), rec.fieldName(i)));
         }
     }
     if (!tables.isEmpty())
@@ -591,7 +560,7 @@ QString QSqlRelationalTableModel::selectStatement() const
         return query;
     if(!tList.isEmpty())
         tList.prepend(QLatin1String(", "));
-    tList.prepend(tableName());
+    tList.prepend(d->db.driver()->escapeIdentifier(tableName(),QSqlDriver::TableName));
     query.append(QLatin1String("SELECT "));
     query.append(fList).append(QLatin1String(" FROM ")).append(tList);
     qAppendWhereClause(query, where, filter());
@@ -721,7 +690,7 @@ QString QSqlRelationalTableModel::orderByClause() const
         return QSqlTableModel::orderByClause();
 
     QString s = QLatin1String("ORDER BY ");
-    s.append(d->relationField(QLatin1String("relTblAl_") + QString::number(d->sortColumn),
+    s.append(d->escapedRelationField(QLatin1String("relTblAl_") + QString::number(d->sortColumn),
                     rel.displayColumn()));
     s += d->sortOrder == Qt::AscendingOrder ? QLatin1String(" ASC") : QLatin1String(" DESC");
     return s;