From a21230152c4ea8cd2e641f436230e76a835384c2 Mon Sep 17 00:00:00 2001
From: Bill King <bking@trolltech.com>
Date: Fri, 10 Jul 2009 12:07:38 +1000
Subject: Fixes a heisenbug when using two ODBC connections with diff quoters.

Can have situations where 2 odbc connections are active, that have differing
quoting charachters. Before this fix, everything fell over.

Reviewed-by: Justin McPherson
---
 src/sql/drivers/odbc/qsql_odbc.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 50defdf..fa9031a 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -89,7 +89,8 @@ public:
     enum DefaultCase{Lower, Mixed, Upper, Sensitive};
     QODBCDriverPrivate()
     : hEnv(0), hDbc(0), useSchema(false), disconnectCount(0), isMySqlServer(false),
-           isMSSqlServer(false), hasSQLFetchScroll(true), hasMultiResultSets(false)
+           isMSSqlServer(false), hasSQLFetchScroll(true), hasMultiResultSets(false),
+           isQuoteInitialized(false), quote(QLatin1Char('"'))
     {
         unicode = false;
     }
@@ -116,7 +117,10 @@ public:
                              QString &schema, QString &table);
     DefaultCase defaultCase() const;
     QString adjustCase(const QString&) const;
-    QChar quoteChar() const;
+    QChar quoteChar();
+private:
+    bool isQuoteInitialized;
+    QChar quote;
 };
 
 class QODBCPrivate
@@ -566,10 +570,8 @@ static int qGetODBCVersion(const QString &connOpts)
     return SQL_OV_ODBC2;
 }
 
-QChar QODBCDriverPrivate::quoteChar() const
+QChar QODBCDriverPrivate::quoteChar()
 {
-    static bool isQuoteInitialized = false;
-    static QChar quote = QChar::fromLatin1('"');
     if (!isQuoteInitialized) {
         char driverResponse[4];
         SQLSMALLINT length;
@@ -579,9 +581,9 @@ QChar QODBCDriverPrivate::quoteChar() const
                 sizeof(driverResponse),
                 &length);
         if (r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) {
-            quote = QChar::fromLatin1(driverResponse[0]);
+            quote = QLatin1Char(driverResponse[0]);
         } else {
-            quote = QChar::fromLatin1('"');
+            quote = QLatin1Char('"');
         }
         isQuoteInitialized = true;
     }
-- 
cgit v0.12