561 fList.append(QLatin1String(", ")); |
561 fList.append(QLatin1String(", ")); |
562 fList.append(d->relationField(relTableAlias,relation.displayColumn())); |
562 fList.append(d->relationField(relTableAlias,relation.displayColumn())); |
563 |
563 |
564 // If there are duplicate field names they must be aliased |
564 // If there are duplicate field names they must be aliased |
565 if (fieldNames.value(fieldList[i]) > 1) { |
565 if (fieldNames.value(fieldList[i]) > 1) { |
566 QString relTableName = relation.tableName(); |
566 QString relTableName = relation.tableName().section(QChar::fromLatin1('.'), -1, -1); |
567 if (d->db.driver()->isIdentifierEscaped(relTableName, QSqlDriver::TableName)) |
567 if (d->db.driver()->isIdentifierEscaped(relTableName, QSqlDriver::TableName)) |
568 relTableName = d->db.driver()->stripDelimiters(relTableName, QSqlDriver::TableName); |
568 relTableName = d->db.driver()->stripDelimiters(relTableName, QSqlDriver::TableName); |
569 QString displayColumn = relation.displayColumn(); |
569 QString displayColumn = relation.displayColumn(); |
570 if (d->db.driver()->isIdentifierEscaped(displayColumn, QSqlDriver::FieldName)) |
570 if (d->db.driver()->isIdentifierEscaped(displayColumn, QSqlDriver::FieldName)) |
571 displayColumn = d->db.driver()->stripDelimiters(displayColumn, QSqlDriver::FieldName); |
571 displayColumn = d->db.driver()->stripDelimiters(displayColumn, QSqlDriver::FieldName); |