diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-17 03:49:53 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-17 03:49:53 (GMT) |
| commit | 815a5f08161f7add4a8b9d71f95bed0f45fbbe41 (patch) | |
| tree | 33d2e68038826ea0f5fec402303a585403b0be21 /src/sql/drivers/odbc/qsql_odbc.cpp | |
| parent | 5872a38a2f2ccc67b590d580a258e110ee2d80dc (diff) | |
| parent | 467face42d2db216860dade5f5d817a8cddb86f3 (diff) | |
| download | Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.zip Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.tar.gz Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/sql/drivers/odbc/qsql_odbc.cpp')
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 8eb2e15..6a8609e 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -2400,18 +2400,12 @@ QVariant QODBCDriver::handle() const QString QODBCDriver::escapeIdentifier(const QString &identifier, IdentifierType) const { + QChar quote = d->quoteChar(); QString res = identifier; - if (d->isMySqlServer) { - if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('`')) && !identifier.endsWith(QLatin1Char('`')) ) { - res.prepend(QLatin1Char('`')).append(QLatin1Char('`')); - res.replace(QLatin1Char('.'), QLatin1String("`.`")); - } - } else { - if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) { - res.replace(QLatin1Char('"'), QLatin1String("\"\"")); - res.prepend(QLatin1Char('"')).append(QLatin1Char('"')); - res.replace(QLatin1Char('.'), QLatin1String("\".\"")); - } + if(!identifier.isEmpty() && !identifier.startsWith(quote) && !identifier.endsWith(quote) ) { + res.replace(quote, QString(quote)+QString(quote)); + res.prepend(quote).append(quote); + res.replace(QLatin1Char('.'), QString(quote)+QLatin1Char('.')+QString(quote)); } return res; } |