Changeset 561 for trunk/src/sql/drivers

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/sql/drivers/db2/qsql_db2.cpp (modified) (40 diffs)
• src/sql/drivers/db2/qsql_db2.h (modified) (3 diffs)
• src/sql/drivers/ibase/qsql_ibase.cpp (modified) (38 diffs)
• src/sql/drivers/ibase/qsql_ibase.h (modified) (3 diffs)
• src/sql/drivers/mysql/qsql_mysql.cpp (modified) (54 diffs)
• src/sql/drivers/mysql/qsql_mysql.h (modified) (5 diffs)
• src/sql/drivers/oci/qsql_oci.cpp (modified) (32 diffs)
• src/sql/drivers/oci/qsql_oci.h (modified) (3 diffs)
• src/sql/drivers/odbc/qsql_odbc.cpp (modified) (49 diffs)
• src/sql/drivers/odbc/qsql_odbc.h (modified) (5 diffs)
• src/sql/drivers/psql/qsql_psql.cpp (modified) (34 diffs)
• src/sql/drivers/psql/qsql_psql.h (modified) (3 diffs)
• src/sql/drivers/sqlite/qsql_sqlite.cpp (modified) (17 diffs)
• src/sql/drivers/sqlite/qsql_sqlite.h (modified) (3 diffs)
• src/sql/drivers/sqlite2/qsql_sqlite2.cpp (modified) (16 diffs)
• src/sql/drivers/sqlite2/qsql_sqlite2.h (modified) (3 diffs)
• src/sql/drivers/tds/qsql_tds.cpp (modified) (12 diffs)
• src/sql/drivers/tds/qsql_tds.h (modified) (4 diffs)

trunk/src/sql/drivers/db2/qsql_db2.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -50 +50 @@
 #include <qvarlengtharray.h>
 #include <qvector.h>
-
-#ifndef UNICODE
-#define UNICODE
-#endif
+#include <QDebug>
 
 #if defined(Q_CC_BOR)
@@ -63 +60 @@
 #endif
 
+#define UNICODE
+
 #include <sqlcli1.h>
 
@@ -84 +83 @@
 {
 public:
-    QDB2ResultPrivate(const QDB2DriverPrivate* d): dp(d), hStmt(0), precisionPolicy(QSql::HighPrecision)
+    QDB2ResultPrivate(const QDB2DriverPrivate* d): dp(d), hStmt(0)
     {}
     ~QDB2ResultPrivate()
     {
-        for (int i = 0; i < valueCache.count(); ++i)
+        emptyValueCache();
+    }
+    void clearValueCache()
+    {
+        for (int i = 0; i < valueCache.count(); ++i) {
             delete valueCache[i];
+            valueCache[i] = NULL;
+        }
+    }
+    void emptyValueCache()
+    {
+        clearValueCache();
+        valueCache.clear();
     }
 
@@ -96 +106 @@
     QSqlRecord recInf;
     QVector<QVariant*> valueCache;
-    QSql::NumericalPrecisionPolicy precisionPolicy;
 };
 
 static QString qFromTChar(SQLTCHAR* str)
 {
-#ifdef UNICODE
     return QString::fromUtf16(str);
-#else
-    return QString::fromLocal8Bit((const char*) str);
-#endif
 }
 
@@ -112 +117 @@
 static SQLTCHAR* qToTChar(const QString& str)
 {
-#ifdef UNICODE
     return (SQLTCHAR*)str.utf16();
-#else
-    return (unsigned char*) str.ascii();
-#endif
 }
 
@@ -337 +338 @@
     while (true) {
         r = SQLGetData(hStmt,
-                        column+1,
-#ifdef UNICODE
+                        column + 1,
                         SQL_C_WCHAR,
-#else
-                        SQL_C_CHAR,
-#endif
                         (SQLPOINTER)buf,
                         colSize * sizeof(SQLTCHAR),
@@ -545 +542 @@
 
     d->recInf.clear();
-    d->valueCache.clear();
+    d->emptyValueCache();
 
     if (!qMakeStatement(d, isForwardOnly()))
@@ -569 +566 @@
     }
     d->valueCache.resize(count);
+    d->valueCache.fill(NULL);
     setActive(true);
     return true;
@@ -580 +578 @@
 
     d->recInf.clear();
-    d->valueCache.clear();
+    d->emptyValueCache();
 
     if (!qMakeStatement(d, isForwardOnly()))
@@ -608 +606 @@
 
     d->recInf.clear();
-    d->valueCache.clear();
+    d->emptyValueCache();
 
     if (!qMakeStatement(d, isForwardOnly(), false))
@@ -729 +727 @@
                 break; }
             case QVariant::String:
-#ifdef UNICODE
             {
                 QString str(values.at(i).toString());
@@ -763 +760 @@
                 break;
             }
-#endif
-            // fall through
             default: {
                 QByteArray ba = values.at(i).toString().toAscii();
@@ -812 +807 @@
     setActive(true);
     d->valueCache.resize(count);
+    d->valueCache.fill(NULL);
 
     //get out parameters
@@ -837 +833 @@
                 break;
             case QVariant::String:
-#ifdef UNICODE
                 if (bindValueType(i) & QSql::Out)
                     values[i] = QString::fromUtf16((ushort*)tmpStorage.takeFirst().constData());
                 break;
-#endif
-                // fall through
             default: {
                 values[i] = QString::fromAscii(tmpStorage.takeFirst().constData());
@@ -859 +852 @@
     if (i == at())
         return true;
-    d->valueCache.fill(0);
+    d->clearValueCache();
     int actualIdx = i + 1;
     if (actualIdx <= 0) {
@@ -876 +869 @@
                             actualIdx);
     }
-    if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
+    if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO && r != SQL_NO_DATA) {
         setLastError(qMakeError(QCoreApplication::translate("QDB2Result",
                                 "Unable to fetch record %1").arg(i), QSqlError::StatementError, d));
         return false;
     }
+    else if (r == SQL_NO_DATA)
+        return false;
     setAt(i);
     return true;
@@ -888 +883 @@
 {
     SQLRETURN r;
-    d->valueCache.fill(0);
+    d->clearValueCache();
     r = SQLFetchScroll(d->hStmt,
                        SQL_FETCH_NEXT,
@@ -908 +903 @@
     if (isForwardOnly())
         return fetchNext();
-    d->valueCache.fill(0);
+    d->clearValueCache();
     SQLRETURN r;
     r = SQLFetchScroll(d->hStmt,
@@ -914 +909 @@
                        0);
     if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
-        setLastError(qMakeError(QCoreApplication::translate("QDB2Result", "Unable to fetch first"),
-                                QSqlError::StatementError, d));
+        if(r!= SQL_NO_DATA)
+            setLastError(qMakeError(QCoreApplication::translate("QDB2Result", "Unable to fetch first"),
+                                    QSqlError::StatementError, d));
         return false;
     }
@@ -924 +920 @@
 bool QDB2Result::fetchLast()
 {
-    d->valueCache.fill(0);
+    d->clearValueCache();
 
     int i = at();
@@ -1030 +1026 @@
         case QVariant::Double:
             {
-            QString value=qGetStringData(d->hStmt, field, info.length() + 1, isNull);
-            bool ok=false;
-            switch(d->precisionPolicy) {
+            switch(numericalPrecisionPolicy()) {
                 case QSql::LowPrecisionInt32:
-                    v = new QVariant(value.toInt(&ok));
+                    v = new QVariant(qGetIntData(d->hStmt, field, isNull));
                     break;
                 case QSql::LowPrecisionInt64:
-                    v = new QVariant(value.toLongLong(&ok));
+                    v = new QVariant(qGetBigIntData(d->hStmt, field, isNull));
                     break;
                 case QSql::LowPrecisionDouble:
-                    v = new QVariant(value.toDouble(&ok));
+                    v = new QVariant(qGetDoubleData(d->hStmt, field, isNull));
                     break;
                 case QSql::HighPrecision:
@@ -1046 +1040 @@
                     // length + 1 for the comma
                     v = new QVariant(qGetStringData(d->hStmt, field, info.length() + 1, isNull));
-                    ok = true;
                     break;
             }
-            if(!ok)
-                v = new QVariant();
             break;
             }
@@ -1102 +1093 @@
     setAt(QSql::BeforeFirstRow);
     d->recInf.clear();
-    d->valueCache.clear();
+    d->emptyValueCache();
     setSelect(false);
 
@@ -1121 +1112 @@
 
     d->valueCache.resize(fieldCount);
+    d->valueCache.fill(NULL);
     setActive(true);
 
@@ -1133 +1125 @@
         *static_cast<bool*>(data) = nextResult();
         break;
-    case QSqlResult::SetNumericalPrecision:
-        Q_ASSERT(data);
-        d->precisionPolicy = *reinterpret_cast<QSql::NumericalPrecisionPolicy *>(data);
+    case QSqlResult::DetachFromResultSet:
+        if (d->hStmt)
+            SQLCloseCursor(d->hStmt);
         break;
     default:
@@ -1168 +1160 @@
 }
 
-bool QDB2Driver::open(const QString& db, const QString& user, const QString& password, const QString&, int,
+bool QDB2Driver::open(const QString& db, const QString& user, const QString& password, const QString& host, int port,
                        const QString& connOpts)
 {
@@ -1191 +1183 @@
         return false;
     }
+
+    QString protocol;
     // Set connection attributes
     const QStringList opts(connOpts.split(QLatin1Char(';'), QString::SkipEmptyParts));
@@ -1221 +1215 @@
             v = val.toUInt();
             r = SQLSetConnectAttr(d->hDbc, SQL_ATTR_LOGIN_TIMEOUT, (SQLPOINTER) v, 0);
-        } else {
+        } else if (opt.compare(QLatin1String("PROTOCOL"), Qt::CaseInsensitive) == 0) {
+                        protocol = tmp;
+        }
+        else {
             qWarning("QDB2Driver::open: Unknown connection attribute '%s'",
                       tmp.toLocal8Bit().constData());
@@ -1230 +1227 @@
     }
 
+    if (protocol.isEmpty())
+        protocol = QLatin1String("PROTOCOL=TCPIP");
+
+    if (port < 0 )
+        port = 50000;
+
     QString connQStr;
-    connQStr = QLatin1String("DSN=") + db + QLatin1String(";UID=") + user + QLatin1String(";PWD=")
-               + password;
+    connQStr =  protocol + QLatin1String(";DATABASE=") + db + QLatin1String(";HOSTNAME=") + host
+        + QLatin1String(";PORT=") + QString::number(port) + QLatin1String(";UID=") + user
+        + QLatin1String(";PWD=") + password;
+
+
     SQLTCHAR connOut[SQL_MAX_OPTION_STRING_LENGTH];
     SQLSMALLINT cb;
@@ -1251 +1257 @@
     }
 
-    d->user = user.toUpper();
+    d->user = user;
     setOpen(true);
     setOpenError(false);
@@ -1296 +1302 @@
     SQLHANDLE hStmt;
     QString catalog, schema, table;
-    qSplitTableQualifier(tableName.toUpper(), &catalog, &schema, &table);
+    qSplitTableQualifier(tableName, &catalog, &schema, &table);
     if (schema.isEmpty())
         schema = d->user;
+
+    if (isIdentifierEscaped(catalog, QSqlDriver::TableName))
+        catalog = stripDelimiters(catalog, QSqlDriver::TableName);
+    else
+        catalog = catalog.toUpper();
+
+    if (isIdentifierEscaped(schema, QSqlDriver::TableName))
+        schema = stripDelimiters(schema, QSqlDriver::TableName);
+    else
+        schema = schema.toUpper();
+
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+    else
+        table = table.toUpper();
 
     SQLRETURN r = SQLAllocHandle(SQL_HANDLE_STMT,
@@ -1313 +1334 @@
                         SQL_IS_UINTEGER);
 
+
+    //Aside: szSchemaName and szTableName parameters of SQLColumns
+    //are case sensitive search patterns, so no escaping is used.
     r =  SQLColumns(hStmt,
                      NULL,
@@ -1393 +1417 @@
         QString fieldVal = qGetStringData(hStmt, 2, -1, isNull);
         QString userVal = qGetStringData(hStmt, 1, -1, isNull);
-        if (userVal != d->user)
+        QString user = d->user;
+        if ( isIdentifierEscaped(user, QSqlDriver::TableName))
+            user = stripDelimiters(user, QSqlDriver::TableName);
+        else
+            user = user.toUpper();
+
+        if (userVal != user)
             fieldVal = userVal + QLatin1Char('.') + fieldVal;
         tl.append(fieldVal);
@@ -1424 +1454 @@
     }
     QString catalog, schema, table;
-    qSplitTableQualifier(tablename.toUpper(), &catalog, &schema, &table);
+    qSplitTableQualifier(tablename, &catalog, &schema, &table);
+
+    if (isIdentifierEscaped(catalog, QSqlDriver::TableName))
+        catalog = stripDelimiters(catalog, QSqlDriver::TableName);
+    else
+        catalog = catalog.toUpper();
+
+    if (isIdentifierEscaped(schema, QSqlDriver::TableName))
+        schema = stripDelimiters(schema, QSqlDriver::TableName);
+    else
+        schema = schema.toUpper();
+
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+    else
+        table = table.toUpper();
+
     r = SQLSetStmtAttr(hStmt,
                         SQL_ATTR_CURSOR_TYPE,
@@ -1468 +1514 @@
         case LastInsertId:
         case SimpleLocking:
-        case LowPrecisionNumbers:
         case EventNotifications:
             return false;
@@ -1476 +1521 @@
         case PreparedQueries:
         case PositionalPlaceholders:
+        case LowPrecisionNumbers:
+        case FinishQuery:
             return true;
         case Unicode:
-        // this is the query that shows the codepage for the types:
-        // select typename, codepage from syscat.datatypes
-#ifdef UNICODE
             return true;
-#else
-            return false;
-#endif
     }
     return false;
@@ -1598 +1639 @@
 {
     QString res = identifier;
-    if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(QLatin1Char('"')) ) {
+    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
         res.replace(QLatin1Char('"'), QLatin1String("\"\""));
         res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));

trunk/src/sql/drivers/db2/qsql_db2.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/sql/drivers/ibase/qsql_ibase.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -56 +56 @@
 #include <math.h>
 #include <qdebug.h>
+#include <QVarLengthArray>
 
 QT_BEGIN_NAMESPACE
@@ -67 +68 @@
 enum { QIBaseChunkSize = SHRT_MAX / 2 };
 
-static bool getIBaseError(QString& msg, ISC_STATUS* status, ISC_LONG &sqlcode,
-                          QTextCodec *tc)
+#if defined(FB_API_VER) && FB_API_VER >= 20
+static bool getIBaseError(QString& msg, const ISC_STATUS* status, ISC_LONG &sqlcode, QTextCodec *tc)
+#else
+static bool getIBaseError(QString& msg, ISC_STATUS* status, ISC_LONG &sqlcode, QTextCodec *tc)
+#endif
 {
     if (status[0] != 1 || status[1] <= 0)
@@ -76 +80 @@
     sqlcode = isc_sqlcode(status);
     char buf[512];
+#if defined(FB_API_VER) && FB_API_VER >= 20
+    while(fb_interpret(buf, 512, &status)) {
+#else
     while(isc_interprete(buf, &status)) {
+#endif
         if(!msg.isEmpty())
             msg += QLatin1String(" - ");
@@ -90 +98 @@
 {
     sqlda = (XSQLDA *) malloc(XSQLDA_LENGTH(1));
+    if (sqlda == (XSQLDA*)0) return;
     sqlda->sqln = 1;
     sqlda->sqld = 0;
@@ -99 +108 @@
 static void enlargeDA(XSQLDA *&sqlda, int n)
 {
-    free(sqlda);
+    if (sqlda != (XSQLDA*)0)
+        free(sqlda);
     sqlda = (XSQLDA *) malloc(XSQLDA_LENGTH(n));
+    if (sqlda == (XSQLDA*)0) return;
     sqlda->sqln = n;
     sqlda->version = SQLDA_CURRENT_VERSION;
@@ -119 +130 @@
         case SQL_TEXT:
         case SQL_BLOB:
-            sqlda->sqlvar[i].sqldata = (char*)malloc(sqlda->sqlvar[i].sqllen);
+            sqlda->sqlvar[i].sqldata = new char[sqlda->sqlvar[i].sqllen];
             break;
         case SQL_ARRAY:
-            sqlda->sqlvar[i].sqldata = (char*)malloc(sizeof(ISC_QUAD));
+            sqlda->sqlvar[i].sqldata = new char[sizeof(ISC_QUAD)];
             memset(sqlda->sqlvar[i].sqldata, 0, sizeof(ISC_QUAD));
             break;
         case SQL_VARYING:
-            sqlda->sqlvar[i].sqldata = (char*)malloc(sqlda->sqlvar[i].sqllen + sizeof(short));
+            sqlda->sqlvar[i].sqldata = new char[sqlda->sqlvar[i].sqllen + sizeof(short)];
             break;
         default:
@@ -134 +145 @@
         }
         if (sqlda->sqlvar[i].sqltype & 1) {
-            sqlda->sqlvar[i].sqlind = (short*)malloc(sizeof(short));
+            sqlda->sqlvar[i].sqlind = new short[1];
             *(sqlda->sqlvar[i].sqlind) = 0;
         } else {
@@ -147 +158 @@
         return;
     for (int i = 0; i < sqlda->sqld; ++i) {
-        free(sqlda->sqlvar[i].sqlind);
-        free(sqlda->sqlvar[i].sqldata);
+        delete [] sqlda->sqlvar[i].sqlind;
+        delete [] sqlda->sqlvar[i].sqldata;
     }
     free(sqlda);
@@ -293 +304 @@
     ISC_LONG bufferLength;
     ISC_LONG eventId;
-    
+
     enum QIBaseSubscriptionState { Starting, Subscribed, Finished };
     QIBaseSubscriptionState subscriptionState;
@@ -444 +455 @@
     ba.resize(read);
 
-    bool isErr = (status[1] == isc_segstr_eof ? false : 
-                    isError(QT_TRANSLATE_NOOP("QIBaseResult", 
+    bool isErr = (status[1] == isc_segstr_eof ? false :
+                    isError(QT_TRANSLATE_NOOP("QIBaseResult",
                                                 "Unable to read BLOB"),
                                                 QSqlError::StatementError));
@@ -512 +523 @@
                     else
                         valList.append(QString::fromUtf8(buffer, o));
-                    
+
                     buffer += strLen;
                 }
@@ -577 +588 @@
     int arraySize = 1, subArraySize;
     short dimensions = desc.array_desc_dimensions;
-    short *numElements = new short[dimensions];
+    QVarLengthArray<short> numElements(dimensions);
 
     for(int i = 0; i < dimensions; ++i) {
@@ -606 +617 @@
         return list;
 
-    readArrayBuffer(list, ba.data(), 0, numElements, &desc, tc);
-
-    delete[] numElements;
+    readArrayBuffer(list, ba.data(), 0, numElements.data(), &desc, tc);
 
     return QVariant(list);
@@ -639 +648 @@
 }
 
-static char* qFillBufferWithString(char *buffer, const QString& string, 
-                                   short buflen, bool varying, bool array, 
+static char* qFillBufferWithString(char *buffer, const QString& string,
+                                   short buflen, bool varying, bool array,
                                    QTextCodec *tc)
 {
@@ -872 +881 @@
 bool QIBaseResult::prepare(const QString& query)
 {
-    //qDebug("prepare: %s\n", qPrintable(query));
+//     qDebug("prepare: %s", qPrintable(query));
     if (!driver() || !driver()->isOpen() || driver()->isOpenError())
         return false;
@@ -880 +889 @@
 
     createDA(d->sqlda);
+    if (d->sqlda == (XSQLDA*)0) {
+        qWarning()<<"QIOBaseResult: createDA(): failed to allocate memory";
+        return false;
+    }
+
     createDA(d->inda);
+    if (d->inda == (XSQLDA*)0){
+        qWarning()<<"QIOBaseResult: createDA():  failed to allocate memory";
+        return false;
+    }
 
     if (!d->transaction())
@@ -901 +919 @@
     if (d->inda->sqld > d->inda->sqln) {
         enlargeDA(d->inda, d->inda->sqld);
+        if (d->inda == (XSQLDA*)0) {
+            qWarning()<<"QIOBaseResult: enlargeDA(): failed to allocate memory";
+            return false;
+        }
 
         isc_dsql_describe_bind(d->status, &d->stmt, FBVERSION, d->inda);
@@ -911 +933 @@
         // need more field descriptors
         enlargeDA(d->sqlda, d->sqlda->sqld);
+        if (d->sqlda == (XSQLDA*)0) {
+            qWarning()<<"QIOBaseResult: enlargeDA(): failed to allocate memory";
+            return false;
+        }
 
         isc_dsql_describe(d->status, &d->stmt, FBVERSION, d->sqlda);
@@ -978 +1004 @@
             case SQL_LONG:
                 if (d->inda->sqlvar[para].sqlscale < 0)
-                    *((long*)d->inda->sqlvar[para].sqldata) = 
+                    *((long*)d->inda->sqlvar[para].sqldata) =
                         (long)floor(0.5 + val.toDouble() * pow(10.0, d->inda->sqlvar[para].sqlscale * -1));
                 else
@@ -985 +1011 @@
             case SQL_SHORT:
                 if (d->inda->sqlvar[para].sqlscale < 0)
-                    *((short*)d->inda->sqlvar[para].sqldata) = 
+                    *((short*)d->inda->sqlvar[para].sqldata) =
                         (short)floor(0.5 + val.toDouble() * pow(10.0, d->inda->sqlvar[para].sqlscale * -1));
                 else
@@ -1026 +1052 @@
 
     if (ok) {
-        if (colCount()) {
+        if (colCount() && d->queryType != isc_info_sql_stmt_exec_procedure) {
             isc_dsql_free_statement(d->status, &d->stmt, DSQL_close);
             if (d->isError(QT_TRANSLATE_NOOP("QIBaseResult", "Unable to close statement")))
@@ -1040 +1066 @@
 
         // Not all stored procedures necessarily return values.
-        if (d->queryType == isc_info_sql_stmt_exec_procedure && d->sqlda->sqld == 0)
+        if (d->queryType == isc_info_sql_stmt_exec_procedure && d->sqlda && d->sqlda->sqld == 0)
             delDA(d->sqlda);
 
@@ -1098 +1124 @@
             QVariant v;
             v.convert(qIBaseTypeName2(d->sqlda->sqlvar[i].sqltype, d->sqlda->sqlvar[i].sqlscale < 0));
+            if(v.type() == QVariant::Double) {
+                switch(numericalPrecisionPolicy()) {
+                case QSql::LowPrecisionInt32:
+                    v.convert(QVariant::Int);
+                    break;
+                case QSql::LowPrecisionInt64:
+                    v.convert(QVariant::LongLong);
+                    break;
+                case QSql::HighPrecision:
+                    v.convert(QVariant::String);
+                    break;
+                }
+            }
             row[idx] = v;
             continue;
@@ -1162 +1201 @@
             row[idx] = QVariant();
             break;
+        }
+        if (d->sqlda->sqlvar[i].sqlscale < 0) {
+            QVariant v = row[idx];
+            switch(numericalPrecisionPolicy()) {
+            case QSql::LowPrecisionInt32:
+                if(v.convert(QVariant::Int))
+                    row[idx]=v;
+                break;
+            case QSql::LowPrecisionInt64:
+                if(v.convert(QVariant::LongLong))
+                    row[idx]=v;
+                break;
+            case QSql::LowPrecisionDouble:
+                if(v.convert(QVariant::Double))
+                    row[idx]=v;
+                break;
+            case QSql::HighPrecision:
+                if(v.convert(QVariant::String))
+                    row[idx]=v;
+                break;
+            }
         }
     }
@@ -1237 +1297 @@
         cCountType = isc_info_req_insert_count;
         break;
+    default:
+        qWarning() << "numRowsAffected: Unknown statement type (" << d->queryType << ")";
+        return -1;
     }
 
@@ -1271 +1334 @@
         QSqlField f(QString::fromLatin1(v.aliasname, v.aliasname_length).simplified(),
                     qIBaseTypeName2(v.sqltype, v.sqlscale < 0));
-        QSqlQuery q(new QIBaseResult(d->db));
-        q.setForwardOnly(true);
-        q.exec(QLatin1String("select b.RDB$FIELD_PRECISION, b.RDB$FIELD_SCALE, b.RDB$FIELD_LENGTH, a.RDB$NULL_FLAG "
-                "FROM RDB$RELATION_FIELDS a, RDB$FIELDS b "
-                "WHERE b.RDB$FIELD_NAME = a.RDB$FIELD_SOURCE "
-                "AND a.RDB$RELATION_NAME = '") + QString::fromAscii(v.relname, v.relname_length).toUpper() + QLatin1String("' "
-                "AND a.RDB$FIELD_NAME = '") + QString::fromAscii(v.sqlname, v.sqlname_length).toUpper() + QLatin1String("' "));
-        if(q.first()) {
-            if(v.sqlscale < 0) {
-                f.setLength(q.value(0).toInt());
-                f.setPrecision(qAbs(q.value(1).toInt()));
-            } else {
-                f.setLength(q.value(2).toInt());
-                f.setPrecision(0);
+        f.setLength(v.sqllen);
+        f.setPrecision(qAbs(v.sqlscale));
+        f.setRequiredStatus((v.sqltype & 1) == 0 ? QSqlField::Required : QSqlField::Optional);
+        if(v.sqlscale < 0) {
+            QSqlQuery q(new QIBaseResult(d->db));
+            q.setForwardOnly(true);
+            q.exec(QLatin1String("select b.RDB$FIELD_PRECISION, b.RDB$FIELD_SCALE, b.RDB$FIELD_LENGTH, a.RDB$NULL_FLAG "
+                    "FROM RDB$RELATION_FIELDS a, RDB$FIELDS b "
+                    "WHERE b.RDB$FIELD_NAME = a.RDB$FIELD_SOURCE "
+                    "AND a.RDB$RELATION_NAME = '") + QString::fromAscii(v.relname, v.relname_length).toUpper() + QLatin1String("' "
+                    "AND a.RDB$FIELD_NAME = '") + QString::fromAscii(v.sqlname, v.sqlname_length).toUpper() + QLatin1String("' "));
+            if(q.first()) {
+                if(v.sqlscale < 0) {
+                    f.setLength(q.value(0).toInt());
+                    f.setPrecision(qAbs(q.value(1).toInt()));
+                } else {
+                    f.setLength(q.value(2).toInt());
+                    f.setPrecision(0);
+                }
+                f.setRequiredStatus(q.value(3).toBool() ? QSqlField::Required : QSqlField::Optional);
             }
-            f.setRequiredStatus(q.value(3).toBool() ? QSqlField::Required : QSqlField::Optional);
-        }
-        else {
-            f.setLength(0);
-            f.setPrecision(0);
-            f.setRequiredStatus(QSqlField::Unknown);
         }
         f.setSqlType(v.sqltype);
@@ -1334 +1397 @@
     case BatchOperations:
     case SimpleLocking:
-    case LowPrecisionNumbers:
     case FinishQuery:
     case MultipleResultSets:
@@ -1344 +1406 @@
     case BLOB:
     case EventNotifications:
+    case LowPrecisionNumbers:
         return true;
     }
@@ -1553 +1616 @@
     QSqlQuery q(createResult());
     q.setForwardOnly(true);
-
+    QString table = tablename;
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+    else
+        table = table.toUpper();
     q.exec(QLatin1String("SELECT a.RDB$FIELD_NAME, b.RDB$FIELD_TYPE, b.RDB$FIELD_LENGTH, "
            "b.RDB$FIELD_SCALE, b.RDB$FIELD_PRECISION, a.RDB$NULL_FLAG "
            "FROM RDB$RELATION_FIELDS a, RDB$FIELDS b "
            "WHERE b.RDB$FIELD_NAME = a.RDB$FIELD_SOURCE "
-           "AND a.RDB$RELATION_NAME = '") + tablename.toUpper() + QLatin1String("' "
+           "AND a.RDB$RELATION_NAME = '") + table + QLatin1String("' "
            "ORDER BY a.RDB$FIELD_POSITION"));
 
@@ -1586 +1653 @@
         return index;
 
+    QString tablename = table;
+    if (isIdentifierEscaped(tablename, QSqlDriver::TableName))
+        tablename = stripDelimiters(tablename, QSqlDriver::TableName);
+    else
+        tablename = tablename.toUpper();
+
     QSqlQuery q(createResult());
     q.setForwardOnly(true);
@@ -1591 +1664 @@
            "FROM RDB$RELATION_CONSTRAINTS a, RDB$INDEX_SEGMENTS b, RDB$RELATION_FIELDS c, RDB$FIELDS d "
            "WHERE a.RDB$CONSTRAINT_TYPE = 'PRIMARY KEY' "
-           "AND a.RDB$RELATION_NAME = '") + table.toUpper() +
+           "AND a.RDB$RELATION_NAME = '") + tablename +
            QLatin1String(" 'AND a.RDB$INDEX_NAME = b.RDB$INDEX_NAME "
            "AND c.RDB$RELATION_NAME = a.RDB$RELATION_NAME "
@@ -1668 +1741 @@
     QIBaseDriver *driver = qBufferDriverMap()->value(result);
     qMutex()->unlock();
-    
+
     // We use an asynchronous call (i.e., queued connection) because the event callback
     // is executed in a different thread than the one in which the driver lives.
@@ -1717 +1790 @@
 
     if (status[0] == 1 && status[1]) {
-        setLastError(QSqlError(QString(QLatin1String("Could not subscribe to event notifications for %1.")).arg(name)));
+        setLastError(QSqlError(QString::fromLatin1("Could not subscribe to event notifications for %1.").arg(name)));
         d->eventBuffers.remove(name);
         qFreeEventBuffer(eBuffer);
@@ -1745 +1818 @@
 
     if (status[0] == 1 && status[1]) {
-        setLastError(QSqlError(QString(QLatin1String("Could not unsubscribe from event notifications for %1.")).arg(name)));
+        setLastError(QSqlError(QString::fromLatin1("Could not unsubscribe from event notifications for %1.").arg(name)));
         return false;
     }
@@ -1803 +1876 @@
 {
     QString res = identifier;
-    if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(QLatin1Char('"')) ) {
+    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
         res.replace(QLatin1Char('"'), QLatin1String("\"\""));
         res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));

trunk/src/sql/drivers/ibase/qsql_ibase.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/sql/drivers/mysql/qsql_mysql.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -86 +86 @@
         tc(0),
 #endif
-        preparedQuerys(false), preparedQuerysEnabled(false) {}
+        preparedQuerysEnabled(false) {}
     MYSQL *mysql;
     QTextCodec *tc;
 
-    bool preparedQuerys;
     bool preparedQuerysEnabled;
 };
@@ -164 +163 @@
 }
 
-class QMYSQLResultPrivate
-{
+class QMYSQLResultPrivate : public QObject
+{
+    Q_OBJECT
 public:
-    QMYSQLResultPrivate(QMYSQLDriverPrivate* dp) : d(dp), result(0),
+    QMYSQLResultPrivate(const QMYSQLDriver* dp, const QMYSQLResult* d) : driver(dp), result(0), q(d), 
         rowsAffected(0), hasBlobs(false)
 #if MYSQL_VERSION_ID >= 40108
         , stmt(0), meta(0), inBinds(0), outBinds(0)
 #endif
-        , precisionPolicy(QSql::HighPrecision)
-        {}
-
-    QMYSQLDriverPrivate* d;
+        , preparedQuery(false)
+        {
+            connect(dp, SIGNAL(destroyed()), this, SLOT(driverDestroyed()));
+        }
+
+    const QMYSQLDriver* driver;
     MYSQL_RES *result;
     MYSQL_ROW row;
+    const QMYSQLResult* q;
 
     int rowsAffected;
@@ -207 +210 @@
     MYSQL_BIND *outBinds;
 #endif
-    QSql::NumericalPrecisionPolicy precisionPolicy;
+
+    bool preparedQuery;
+
+private Q_SLOTS:
+    void driverDestroyed() { driver = NULL; }
 };
 
@@ -225 +232 @@
                             const QMYSQLDriverPrivate* p)
 {
-    const char *cerr = mysql_error(p->mysql);
+    const char *cerr = p->mysql ? mysql_error(p->mysql) : 0;
     return QSqlError(QLatin1String("QMYSQL: ") + err,
                      p->tc ? toUnicode(p->tc, cerr) : QString::fromLatin1(cerr),
@@ -250 +257 @@
     case FIELD_TYPE_FLOAT :
     case FIELD_TYPE_DOUBLE :
+    case FIELD_TYPE_DECIMAL :
+#if defined(FIELD_TYPE_NEWDECIMAL)
+    case FIELD_TYPE_NEWDECIMAL:
+#endif
         type = QVariant::Double;
         break;
@@ -273 +284 @@
     case FIELD_TYPE_ENUM :
     case FIELD_TYPE_SET :
-    case FIELD_TYPE_DECIMAL :
         type = QVariant::String;
         break;
@@ -350 +360 @@
         QMyField &f = fields[i];
         f.myField = fieldInfo;
+
         f.type = qDecodeMYSQLType(fieldInfo->type, fieldInfo->flags);
         if (qIsBlob(fieldInfo->type)) {
@@ -380 +391 @@
 : QSqlResult(db)
 {
-    d = new QMYSQLResultPrivate(db->d);
+    d = new QMYSQLResultPrivate(db, this);
 }
 
@@ -392 +403 @@
 {
 #if MYSQL_VERSION_ID >= 40108
-    if(d->d->preparedQuerys)
+    if(d->preparedQuery)
         return d->meta ? qVariantFromValue(d->meta) : qVariantFromValue(d->stmt);
     else
@@ -407 +418 @@
 // if this isn't done subsequent queries will fail with "Commands out of sync"
 #if MYSQL_VERSION_ID >= 40100
-    while (d->d->mysql && mysql_next_result(d->d->mysql) == 0) {
-        MYSQL_RES *res = mysql_store_result(d->d->mysql);
+    while (d->driver && d->driver->d->mysql && mysql_next_result(d->driver->d->mysql) == 0) {
+        MYSQL_RES *res = mysql_store_result(d->driver->d->mysql);
         if (res)
             mysql_free_result(res);
@@ -447 +458 @@
     setAt(-1);
     setActive(false);
-
-    d->d->preparedQuerys = d->d->preparedQuerysEnabled;
 }
 
 bool QMYSQLResult::fetch(int i)
 {
+    if(!d->driver)
+        return false;
     if (isForwardOnly()) { // fake a forward seek
         if (at() < i) {
@@ -464 +475 @@
     if (at() == i)
         return true;
-    if (d->d->preparedQuerys) {
+    if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
         mysql_stmt_data_seek(d->stmt, i);
@@ -495 +506 @@
 bool QMYSQLResult::fetchNext()
 {
-    if (d->d->preparedQuerys) {
+    if(!d->driver)
+        return false;
+    if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
-        if (mysql_stmt_fetch(d->stmt))
+        int nRC = mysql_stmt_fetch(d->stmt);
+        if (nRC) {
+#ifdef MYSQL_DATA_TRUNCATED
+            if (nRC == 1 || nRC == MYSQL_DATA_TRUNCATED)
+#else
+            if (nRC == 1)
+#endif // MYSQL_DATA_TRUNCATED
+                setLastError(qMakeStmtError(QCoreApplication::translate("QMYSQLResult",
+                                    "Unable to fetch data"), QSqlError::StatementError, d->stmt));
             return false;
+        }
 #else
         return false;
 #endif
     } else {
-    d->row = mysql_fetch_row(d->result);
-    if (!d->row)
-        return false;
+        d->row = mysql_fetch_row(d->result);
+        if (!d->row)
+            return false;
     }
     setAt(at() + 1);
@@ -513 +535 @@
 bool QMYSQLResult::fetchLast()
 {
+    if(!d->driver)
+        return false;
     if (isForwardOnly()) { // fake this since MySQL can't seek on forward only queries
         bool success = fetchNext(); // did we move at all?
@@ -520 +544 @@
 
     my_ulonglong numRows;
-    if (d->d->preparedQuerys) {
+    if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
         numRows = mysql_stmt_num_rows(d->stmt);
@@ -554 +578 @@
     }
 
+    if (!d->driver)
+        return QVariant();
+
     int fieldLength = 0;
     const QMYSQLResultPrivate::QMyField &f = d->fields.at(field);
     QString val;
-    if (d->d->preparedQuerys) {
+    if (d->preparedQuery) {
         if (f.nullIndicator)
             return QVariant(f.type);
 
         if (f.type != QVariant::ByteArray)
-            val = toUnicode(d->d->tc, f.outField, f.bufLength);
+            val = toUnicode(d->driver->d->tc, f.outField, f.bufLength);
     } else {
         if (d->row[field] == NULL) {
@@ -570 +597 @@
         fieldLength = mysql_fetch_lengths(d->result)[field];
         if (f.type != QVariant::ByteArray)
-            val = toUnicode(d->d->tc, d->row[field], fieldLength);
+            val = toUnicode(d->driver->d->tc, d->row[field], fieldLength);
     }
 
@@ -585 +612 @@
         QVariant v;
         bool ok=false;
-        switch(d->precisionPolicy) {
+        double dbl = val.toDouble(&ok);
+        switch(numericalPrecisionPolicy()) {
             case QSql::LowPrecisionInt32:
-                v=val.toInt(&ok);
+                v=QVariant(dbl).toInt();
                 break;
             case QSql::LowPrecisionInt64:
-                v = val.toLongLong(&ok);
+                v = QVariant(dbl).toLongLong();
                 break;
             case QSql::LowPrecisionDouble:
-                v = val.toDouble(&ok);
+                v = QVariant(dbl);
                 break;
             case QSql::HighPrecision:
@@ -606 +634 @@
             return QVariant();
     }
+        return QVariant(val.toDouble());
     case QVariant::Date:
         return qDateFromString(val);
@@ -615 +644 @@
 
         QByteArray ba;
-        if (d->d->preparedQuerys) {
+        if (d->preparedQuery) {
             ba = QByteArray(f.outField, f.bufLength);
         } else {
@@ -632 +661 @@
 bool QMYSQLResult::isNull(int field)
 {
-   if (d->d->preparedQuerys)
+   if (d->preparedQuery)
        return d->fields.at(field).nullIndicator;
    else
@@ -640 +669 @@
 bool QMYSQLResult::reset (const QString& query)
 {
-    if (!driver() || !driver()->isOpen() || driver()->isOpenError())
-        return false;
-
-    if(d->d->preparedQuerysEnabled && prepare(query)) {
-        d->d->preparedQuerys = true;
-        return exec();
-    }
-    d->d->preparedQuerys = false;
-
-    const QByteArray encQuery(fromUnicode(d->d->tc, query));
-    if (mysql_real_query(d->d->mysql, encQuery.data(), encQuery.length())) {
+    if (!driver() || !driver()->isOpen() || driver()->isOpenError() || !d->driver)
+        return false;
+
+    d->preparedQuery = false;
+
+    cleanup();
+
+    const QByteArray encQuery(fromUnicode(d->driver->d->tc, query));
+    if (mysql_real_query(d->driver->d->mysql, encQuery.data(), encQuery.length())) {
         setLastError(qMakeError(QCoreApplication::translate("QMYSQLResult", "Unable to execute query"),
-                     QSqlError::StatementError, d->d));
-        return false;
-    }
-    d->result = mysql_store_result(d->d->mysql);
-    if (!d->result && mysql_field_count(d->d->mysql) > 0) {
+                     QSqlError::StatementError, d->driver->d));
+        return false;
+    }
+    d->result = mysql_store_result(d->driver->d->mysql);
+    if (!d->result && mysql_field_count(d->driver->d->mysql) > 0) {
         setLastError(qMakeError(QCoreApplication::translate("QMYSQLResult", "Unable to store result"),
-                    QSqlError::StatementError, d->d));
-        return false;
-    }
-    int numFields = mysql_field_count(d->d->mysql);
+                    QSqlError::StatementError, d->driver->d));
+        return false;
+    }
+    int numFields = mysql_field_count(d->driver->d->mysql);
     setSelect(numFields != 0);
     d->fields.resize(numFields);
-    d->rowsAffected = mysql_affected_rows(d->d->mysql);
+    d->rowsAffected = mysql_affected_rows(d->driver->d->mysql);
+
     if (isSelect()) {
         for(int i = 0; i < numFields; i++) {
@@ -678 +706 @@
 int QMYSQLResult::size()
 {
-    if (isSelect())
-        if (d->d->preparedQuerys)
+    if (d->driver && isSelect())
+        if (d->preparedQuery)
 #if MYSQL_VERSION_ID >= 40108
             return mysql_stmt_num_rows(d->stmt);
@@ -698 +726 @@
 QVariant QMYSQLResult::lastInsertId() const
 {
-    if (!isActive())
+    if (!isActive() || !d->driver)
         return QVariant();
 
-    if (d->d->preparedQuerys) {
+    if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
         quint64 id = mysql_stmt_insert_id(d->stmt);
@@ -708 +736 @@
 #endif
     } else {
-        quint64 id = mysql_insert_id(d->d->mysql);
+        quint64 id = mysql_insert_id(d->driver->d->mysql);
         if (id)
             return QVariant(id);
@@ -719 +747 @@
     QSqlRecord info;
     MYSQL_RES *res;
-    if (!isActive() || !isSelect())
+    if (!isActive() || !isSelect() || !d->driver)
         return info;
 
 #if MYSQL_VERSION_ID >= 40108
-    res = d->d->preparedQuerys ? d->meta : d->result;
+    res = d->preparedQuery ? d->meta : d->result;
 #else
     res = d->result;
 #endif
 
-    if (!mysql_errno(d->d->mysql)) {
+    if (!mysql_errno(d->driver->d->mysql)) {
         mysql_field_seek(res, 0);
         MYSQL_FIELD* field = mysql_fetch_field(res);
         while(field) {
-            info.append(qToField(field, d->d->tc));
+            info.append(qToField(field, d->driver->d->tc));
             field = mysql_fetch_field(res);
         }
@@ -742 +770 @@
 bool QMYSQLResult::nextResult()
 {
+    if(!d->driver)
+        return false;
 #if MYSQL_VERSION_ID >= 40100 
     setAt(-1);
@@ -755 +785 @@
     d->fields.clear();
 
-    int status = mysql_next_result(d->d->mysql);
+    int status = mysql_next_result(d->driver->d->mysql);
     if (status > 0) {
         setLastError(qMakeError(QCoreApplication::translate("QMYSQLResult", "Unable to execute next query"),
-                     QSqlError::StatementError, d->d));
+                     QSqlError::StatementError, d->driver->d));
         return false;
     } else if (status == -1) {
@@ -764 +794 @@
     }
 
-    d->result = mysql_store_result(d->d->mysql);
-    int numFields = mysql_field_count(d->d->mysql);
+    d->result = mysql_store_result(d->driver->d->mysql);
+    int numFields = mysql_field_count(d->driver->d->mysql);
     if (!d->result && numFields > 0) {
         setLastError(qMakeError(QCoreApplication::translate("QMYSQLResult", "Unable to store next result"),
-                     QSqlError::StatementError, d->d));
+                     QSqlError::StatementError, d->driver->d));
         return false;
     }
@@ -774 +804 @@
     setSelect(numFields > 0);
     d->fields.resize(numFields);
-    d->rowsAffected = mysql_affected_rows(d->d->mysql);
+    d->rowsAffected = mysql_affected_rows(d->driver->d->mysql);
 
     if (isSelect()) {
@@ -797 +827 @@
         *static_cast<bool*>(data) = nextResult();
         break;
-    case QSqlResult::SetNumericalPrecision:
-        Q_ASSERT(data);
-        d->precisionPolicy = *reinterpret_cast<QSql::NumericalPrecisionPolicy *>(data);
-        break;
     default:
         QSqlResult::virtual_hook(id, data);
@@ -834 +860 @@
 bool QMYSQLResult::prepare(const QString& query)
 {
+    if(!d->driver)
+        return false;
 #if MYSQL_VERSION_ID >= 40108
     cleanup();
-    if (!d->d->preparedQuerys)
+    if (!d->driver->d->preparedQuerysEnabled)
         return QSqlResult::prepare(query);
 
@@ -845 +873 @@
 
     if (!d->stmt)
-        d->stmt = mysql_stmt_init(d->d->mysql);
+        d->stmt = mysql_stmt_init(d->driver->d->mysql);
     if (!d->stmt) {
         setLastError(qMakeError(QCoreApplication::translate("QMYSQLResult", "Unable to prepare statement"),
-                     QSqlError::StatementError, d->d));
-        return false;
-    }
-
-    const QByteArray encQuery(fromUnicode(d->d->tc, query));
+                     QSqlError::StatementError, d->driver->d));
+        return false;
+    }
+
+    const QByteArray encQuery(fromUnicode(d->driver->d->tc, query));
     r = mysql_stmt_prepare(d->stmt, encQuery.constData(), encQuery.length());
     if (r != 0) {
@@ -866 +894 @@
 
     setSelect(d->bindInValues());
+    d->preparedQuery = true;
     return true;
 #else
@@ -874 +903 @@
 bool QMYSQLResult::exec()
 {
-    if (!d->d->preparedQuerys)
+    if (!d->driver)
+        return false;
+    if (!d->preparedQuery)
         return QSqlResult::exec();
     if (!d->stmt)
@@ -907 +938 @@
             currBind->is_null = &nullVector[i];
             currBind->length = 0;
+            currBind->is_unsigned = 0;
 
             switch (val.type()) {
@@ -953 +985 @@
                     currBind->buffer = data;
                     currBind->buffer_length = sizeof(double);
-                    currBind->is_unsigned = 0;
                     break;
                 case QVariant::LongLong:
@@ -964 +995 @@
                 case QVariant::String:
                 default: {
-                    QByteArray ba = fromUnicode(d->d->tc, val.toString());
+                    QByteArray ba = fromUnicode(d->driver->d->tc, val.toString());
                     stringVector.append(ba);
                     currBind->buffer_type = MYSQL_TYPE_STRING;
                     currBind->buffer = const_cast<char *>(ba.constData());
                     currBind->buffer_length = ba.length();
-                    currBind->is_unsigned = 0;
                     break; }
             }
@@ -1129 +1159 @@
     case BatchOperations:
     case SimpleLocking:
-    case LowPrecisionNumbers:
     case EventNotifications:
     case FinishQuery:
@@ -1137 +1166 @@
     case LastInsertId:
     case Unicode:
+    case LowPrecisionNumbers:
         return true;
     case PreparedQueries:
@@ -1193 +1223 @@
     const QStringList opts(connOpts.split(QLatin1Char(';'), QString::SkipEmptyParts));
     QString unixSocket;
+#if MYSQL_VERSION_ID >= 50000
+    my_bool reconnect=false;
+#endif
 
     // extract the real options from the string
@@ -1203 +1236 @@
             if (opt == QLatin1String("UNIX_SOCKET"))
                 unixSocket = val;
+#if MYSQL_VERSION_ID >= 50000
+            else if (opt == QLatin1String("MYSQL_OPT_RECONNECT")) {
+                if (val == QLatin1String("TRUE") || val == QLatin1String("1") || val.isEmpty())
+                    reconnect = true;
+            }
+#endif
             else if (val == QLatin1String("TRUE") || val == QLatin1String("1"))
                 setOptionFlag(optionFlags, tmp.left(idx).simplified());
@@ -1235 +1274 @@
             return false;
         }
+#if MYSQL_VERSION_ID >= 50000
+        if(reconnect)
+            mysql_options(d->mysql, MYSQL_OPT_RECONNECT, &reconnect);
+#endif
     } else {
         setLastError(qMakeError(tr("Unable to connect"),
@@ -1259 +1302 @@
 #endif
 
+#ifndef QT_NO_THREAD
+    mysql_thread_init();
+#endif
+
+
     setOpen(true);
     setOpenError(false);
@@ -1267 +1315 @@
 {
     if (isOpen()) {
+#ifndef QT_NO_THREAD
+        mysql_thread_end();
+#endif
         mysql_close(d->mysql);
         d->mysql = NULL;
@@ -1282 +1333 @@
 {
     QStringList tl;
-    if (!isOpen())
-        return tl;
-    if (!(type & QSql::Tables))
-        return tl;
-
-    MYSQL_RES* tableRes = mysql_list_tables(d->mysql, NULL);
-    MYSQL_ROW row;
-    int i = 0;
-    while (tableRes) {
-        mysql_data_seek(tableRes, i);
-        row = mysql_fetch_row(tableRes);
-        if (!row)
-            break;
-        tl.append(toUnicode(d->tc, row[0]));
-        i++;
-    }
-    mysql_free_result(tableRes);
+#if MYSQL_VERSION_ID >= 40100
+    if( mysql_get_server_version(d->mysql) < 50000)
+    {
+#endif
+        if (!isOpen())
+            return tl;
+        if (!(type & QSql::Tables))
+            return tl;
+
+        MYSQL_RES* tableRes = mysql_list_tables(d->mysql, NULL);
+        MYSQL_ROW row;
+        int i = 0;
+        while (tableRes) {
+            mysql_data_seek(tableRes, i);
+            row = mysql_fetch_row(tableRes);
+            if (!row)
+                break;
+            tl.append(toUnicode(d->tc, row[0]));
+            i++;
+        }
+        mysql_free_result(tableRes);
+#if MYSQL_VERSION_ID >= 40100
+    } else {
+        QSqlQuery q(createResult());
+        if(type & QSql::Tables) {
+            q.exec(QLatin1String("select table_name from information_schema.tables where table_type = 'BASE TABLE'"));
+            while(q.next())
+                tl.append(q.value(0).toString());
+        }
+        if(type & QSql::Views) {
+            q.exec(QLatin1String("select table_name from information_schema.tables where table_type = 'VIEW'"));
+            while(q.next())
+                tl.append(q.value(0).toString());
+        }
+    }
+#endif
     return tl;
 }
@@ -1305 +1375 @@
 {
     QSqlIndex idx;
-    bool prepQ;
     if (!isOpen())
         return idx;
-
-    prepQ = d->preparedQuerys;
-    d->preparedQuerys = false;
 
     QSqlQuery i(createResult());
     QString stmt(QLatin1String("show index from %1;"));
     QSqlRecord fil = record(tablename);
-    i.exec(stmt.arg(escapeIdentifier(tablename, QSqlDriver::TableName)));
+    i.exec(stmt.arg(tablename));
     while (i.isActive() && i.next()) {
         if (i.value(2).toString() == QLatin1String("PRIMARY")) {
@@ -1324 +1390 @@
     }
 
-    d->preparedQuerys = prepQ;
     return idx;
 }
@@ -1330 +1395 @@
 QSqlRecord QMYSQLDriver::record(const QString& tablename) const
 {
+    QString table=tablename;
+    if(isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+
     QSqlRecord info;
     if (!isOpen())
         return info;
-    MYSQL_RES* r = mysql_list_fields(d->mysql, tablename.toLocal8Bit().constData(), 0);
+    MYSQL_RES* r = mysql_list_fields(d->mysql, table.toLocal8Bit().constData(), 0);
     if (!r) {
         return info;
     }
     MYSQL_FIELD* field;
+
     while ((field = mysql_fetch_field(r)))
         info.append(qToField(field, d->tc));
@@ -1437 +1507 @@
 {
     QString res = identifier;
-    if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('`')) && identifier.right(1) != QString(QLatin1Char('`')) ) {
+    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('`')) && !identifier.endsWith(QLatin1Char('`')) ) {
         res.prepend(QLatin1Char('`')).append(QLatin1Char('`'));
         res.replace(QLatin1Char('.'), QLatin1String("`.`"));
@@ -1444 +1514 @@
 }
 
+bool QMYSQLDriver::isIdentifierEscapedImplementation(const QString &identifier, IdentifierType type) const
+{
+    Q_UNUSED(type);
+    return identifier.size() > 2
+        && identifier.startsWith(QLatin1Char('`')) //left delimited
+        && identifier.endsWith(QLatin1Char('`')); //right delimited
+}
+
 QT_END_NAMESPACE
+
+#include "qsql_mysql.moc"

trunk/src/sql/drivers/mysql/qsql_mysql.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -70 +70 @@
 {
     friend class QMYSQLDriver;
+    friend class QMYSQLResultPrivate;
 public:
     explicit QMYSQLResult(const QMYSQLDriver* db);
@@ -124 +125 @@
     QString escapeIdentifier(const QString &identifier, IdentifierType type) const;
 
+protected Q_SLOTS:
+    bool isIdentifierEscapedImplementation(const QString &identifier, IdentifierType type) const;
+
 protected:
     bool beginTransaction();

trunk/src/sql/drivers/oci/qsql_oci.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -149 +149 @@
     int serverVersion;
     int prefetchRows, prefetchMem;
-    QSql::NumericalPrecisionPolicy precisionPolicy;
 
     void setCharset(OCIBind* hbnd);
@@ -406 +405 @@
     ub4 prefetchRows;
     ub2 prefetchMem;
-    QSql::NumericalPrecisionPolicy precisionPolicy;
     QString user;
 
@@ -414 +412 @@
 QOCIDriverPrivate::QOCIDriverPrivate()
     : env(0), svc(0), srvhp(0), authp(0), err(0), transaction(false), serverVersion(-1),
-      prefetchRows(-1), prefetchMem(QOCI_PREFETCH_MEM), precisionPolicy(QSql::HighPrecision)
+      prefetchRows(-1), prefetchMem(QOCI_PREFETCH_MEM)
 {
 }
@@ -520 +518 @@
     else if (ocitype == QLatin1String("LONG") || ocitype == QLatin1String("NCLOB")
              || ocitype == QLatin1String("CLOB"))
-        type = QVariant::ByteArray;
+        type = QVariant::String;
     else if (ocitype == QLatin1String("RAW") || ocitype == QLatin1String("LONG RAW")
              || ocitype == QLatin1String("ROWID") || ocitype == QLatin1String("BLOB")
@@ -546 +544 @@
     case SQLT_RDD:
     case SQLT_LNG:
+    case SQLT_CLOB:
 #ifdef SQLT_INTERVAL_YM
     case SQLT_INTERVAL_YM:
@@ -587 +586 @@
     case SQLT_REF:
     case SQLT_RID:
-    case SQLT_CLOB:
         type = QVariant::ByteArray;
         break;
@@ -612 +610 @@
     f.setRequired(ofi.oraIsNull == 0);
 
-    if (ofi.type == QVariant::String)
+    if (ofi.type == QVariant::String && ofi.oraType != SQLT_NUM && ofi.oraType != SQLT_VNU)
         f.setLength(ofi.oraFieldLength);
     else
@@ -621 +619 @@
     return f;
 }
-
-static OraFieldInfo qMakeOraField(const QOCIResultPrivate* p, OCIParam* param)
-{
-    OraFieldInfo ofi;
-    ub2 colType(0);
-    text *colName = 0;
-    ub4 colNameLen(0);
-    sb1 colScale(0);
-    ub2 colLength(0);
-    ub2 colFieldLength(0);
-    sb2 colPrecision(0);
-    ub1 colIsNull(0);
-    int r(0);
-    QVariant::Type type(QVariant::Invalid);
-
-    r = OCIAttrGet(param,
-                   OCI_DTYPE_PARAM,
-                   &colType,
-                   0,
-                   OCI_ATTR_DATA_TYPE,
-                   p->err);
-    if (r != 0)
-        qOraWarning("qMakeOraField:", p->err);
-
-    r = OCIAttrGet(param,
-                   OCI_DTYPE_PARAM,
-                   &colName,
-                   &colNameLen,
-                   OCI_ATTR_NAME,
-                   p->err);
-    if (r != 0)
-        qOraWarning("qMakeOraField:", p->err);
-
-    r = OCIAttrGet(param,
-                   OCI_DTYPE_PARAM,
-                   &colLength,
-                   0,
-                   OCI_ATTR_DATA_SIZE, /* in bytes */
-                   p->err);
-    if (r != 0)
-        qOraWarning("qMakeOraField:", p->err);
-
-#ifdef OCI_ATTR_CHAR_SIZE
-    r = OCIAttrGet(param,
-                   OCI_DTYPE_PARAM,
-                   &colFieldLength,
-                   0,
-                   OCI_ATTR_CHAR_SIZE,
-                   p->err);
-    if (r != 0)
-        qOraWarning("qMakeOraField:", p->err);
-#else
-    // for Oracle8.
-    colFieldLength = colLength;
-#endif
-
-    r = OCIAttrGet(param,
-                   OCI_DTYPE_PARAM,
-                   &colPrecision,
-                   0,
-                   OCI_ATTR_PRECISION,
-                   p->err);
-    if (r != 0)
-        qOraWarning("qMakeOraField:", p->err);
-
-    r = OCIAttrGet(param,
-                   OCI_DTYPE_PARAM,
-                   &colScale,
-                   0,
-                   OCI_ATTR_SCALE,
-                   p->err);
-    if (r != 0)
-        qOraWarning("qMakeOraField:", p->err);
-    r = OCIAttrGet(param,
-                   OCI_DTYPE_PARAM,
-                   &colType,
-                   0,
-                   OCI_ATTR_DATA_TYPE,
-                   p->err);
-    if (r != 0)
-        qOraWarning("qMakeOraField:", p->err);
-    r = OCIAttrGet(param,
-                   OCI_DTYPE_PARAM,
-                   &colIsNull,
-                   0,
-                   OCI_ATTR_IS_NULL,
-                   p->err);
-    if (r != 0)
-        qOraWarning("qMakeOraField:", p->err);
-
-    type = qDecodeOCIType(colType, p->precisionPolicy);
-
-    if (type == QVariant::Int) {
-        if (colLength == 22 && colPrecision == 0 && colScale == 0)
-            type = QVariant::String;
-        if (colScale > 0)
-            type = QVariant::String;
-    }
-
-    // bind as double if the precision policy asks for it
-    if (((colType == SQLT_FLT) || (colType == SQLT_NUM))
-            && (p->precisionPolicy == QSql::LowPrecisionDouble)) {
-        type = QVariant::Double;
-    }
-
-    // bind as int32 or int64 if the precision policy asks for it
-    if ((colType == SQLT_NUM) || (colType == SQLT_VNU) || (colType == SQLT_UIN)
-            || (colType == SQLT_INT)) {
-        if (p->precisionPolicy == QSql::LowPrecisionInt64)
-            type = QVariant::LongLong;
-        else if (p->precisionPolicy == QSql::LowPrecisionInt32)
-            type = QVariant::Int;
-    }
-
-    if (colType == SQLT_BLOB)
-        colLength = 0;
-
-    // colNameLen is length in bytes
-    ofi.name = QString(reinterpret_cast<const QChar*>(colName), colNameLen / 2);
-    ofi.type = type;
-    ofi.oraType = colType;
-    ofi.oraFieldLength = colFieldLength;
-    ofi.oraLength = colLength;
-    ofi.oraScale = colScale;
-    ofi.oraPrecision = colPrecision;
-    ofi.oraIsNull = colIsNull;
-
-    return ofi;
-}
-
 
 /*!
@@ -807 +675 @@
     char* create(int position, int size);
     OCILobLocator ** createLobLocator(int position, OCIEnv* env);
+    OraFieldInfo qMakeOraField(const QOCIResultPrivate* p, OCIParam* param) const;
 
     class OraFieldInf
@@ -1138 +1007 @@
 }
 
+OraFieldInfo QOCICols::qMakeOraField(const QOCIResultPrivate* p, OCIParam* param) const
+{
+    OraFieldInfo ofi;
+    ub2 colType(0);
+    text *colName = 0;
+    ub4 colNameLen(0);
+    sb1 colScale(0);
+    ub2 colLength(0);
+    ub2 colFieldLength(0);
+    sb2 colPrecision(0);
+    ub1 colIsNull(0);
+    int r(0);
+    QVariant::Type type(QVariant::Invalid);
+
+    r = OCIAttrGet(param,
+                   OCI_DTYPE_PARAM,
+                   &colType,
+                   0,
+                   OCI_ATTR_DATA_TYPE,
+                   p->err);
+    if (r != 0)
+        qOraWarning("qMakeOraField:", p->err);
+
+    r = OCIAttrGet(param,
+                   OCI_DTYPE_PARAM,
+                   &colName,
+                   &colNameLen,
+                   OCI_ATTR_NAME,
+                   p->err);
+    if (r != 0)
+        qOraWarning("qMakeOraField:", p->err);
+
+    r = OCIAttrGet(param,
+                   OCI_DTYPE_PARAM,
+                   &colLength,
+                   0,
+                   OCI_ATTR_DATA_SIZE, /* in bytes */
+                   p->err);
+    if (r != 0)
+        qOraWarning("qMakeOraField:", p->err);
+
+#ifdef OCI_ATTR_CHAR_SIZE
+    r = OCIAttrGet(param,
+                   OCI_DTYPE_PARAM,
+                   &colFieldLength,
+                   0,
+                   OCI_ATTR_CHAR_SIZE,
+                   p->err);
+    if (r != 0)
+        qOraWarning("qMakeOraField:", p->err);
+#else
+    // for Oracle8.
+    colFieldLength = colLength;
+#endif
+
+    r = OCIAttrGet(param,
+                   OCI_DTYPE_PARAM,
+                   &colPrecision,
+                   0,
+                   OCI_ATTR_PRECISION,
+                   p->err);
+    if (r != 0)
+        qOraWarning("qMakeOraField:", p->err);
+
+    r = OCIAttrGet(param,
+                   OCI_DTYPE_PARAM,
+                   &colScale,
+                   0,
+                   OCI_ATTR_SCALE,
+                   p->err);
+    if (r != 0)
+        qOraWarning("qMakeOraField:", p->err);
+    r = OCIAttrGet(param,
+                   OCI_DTYPE_PARAM,
+                   &colType,
+                   0,
+                   OCI_ATTR_DATA_TYPE,
+                   p->err);
+    if (r != 0)
+        qOraWarning("qMakeOraField:", p->err);
+    r = OCIAttrGet(param,
+                   OCI_DTYPE_PARAM,
+                   &colIsNull,
+                   0,
+                   OCI_ATTR_IS_NULL,
+                   p->err);
+    if (r != 0)
+        qOraWarning("qMakeOraField:", p->err);
+
+    type = qDecodeOCIType(colType, p->q->numericalPrecisionPolicy());
+
+    if (type == QVariant::Int) {
+        if (colLength == 22 && colPrecision == 0 && colScale == 0)
+            type = QVariant::String;
+        if (colScale > 0)
+            type = QVariant::String;
+    }
+
+    // bind as double if the precision policy asks for it
+    if (((colType == SQLT_FLT) || (colType == SQLT_NUM))
+            && (p->q->numericalPrecisionPolicy() == QSql::LowPrecisionDouble)) {
+        type = QVariant::Double;
+    }
+
+    // bind as int32 or int64 if the precision policy asks for it
+    if ((colType == SQLT_NUM) || (colType == SQLT_VNU) || (colType == SQLT_UIN)
+            || (colType == SQLT_INT)) {
+        if (p->q->numericalPrecisionPolicy() == QSql::LowPrecisionInt64)
+            type = QVariant::LongLong;
+        else if (p->q->numericalPrecisionPolicy() == QSql::LowPrecisionInt32)
+            type = QVariant::Int;
+    }
+
+    if (colType == SQLT_BLOB)
+        colLength = 0;
+
+    // colNameLen is length in bytes
+    ofi.name = QString(reinterpret_cast<const QChar*>(colName), colNameLen / 2);
+    ofi.type = type;
+    ofi.oraType = colType;
+    ofi.oraFieldLength = colFieldLength;
+    ofi.oraLength = colLength;
+    ofi.oraScale = colScale;
+    ofi.oraPrecision = colPrecision;
+    ofi.oraIsNull = colIsNull;
+
+    return ofi;
+}
+
 struct QOCIBatchColumn
 {
@@ -1260 +1258 @@
                 col.bindAs = SQLT_STR;
                 for (uint j = 0; j < col.recordCount; ++j) {
-                    uint len = boundValues.at(i).toList().at(j).toString().length() + 1;
+                    uint len;
+                    if(d->isOutValue(i))
+                        len = boundValues.at(i).toList().at(j).toString().capacity() + 1;
+                    else
+                        len = boundValues.at(i).toList().at(j).toString().length() + 1;
                     if (len > col.maxLen)
                         col.maxLen = len;
@@ -1271 +1273 @@
                 col.bindAs = SQLT_LBI;
                 for (uint j = 0; j < col.recordCount; ++j) {
-                    col.lengths[j] = boundValues.at(i).toList().at(j).toByteArray().size();
+                    if(d->isOutValue(i))
+                        col.lengths[j] = boundValues.at(i).toList().at(j).toByteArray().capacity();
+                    else
+                        col.lengths[j] = boundValues.at(i).toList().at(j).toByteArray().size();
                     if (col.lengths[j] > col.maxLen)
                         col.maxLen = col.lengths[j];
@@ -1581 +1586 @@
         case QVariant::Int:
         case QVariant::LongLong:
-            if (d->precisionPolicy != QSql::HighPrecision) {
-                if ((d->precisionPolicy == QSql::LowPrecisionDouble)
+            if (d->q->numericalPrecisionPolicy() != QSql::HighPrecision) {
+                if ((d->q->numericalPrecisionPolicy() == QSql::LowPrecisionDouble)
                         && (fld.typ == QVariant::Double)) {
                     v[index + i] = *reinterpret_cast<double *>(fld.data);
                     break;
-                } else if ((d->precisionPolicy == QSql::LowPrecisionInt64)
+                } else if ((d->q->numericalPrecisionPolicy() == QSql::LowPrecisionInt64)
                         && (fld.typ == QVariant::LongLong)) {
                     qint64 qll = 0;
-                    OCINumberToInt(d->err, reinterpret_cast<OCINumber *>(fld.data), sizeof(qint64),
+                    int r = OCINumberToInt(d->err, reinterpret_cast<OCINumber *>(fld.data), sizeof(qint64),
                                    OCI_NUMBER_SIGNED, &qll);
-                    v[index + i] = qll;
+                    if(r == OCI_SUCCESS)
+                        v[index + i] = qll;
+                    else
+                        v[index + i] = QVariant();
                     break;
-                } else if ((d->precisionPolicy == QSql::LowPrecisionInt32)
+                } else if ((d->q->numericalPrecisionPolicy() == QSql::LowPrecisionInt32)
                         && (fld.typ == QVariant::Int)) {
                     v[index + i] = *reinterpret_cast<int *>(fld.data);
@@ -1619 +1627 @@
     : cols(0), q(result), env(driver->env), err(0), svc(const_cast<OCISvcCtx*&>(driver->svc)),
       sql(0), transaction(driver->transaction), serverVersion(driver->serverVersion),
-      prefetchRows(driver->prefetchRows), prefetchMem(driver->prefetchMem),
-      precisionPolicy(driver->precisionPolicy)
+      prefetchRows(driver->prefetchRows), prefetchMem(driver->prefetchMem)
 {
     int r = OCIHandleAlloc(env,
@@ -1790 +1797 @@
 {
     int r = 0;
-    ub2 stmtType;
+    ub2 stmtType=0;
     ub4 iters;
     ub4 mode;
@@ -1803 +1810 @@
                     OCI_ATTR_STMT_TYPE,
                     d->err);
+
+    if (r != OCI_SUCCESS && r != OCI_SUCCESS_WITH_INFO) {
+        qOraWarning("QOCIResult::exec: Unable to get statement type:", d->err);
+        setLastError(qMakeError(QCoreApplication::translate("QOCIResult",
+                     "Unable to get statement type"), QSqlError::StatementError, d->err));
+#ifdef QOCI_DEBUG
+        qDebug() << "lastQuery()" << lastQuery();
+#endif
+        return false;
+    }
 
     if (stmtType == OCI_STMT_SELECT) {
@@ -1892 +1909 @@
         QOCICols::execBatch(d, boundValues(), *reinterpret_cast<bool *>(data));
         break;
-    case QSqlResult::SetNumericalPrecision:
-        d->precisionPolicy = *reinterpret_cast<QSql::NumericalPrecisionPolicy *>(data);
-        break;
     default:
-        QSqlResult::virtual_hook(id, data);
+        QSqlCachedResult::virtual_hook(id, data);
     }
 }
@@ -2031 +2045 @@
     if (!hostname.isEmpty())
         connectionString = 
-            QString(QLatin1String("(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=%1)(Port=%2))"
-                "(CONNECT_DATA=(SID=%3)))")).arg(hostname).arg((port > -1 ? port : 1521)).arg(db);
+        QString::fromLatin1("(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=%1)(Port=%2))"
+                "(CONNECT_DATA=(SID=%3)))").arg(hostname).arg((port > -1 ? port : 1521)).arg(db);
 
     r = OCIHandleAlloc(d->env, reinterpret_cast<void **>(&d->srvhp), OCI_HTYPE_SERVER, 0, 0);
@@ -2099 +2113 @@
     setOpen(true);
     setOpenError(false);
-    d->user = user.toUpper();
+    d->user = user;
 
     return true;
@@ -2187 +2201 @@
 {
     QStringList tl;
+    QStringList sysUsers = QStringList() << QLatin1String("MDSYS")
+                                    << QLatin1String("LBACSYS")
+                                    << QLatin1String("SYS")
+                                    << QLatin1String("SYSTEM")
+                                    << QLatin1String("WKSYS")
+                                    << QLatin1String("CTXSYS")
+                                    << QLatin1String("WMSYS");
+
+    QString user = d->user;
+    if ( isIdentifierEscaped(user, QSqlDriver::TableName))
+        user = stripDelimiters(user, QSqlDriver::TableName);
+    else
+        user = user.toUpper();
+
+    if(sysUsers.contains(user))
+        sysUsers.removeAll(user);;
+
     if (!isOpen())
         return tl;
@@ -2193 +2224 @@
     t.setForwardOnly(true);
     if (type & QSql::Tables) {
-        t.exec(QLatin1String("select owner, table_name from all_tables "
-                "where owner != 'MDSYS' "
-                "and owner != 'LBACSYS' "
-                "and owner != 'SYS' "
-                "and owner != 'SYSTEM' "
-                "and owner != 'WKSYS'"
-                "and owner != 'CTXSYS'"
-                "and owner != 'WMSYS'"));
+        QString query = QLatin1String("select owner, table_name from all_tables where ");
+        QStringList whereList;
+        foreach(const QString &sysUserName, sysUsers)
+            whereList << QLatin1String("owner != '") + sysUserName + QLatin1String("' ");
+        t.exec(query + whereList.join(QLatin1String(" and ")));
+
+        while (t.next()) {
+            if (t.value(0).toString().toUpper() != user.toUpper())
+                tl.append(t.value(0).toString() + QLatin1Char('.') + t.value(1).toString());
+            else
+                tl.append(t.value(1).toString());
+        }
+
+        // list all table synonyms as well
+        query = QLatin1String("select owner, synonym_name from all_synonyms where ");
+        t.exec(query + whereList.join(QLatin1String(" and ")));
+        while (t.next()) {
+            if (t.value(0).toString() != d->user)
+                tl.append(t.value(0).toString() + QLatin1Char('.') + t.value(1).toString());
+            else
+                tl.append(t.value(1).toString());
+        }
+    }
+    if (type & QSql::Views) {
+        QString query = QLatin1String("select owner, view_name from all_views where ");
+        QStringList whereList;
+        foreach(const QString &sysUserName, sysUsers)
+            whereList << QLatin1String("owner != '") + sysUserName + QLatin1String("' ");
+        t.exec(query + whereList.join(QLatin1String(" and ")));
+        while (t.next()) {
+            if (t.value(0).toString().toUpper() != d->user.toUpper())
+                tl.append(t.value(0).toString() + QLatin1Char('.') + t.value(1).toString());
+            else
+                tl.append(t.value(1).toString());
+        }
+    }
+    if (type & QSql::SystemTables) {
+        t.exec(QLatin1String("select table_name from dictionary"));
+        while (t.next()) {
+            tl.append(t.value(0).toString());
+        }
+        QString query = QLatin1String("select owner, table_name from all_tables where ");
+        QStringList whereList;
+        foreach(const QString &sysUserName, sysUsers)
+            whereList << QLatin1String("owner = '") + sysUserName + QLatin1String("' ");
+        t.exec(query + whereList.join(QLatin1String(" or ")));
+
+        while (t.next()) {
+            if (t.value(0).toString().toUpper() != user.toUpper())
+                tl.append(t.value(0).toString() + QLatin1Char('.') + t.value(1).toString());
+            else
+                tl.append(t.value(1).toString());
+        }
+
+        // list all table synonyms as well
+        query = QLatin1String("select owner, synonym_name from all_synonyms where ");
+        t.exec(query + whereList.join(QLatin1String(" or ")));
         while (t.next()) {
             if (t.value(0).toString() != d->user)
@@ -2208 +2288 @@
         }
     }
-    if (type & QSql::Views) {
-        t.exec(QLatin1String("select owner, view_name from all_views "
-                "where owner != 'MDSYS' "
-                "and owner != 'LBACSYS' "
-                "and owner != 'SYS' "
-                "and owner != 'SYSTEM' "
-                "and owner != 'WKSYS'"
-                "and owner != 'CTXSYS'"
-                "and owner != 'WMSYS'"));
-        while (t.next()) {
-            if (t.value(0).toString() != d->user)
-                tl.append(t.value(0).toString() + QLatin1String(".") + t.value(1).toString());
-            else
-                tl.append(t.value(1).toString());
-        }
-    }
-    if (type & QSql::SystemTables) {
-        t.exec(QLatin1String("select table_name from dictionary"));
-        while (t.next()) {
-            tl.append(t.value(0).toString());
-        }
-    }
     return tl;
 }
@@ -2238 +2296 @@
     int i = tname.indexOf(QLatin1Char('.')); // prefixed with owner?
     if (i != -1) {
-        *tbl = tname.right(tname.length() - i - 1).toUpper();
-        *owner = tname.left(i).toUpper();
+        *tbl = tname.right(tname.length() - i - 1);
+        *owner = tname.left(i);
     } else {
-        *tbl = tname.toUpper();
+        *tbl = tname;
     }
 }
@@ -2256 +2314 @@
     QString stmt(QLatin1String("select column_name, data_type, data_length, "
                   "data_precision, data_scale, nullable, data_default%1"
-                  "from all_tab_columns "
-                  "where upper(table_name)=%2"));
+                  "from all_tab_columns a "
+                  "where a.table_name=%2"));
     if (d->serverVersion >= 9)
         stmt = stmt.arg(QLatin1String(", char_length "));
@@ -2265 +2323 @@
     QString table, owner, tmpStmt;
     qSplitTableAndOwner(tablename, &table, &owner);
+
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+    else
+        table = table.toUpper();
+
     tmpStmt = stmt.arg(QLatin1Char('\'') + table + QLatin1Char('\''));
     if (owner.isEmpty()) {
         owner = d->user;
     }
-    tmpStmt += QLatin1String(" and upper(owner)='") + owner + QLatin1String("'");
+
+    if (isIdentifierEscaped(owner, QSqlDriver::TableName))
+        owner = stripDelimiters(owner, QSqlDriver::TableName);
+    else
+        owner = owner.toUpper();
+
+    tmpStmt += QLatin1String(" and a.owner='") + owner + QLatin1Char('\'');
     t.setForwardOnly(true);
     t.exec(tmpStmt);
     if (!t.next()) { // try and see if the tablename is a synonym
-        stmt= stmt.arg(QLatin1String("(select tname from sys.synonyms where sname='")
-                        + table + QLatin1String("' and creator=owner)"));
+        stmt = stmt + QLatin1String(" join all_synonyms b "
+                              "on a.owner=b.table_owner and a.table_name=b.table_name "
+                              "where b.owner='") + owner +
+                      QLatin1String("' and b.synonym_name='") + table +
+                      QLatin1Char('\'');
         t.setForwardOnly(true);
         t.exec(stmt);
@@ -2286 +2359 @@
     if (buildRecordInfo) {
         do {
-            QVariant::Type ty = qDecodeOCIType(t.value(1).toString(),t.numericalPrecisionPolicy());
+            QVariant::Type ty = qDecodeOCIType(t.value(1).toString(), t.numericalPrecisionPolicy());
             QSqlField f(t.value(0).toString(), ty);
             f.setRequired(t.value(5).toString() == QLatin1String("N"));
@@ -2318 +2391 @@
     QString table, owner, tmpStmt;
     qSplitTableAndOwner(tablename, &table, &owner);
-    tmpStmt = stmt + QLatin1String(" and upper(a.table_name)='") + table + QLatin1String("'");
+
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+    else
+        table = table.toUpper();
+
+    tmpStmt = stmt + QLatin1String(" and a.table_name='") + table + QLatin1Char('\'');
     if (owner.isEmpty()) {
         owner = d->user;
     }
-    tmpStmt += QLatin1String(" and upper(a.owner)='") + owner + QLatin1String("'");
+
+    if (isIdentifierEscaped(owner, QSqlDriver::TableName))
+        owner = stripDelimiters(owner, QSqlDriver::TableName);
+    else
+        owner = owner.toUpper();
+
+    tmpStmt += QLatin1String(" and a.owner='") + owner + QLatin1Char('\'');
     t.setForwardOnly(true);
     t.exec(tmpStmt);
@@ -2346 +2431 @@
                      t.value(2).toString() + QLatin1String("' and column_name='") +
                      t.value(0).toString() + QLatin1String("' and owner='") +
-                     owner +QLatin1String("'"));
+                     owner + QLatin1Char('\''));
             if (!tt.next()) {
                 return QSqlIndex();
@@ -2416 +2501 @@
 }
 
-QString QOCIDriver::escapeIdentifier(const QString &identifier, IdentifierType /* type */) const
+QString QOCIDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const
 {
     QString res = identifier;
-    res.replace(QLatin1Char('"'), QLatin1String("\"\""));
-    if (identifier.indexOf(QLatin1Char(' ')) != -1)
+    if(!identifier.isEmpty() && !isIdentifierEscaped(identifier, type)) {
+        res.replace(QLatin1Char('"'), QLatin1String("\"\""));
         res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
-//     res.replace(QLatin1Char('.'), QLatin1String("\".\""));
+        res.replace(QLatin1Char('.'), QLatin1String("\".\""));
+    }
     return res;
 }

trunk/src/sql/drivers/oci/qsql_oci.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/sql/drivers/odbc/qsql_odbc.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -56 +56 @@
 #include <qvector.h>
 #include <QDebug>
+#include <QSqlQuery>
 
 QT_BEGIN_NAMESPACE
@@ -70 +71 @@
 
 // newer platform SDKs use SQLLEN instead of SQLINTEGER
-#if defined(SQLLEN) || defined(Q_OS_WIN64)
+#if defined(WIN32) && (_MSC_VER < 1300)
+# define QSQLLEN SQLINTEGER
+# define QSQLULEN SQLUINTEGER
+#else
 # define QSQLLEN SQLLEN
-#else
-# define QSQLLEN SQLINTEGER
-#endif
-
-#if defined(SQLULEN) || defined(Q_OS_WIN64)
 # define QSQLULEN SQLULEN
-#else
-# define QSQLULEN SQLUINTEGER
-#endif
+#endif
+
 
 static const int COLNAMESIZE = 256;
@@ -89 +87 @@
 {
 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('"'))
     {
-        sql_char_type = sql_varchar_type = sql_longvarchar_type = QVariant::ByteArray;
         unicode = false;
     }
@@ -102 +101 @@
     uint unicode :1;
     uint useSchema :1;
-    QVariant::Type sql_char_type;
-    QVariant::Type sql_varchar_type;
-    QVariant::Type sql_longvarchar_type;
     int disconnectCount;
     bool isMySqlServer;
@@ -120 +116 @@
     void splitTableQualifier(const QString &qualifier, QString &catalog,
                              QString &schema, QString &table);
+    DefaultCase defaultCase() const;
+    QString adjustCase(const QString&) const;
+    QChar quoteChar();
+private:
+    bool isQuoteInitialized;
+    QChar quote;
 };
 
@@ -125 +127 @@
 {
 public:
-    QODBCPrivate()
-    : hEnv(0), hDbc(0), hStmt(0), useSchema(false), hasSQLFetchScroll(true), precisionPolicy(QSql::HighPrecision)
+    QODBCPrivate(QODBCDriverPrivate *dpp)
+    : hStmt(0), useSchema(false), hasSQLFetchScroll(true), driverPrivate(dpp), userForwardOnly(false)
     {
-        sql_char_type = sql_varchar_type = sql_longvarchar_type = QVariant::ByteArray;
         unicode = false;
     }
@@ -135 +136 @@
     { fieldCache.fill(QVariant()); fieldCacheIdx = 0; }
 
-    SQLHANDLE hEnv;
-    SQLHANDLE hDbc;
+    SQLHANDLE dpEnv() const { return driverPrivate ? driverPrivate->hEnv : 0;}
+    SQLHANDLE dpDbc() const { return driverPrivate ? driverPrivate->hDbc : 0;}
     SQLHANDLE hStmt;
 
     uint unicode :1;
     uint useSchema :1;
-    QVariant::Type sql_char_type;
-    QVariant::Type sql_varchar_type;
-    QVariant::Type sql_longvarchar_type;
 
     QSqlRecord rInf;
@@ -150 +148 @@
     int disconnectCount;
     bool hasSQLFetchScroll;
-    QSql::NumericalPrecisionPolicy precisionPolicy;
+    QODBCDriverPrivate *driverPrivate;
+    bool userForwardOnly;
 
     bool isStmtHandleValid(const QSqlDriver *driver);
@@ -174 +173 @@
     SQLRETURN r = SQL_NO_DATA;
     SQLTCHAR state_[SQL_SQLSTATE_SIZE+1];
-    SQLTCHAR description_[SQL_MAX_MESSAGE_LENGTH];
+    QVarLengthArray<SQLTCHAR> description_(SQL_MAX_MESSAGE_LENGTH);
     QString result;
     int i = 1;
 
     description_[0] = 0;
+    r = SQLGetDiagRec(handleType,
+                      handle,
+                      i,
+                      state_,
+                      &nativeCode_,
+                      0,
+                      NULL,
+                      &msgLen);
+    if(r == SQL_NO_DATA)
+        return QString();
+    description_.resize(msgLen+1);
     do {
         r = SQLGetDiagRec(handleType,
                             handle,
                             i,
-                            (SQLTCHAR*)state_,
+                            state_,
                             &nativeCode_,
-                            (SQLTCHAR*)description_,
-                            SQL_MAX_MESSAGE_LENGTH, /* in bytes, not in characters */
+                            description_.data(),
+                            description_.size(),
                             &msgLen);
         if (r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) {
@@ -193 +203 @@
             QString tmpstore;
 #ifdef UNICODE
-            tmpstore = QString((const QChar*)description_, msgLen);
+            tmpstore = QString((const QChar*)description_.data(), msgLen);
 #else
-            tmpstore = QString::fromLocal8Bit((const char*)description_, msgLen);
+            tmpstore = QString::fromLocal8Bit((const char*)description_.data(), msgLen);
 #endif
             if(result != tmpstore) {
@@ -212 +222 @@
 static QString qODBCWarn(const QODBCPrivate* odbc, int *nativeCode = 0)
 {
-    return (qWarnODBCHandle(SQL_HANDLE_ENV, odbc->hEnv) + QLatin1String(" ")
-             + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->hDbc) + QLatin1String(" ")
+    return (qWarnODBCHandle(SQL_HANDLE_ENV, odbc->dpEnv()) + QLatin1Char(' ')
+             + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->dpDbc()) + QLatin1Char(' ')
              + qWarnODBCHandle(SQL_HANDLE_STMT, odbc->hStmt, nativeCode));
 }
@@ -219 +229 @@
 static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = 0)
 {
-    return (qWarnODBCHandle(SQL_HANDLE_ENV, odbc->hEnv) + QLatin1String(" ")
+    return (qWarnODBCHandle(SQL_HANDLE_ENV, odbc->hEnv) + QLatin1Char(' ')
              + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->hDbc, nativeCode));
 }
@@ -251 +261 @@
 static QVariant::Type qDecodeODBCType(SQLSMALLINT sqltype, const T* p, bool isSigned = true)
 {
+    Q_UNUSED(p);
     QVariant::Type type = QVariant::Invalid;
     switch (sqltype) {
@@ -263 +274 @@
     case SQL_INTEGER:
     case SQL_BIT:
+        type = isSigned ? QVariant::Int : QVariant::UInt;
+        break;
     case SQL_TINYINT:
-        type = isSigned ? QVariant::Int : QVariant::UInt;
+        type = QVariant::UInt;
         break;
     case SQL_BIGINT:
@@ -294 +307 @@
 #endif
     case SQL_CHAR:
-        type = p->sql_char_type;
-        break;
     case SQL_VARCHAR:
     case SQL_GUID:
-        type = p->sql_varchar_type;
-        break;
     case SQL_LONGVARCHAR:
-        type = p->sql_longvarchar_type;
+        type = QVariant::String;
         break;
     default:
@@ -327 +336 @@
         }
     }
-    char* buf = new char[colSize];
+    QVarLengthArray<char> buf(colSize);
     while (true) {
         r = SQLGetData(hStmt,
                         column+1,
                         unicode ? SQL_C_WCHAR : SQL_C_CHAR,
-                        (SQLPOINTER)buf,
+                        (SQLPOINTER)buf.data(),
                         colSize,
                         &lengthIndicator);
@@ -347 +356 @@
             int rSize = (r == SQL_SUCCESS_WITH_INFO) ? (unicode ? colSize-2 : colSize-1) : lengthIndicator;
             if (unicode) {
-                fieldVal += QString((QChar*) buf, rSize / 2);
+                fieldVal += QString((const QChar*) buf.constData(), rSize / 2);
             } else {
-                fieldVal += QString::fromAscii(buf, rSize);
+                fieldVal += QString::fromAscii(buf.constData(), rSize);
             }
-            if (fieldVal.size() + lengthIndicator >= colSize) {
+            memset(buf.data(), 0, colSize);
+            if (lengthIndicator < colSize) {
                 // workaround for Drivermanagers that don't return SQL_NO_DATA
                 break;
@@ -363 +373 @@
         }
     }
-    delete[] buf;
     return fieldVal;
 }
@@ -443 +452 @@
 }
 
+static QVariant qGetDoubleData(SQLHANDLE hStmt, int column)
+{
+    SQLDOUBLE dblbuf;
+    QSQLLEN lengthIndicator = 0;
+    SQLRETURN r = SQLGetData(hStmt,
+                              column+1,
+                              SQL_C_DOUBLE,
+                              (SQLPOINTER) &dblbuf,
+                              0,
+                              &lengthIndicator);
+    if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
+        return QVariant(QVariant::Invalid);
+    }
+    if(lengthIndicator == SQL_NULL_DATA)
+        return QVariant(QVariant::Double);
+
+    return (double) dblbuf;
+}
+
+
 static QVariant qGetBigIntData(SQLHANDLE hStmt, int column, bool isSigned = true)
 {
@@ -552 +581 @@
     if (connOpts.contains(QLatin1String("SQL_ATTR_ODBC_VERSION=SQL_OV_ODBC3"), Qt::CaseInsensitive))
         return SQL_OV_ODBC3;
-#endif 
+#endif
     return SQL_OV_ODBC2;
 }
+
+QChar QODBCDriverPrivate::quoteChar()
+{
+    if (!isQuoteInitialized) {
+        char driverResponse[4];
+        SQLSMALLINT length;
+        int r = SQLGetInfo(hDbc,
+                SQL_IDENTIFIER_QUOTE_CHAR,
+                &driverResponse,
+                sizeof(driverResponse),
+                &length);
+        if (r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) {
+            quote = QLatin1Char(driverResponse[0]);
+        } else {
+            quote = QLatin1Char('"');
+        }
+        isQuoteInitialized = true;
+    }
+    return quote;
+}
+
 
 bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
@@ -706 +756 @@
 }
 
+QODBCDriverPrivate::DefaultCase QODBCDriverPrivate::defaultCase() const
+{
+    DefaultCase ret;
+    SQLUSMALLINT casing;
+    int r = SQLGetInfo(hDbc,
+            SQL_IDENTIFIER_CASE,
+            &casing,
+            sizeof(casing),
+            NULL);
+    if ( r != SQL_SUCCESS)
+        ret = Mixed;//arbitrary case if driver cannot be queried
+    else {
+        switch (casing) {
+            case (SQL_IC_UPPER):
+                ret = Upper;
+                break;
+            case (SQL_IC_LOWER):
+                ret = Lower;
+                break;
+            case (SQL_IC_SENSITIVE):
+                ret = Sensitive;
+                break;
+            case (SQL_IC_MIXED):
+            default:
+                ret = Mixed;
+                break;
+        }
+    }
+    return ret;
+}
+
+/*
+   Adjust the casing of an identifier to match what the
+   database engine would have done to it.
+*/
+QString QODBCDriverPrivate::adjustCase(const QString &identifier) const
+{
+    QString ret = identifier;
+    switch(defaultCase()) {
+        case (Lower):
+            ret = identifier.toLower();
+            break;
+        case (Upper):
+            ret = identifier.toUpper();
+            break;
+        case(Mixed):
+        case(Sensitive):
+        default:
+            ret = identifier;
+    }
+    return ret;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
@@ -711 +814 @@
 : QSqlResult(db)
 {
-    d = new QODBCPrivate();
-    d->hEnv = p->hEnv;
-    d->hDbc = p->hDbc;
+    d = new QODBCPrivate(p);
     d->unicode = p->unicode;
     d->useSchema = p->useSchema;
-    d->sql_char_type = p->sql_char_type;
-    d->sql_varchar_type = p->sql_varchar_type;
-    d->sql_longvarchar_type = p->sql_longvarchar_type;
     d->disconnectCount = p->disconnectCount;
     d->hasSQLFetchScroll = p->hasSQLFetchScroll;
@@ -754 +852 @@
     }
     r  = SQLAllocHandle(SQL_HANDLE_STMT,
-                         d->hDbc,
+                         d->dpDbc(),
                          &d->hStmt);
     if (r != SQL_SUCCESS) {
@@ -763 +861 @@
     d->updateStmtHandleState(driver());
 
-    if (isForwardOnly()) {
+    if (d->userForwardOnly) {
         r = SQLSetStmtAttr(d->hStmt,
                             SQL_ATTR_CURSOR_TYPE,
@@ -796 +894 @@
         return false;
     }
+
+    SQLINTEGER isScrollable, bufferLength;
+    r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, &bufferLength);
+    if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO)
+        QSqlResult::setForwardOnly(isScrollable==SQL_NONSCROLLABLE);
 
     SQLSMALLINT count;
@@ -883 +986 @@
                        SQL_FETCH_FIRST,
                        0);
-    if (r != SQL_SUCCESS) { 
+    if (r != SQL_SUCCESS) {
         if (r != SQL_NO_DATA)
             setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
@@ -902 +1005 @@
                        SQL_FETCH_PRIOR,
                        0);
-    if (r != SQL_SUCCESS) { 
+    if (r != SQL_SUCCESS) {
         if (r != SQL_NO_DATA)
             setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
@@ -933 +1036 @@
                        SQL_FETCH_LAST,
                        0);
-    if (r != SQL_SUCCESS) { 
+    if (r != SQL_SUCCESS) {
         if (r != SQL_NO_DATA)
             setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
@@ -1024 +1127 @@
             break;
         case QVariant::String:
-            d->fieldCache[i] = qGetStringData(d->hStmt, i, info.length(), true);
+            d->fieldCache[i] = qGetStringData(d->hStmt, i, info.length(), d->unicode);
             break;
         case QVariant::Double:
-            {
-                QString value=qGetStringData(d->hStmt, i, info.length(), false);
-                bool ok=false;
-                switch(d->precisionPolicy) {
-                    case QSql::LowPrecisionInt32:
-                        d->fieldCache[i] = value.toInt(&ok);
-                        break;
-                    case QSql::LowPrecisionInt64:
-                        d->fieldCache[i] = value.toLongLong(&ok);
-                        break;
-                    case QSql::LowPrecisionDouble:
-                        d->fieldCache[i] = value.toDouble(&ok);
-                        break;
-                    case QSql::HighPrecision:
-                    default:
-                        d->fieldCache[i] = value;
-                        ok=true;
-                        break;
-                }
-                if(ok==false)
-                    d->fieldCache[i] = QVariant();
-                break;
+            switch(numericalPrecisionPolicy()) {
+                case QSql::LowPrecisionInt32:
+                    d->fieldCache[i] = qGetIntData(d->hStmt, i);
+                    break;
+                case QSql::LowPrecisionInt64:
+                    d->fieldCache[i] = qGetBigIntData(d->hStmt, i);
+                    break;
+                case QSql::LowPrecisionDouble:
+                    d->fieldCache[i] = qGetDoubleData(d->hStmt, i);
+                    break;
+                case QSql::HighPrecision:
+                    d->fieldCache[i] = qGetStringData(d->hStmt, i, info.length(), false);
+                    break;
             }
+            break;
         default:
             d->fieldCache[i] = QVariant(qGetStringData(d->hStmt, i, info.length(), false));
@@ -1103 +1198 @@
     }
     r  = SQLAllocHandle(SQL_HANDLE_STMT,
-                         d->hDbc,
+                         d->dpDbc(),
                          &d->hStmt);
     if (r != SQL_SUCCESS) {
@@ -1112 +1207 @@
     d->updateStmtHandleState(driver());
 
-    if (isForwardOnly()) {
+    if (d->userForwardOnly) {
         r = SQLSetStmtAttr(d->hStmt,
                             SQL_ATTR_CURSOR_TYPE,
@@ -1372 +1467 @@
 #endif
                 {
-                    QByteArray str = val.toString().toUtf8();
+                    QByteArray str = val.toString().toAscii();
                     if (*ind != SQL_NULL_DATA)
                         *ind = str.length();
                     int strSize = str.length();
-                    
+
                     r = SQLBindParameter(d->hStmt,
                                           i + 1,
@@ -1423 +1518 @@
     }
 
+    SQLINTEGER isScrollable, bufferLength;
+    r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, &bufferLength);
+    if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO)
+        QSqlResult::setForwardOnly(isScrollable==SQL_NONSCROLLABLE);
+
     SQLSMALLINT count;
     SQLNumResultCols(d->hStmt, &count);
@@ -1457 +1557 @@
                                QTime(dt.hour, dt.minute, dt.second, dt.fraction / 1000000)));
                 break; }
+            case QVariant::Bool:
             case QVariant::Int:
             case QVariant::UInt:
@@ -1546 +1647 @@
         *static_cast<bool*>(data) = nextResult();
         break;
-    case QSqlResult::SetNumericalPrecision:
-        Q_ASSERT(data);
-        d->precisionPolicy = *reinterpret_cast<QSql::NumericalPrecisionPolicy *>(data);
-        break;
     default:
         QSqlResult::virtual_hook(id, data);
     }
+}
+
+void QODBCResult::setForwardOnly(bool forward)
+{
+    d->userForwardOnly = forward;
+    QSqlResult::setForwardOnly(forward);
 }
 
@@ -1670 +1773 @@
     if (db.contains(QLatin1String(".dsn"), Qt::CaseInsensitive))
         connQStr = QLatin1String("FILEDSN=") + db;
-    else if (db.contains(QLatin1String("DRIVER="), Qt::CaseInsensitive) 
+    else if (db.contains(QLatin1String("DRIVER="), Qt::CaseInsensitive)
             || db.contains(QLatin1String("SERVER="), Qt::CaseInsensitive))
         connQStr = db;
@@ -1680 +1783 @@
     if (!password.isEmpty())
         connQStr += QLatin1String(";PWD=") + password;
-    
+
     SQLSMALLINT cb;
     SQLTCHAR connOut[1024];
@@ -1703 +1806 @@
     if (!d->checkDriver()) {
         setLastError(qMakeError(tr("Unable to connect - Driver doesn't support all "
-                     "needed functionality"), QSqlError::ConnectionError, d));
+                     "functionality required"), QSqlError::ConnectionError, d));
         setOpenError(true);
         return false;
@@ -1715 +1818 @@
     setOpen(true);
     setOpenError(false);
+    if(d->isMSSqlServer) {
+        QSqlQuery i(createResult());
+        i.exec(QLatin1String("SET QUOTED_IDENTIFIER ON"));
+    }
     return true;
 }
@@ -1763 +1870 @@
     return;
 #endif
-#if defined(Q_WS_WIN)
-    QT_WA(
-    {},
-    {
-        unicode = false;
-        return;
-    })
-#endif
+
     SQLRETURN   r;
     SQLUINTEGER fFunc;
@@ -1781 +1881 @@
                     NULL);
     if ((r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) && (fFunc & SQL_CVT_WCHAR)) {
-        sql_char_type = QVariant::String;
         unicode = true;
     }
@@ -1791 +1890 @@
                     NULL);
     if ((r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) && (fFunc & SQL_CVT_WVARCHAR)) {
-        sql_varchar_type = QVariant::String;
         unicode = true;
     }
@@ -1801 +1899 @@
                     NULL);
     if ((r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) && (fFunc & SQL_CVT_WLONGVARCHAR)) {
-        sql_longvarchar_type = QVariant::String;
         unicode = true;
     }
@@ -2085 +2182 @@
     QString catalog, schema, table;
     d->splitTableQualifier(tablename, catalog, schema, table);
+
+    if (isIdentifierEscaped(catalog, QSqlDriver::TableName))
+        catalog = stripDelimiters(catalog, QSqlDriver::TableName);
+    else
+        catalog = d->adjustCase(catalog);
+
+    if (isIdentifierEscaped(schema, QSqlDriver::TableName))
+        schema = stripDelimiters(schema, QSqlDriver::TableName);
+    else
+        schema = d->adjustCase(schema);
+
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+    else
+        table = d->adjustCase(table);
+
     r = SQLSetStmtAttr(hStmt,
                         SQL_ATTR_CURSOR_TYPE,
@@ -2187 +2300 @@
     QString catalog, schema, table;
     d->splitTableQualifier(tablename, catalog, schema, table);
+
+    if (isIdentifierEscaped(catalog, QSqlDriver::TableName))
+        catalog = stripDelimiters(catalog, QSqlDriver::TableName);
+    else
+        catalog = d->adjustCase(catalog);
+
+    if (isIdentifierEscaped(schema, QSqlDriver::TableName))
+        schema = stripDelimiters(schema, QSqlDriver::TableName);
+    else
+        schema = d->adjustCase(schema);
+
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+    else
+        table = d->adjustCase(table);
+
     SQLRETURN r = SQLAllocHandle(SQL_HANDLE_STMT,
                                   d->hDbc,
@@ -2294 +2423 @@
 QString QODBCDriver::escapeIdentifier(const QString &identifier, IdentifierType) const
 {
+    QChar quote = d->quoteChar();
     QString res = identifier;
-    if (d->isMySqlServer) {
-        if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('`')) && identifier.right(1) != QString(QLatin1Char('`')) ) {
-            res.prepend(QLatin1Char('`')).append(QLatin1Char('`'));
-            res.replace(QLatin1Char('.'), QLatin1String("`.`"));
-        }
-    } else {
-        if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(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;
 }
 
+bool QODBCDriver::isIdentifierEscapedImplementation(const QString &identifier, IdentifierType) const
+{
+    QChar quote = d->quoteChar();
+    return identifier.size() > 2
+        && identifier.startsWith(quote) //left delimited
+        && identifier.endsWith(quote); //right delimited
+}
+
 QT_END_NAMESPACE

trunk/src/sql/drivers/odbc/qsql_odbc.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -101 +101 @@
 
     QVariant handle() const;
+    virtual void setForwardOnly(bool forward);
 
 protected:
@@ -146 +147 @@
     QString escapeIdentifier(const QString &identifier, IdentifierType type) const;
 
+protected Q_SLOTS:
+    bool isIdentifierEscapedImplementation(const QString &identifier, IdentifierType type) const;
+
 protected:
     bool beginTransaction();
     bool commitTransaction();
     bool rollbackTransaction();
+
 private:
     void init();

trunk/src/sql/drivers/psql/qsql_psql.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -55 +55 @@
 #include <qmutex.h>
 
+
 #include <libpq-fe.h>
 #include <pg_config.h>
@@ -60 +61 @@
 #include <stdlib.h>
 #include <math.h>
+// below code taken from an example at http://www.gnu.org/software/hello/manual/autoconf/Function-Portability.html
+#ifndef isnan
+    # define isnan(x) \
+        (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
+        : sizeof (x) == sizeof (double) ? isnan_d (x) \
+        : isnan_f (x))
+    static inline int isnan_f  (float       x) { return x != x; }
+    static inline int isnan_d  (double      x) { return x != x; }
+    static inline int isnan_ld (long double x) { return x != x; }
+#endif
+
+#ifndef isinf
+    # define isinf(x) \
+        (sizeof (x) == sizeof (long double) ? isinf_ld (x) \
+        : sizeof (x) == sizeof (double) ? isinf_d (x) \
+        : isinf_f (x))
+    static inline int isinf_f  (float       x) { return isnan (x - x); }
+    static inline int isinf_d  (double      x) { return isnan (x - x); }
+    static inline int isinf_ld (long double x) { return isnan (x - x); }
+#endif
+
 
 // workaround for postgres defining their OIDs in a private header file
@@ -137 +159 @@
 {
 public:
-    QPSQLResultPrivate(QPSQLResult *qq): q(qq), driver(0), result(0), currentSize(-1), precisionPolicy(QSql::HighPrecision) {}
+    QPSQLResultPrivate(QPSQLResult *qq): q(qq), driver(0), result(0), currentSize(-1), preparedQueriesEnabled(false) {}
 
     QPSQLResult *q;
@@ -143 +165 @@
     PGresult *result;
     int currentSize;
-    QSql::NumericalPrecisionPolicy precisionPolicy;
     bool preparedQueriesEnabled;
     QString preparedStmtId;
@@ -321 +342 @@
     case QVariant::Double:
         if (ptype == QNUMERICOID) {
-            if (d->precisionPolicy != QSql::HighPrecision) {
+            if (numericalPrecisionPolicy() != QSql::HighPrecision) {
                 QVariant retval;
                 bool convert;
-                if (d->precisionPolicy == QSql::LowPrecisionInt64)
-                    retval = QString::fromAscii(val).toLongLong(&convert);
-                else if (d->precisionPolicy == QSql::LowPrecisionInt32)
-                    retval = QString::fromAscii(val).toInt(&convert);
-                else if (d->precisionPolicy == QSql::LowPrecisionDouble)
-                    retval = QString::fromAscii(val).toDouble(&convert);
+                double dbl=QString::fromAscii(val).toDouble(&convert);
+                if (numericalPrecisionPolicy() == QSql::LowPrecisionInt64)
+                    retval = (qlonglong)dbl;
+                else if (numericalPrecisionPolicy() == QSql::LowPrecisionInt32)
+                    retval = (int)dbl;
+                else if (numericalPrecisionPolicy() == QSql::LowPrecisionDouble)
+                    retval = dbl;
                 if (!convert)
                     return QVariant();
@@ -336 +358 @@
             return QString::fromAscii(val);
         }
-        return strtod(val, 0);
+        return QString::fromAscii(val).toDouble();
     case QVariant::Date:
         if (val[0] == '\0') {
@@ -468 +490 @@
 
     switch (id) {
-    case QSqlResult::SetNumericalPrecision:
-        d->precisionPolicy = *reinterpret_cast<QSql::NumericalPrecisionPolicy *>(data);
-        break;
     default:
         QSqlResult::virtual_hook(id, data);
@@ -535 +554 @@
     if (!d->preparedQueriesEnabled)
         return QSqlResult::prepare(query);
-    
+
     cleanup();
 
@@ -542 +561 @@
 
     const QString stmtId = qMakePreparedStmtId();
-    const QString stmt = QString(QLatin1String("PREPARE %1 AS ")).arg(stmtId).append(qReplacePlaceholderMarkers(query));
+    const QString stmt = QString::fromLatin1("PREPARE %1 AS ").arg(stmtId).append(qReplacePlaceholderMarkers(query));
 
     PGresult *result = PQexec(d->driver->connection,
@@ -571 +590 @@
     const QString params = qCreateParamString(boundValues(), d->q->driver());
     if (params.isEmpty())
-        stmt = QString(QLatin1String("EXECUTE %1")).arg(d->preparedStmtId);
+        stmt = QString::fromLatin1("EXECUTE %1").arg(d->preparedStmtId);
     else
-        stmt = QString(QLatin1String("EXECUTE %1 (%2)")).arg(d->preparedStmtId).arg(params);
+        stmt = QString::fromLatin1("EXECUTE %1 (%2)").arg(d->preparedStmtId).arg(params);
 
     d->result = PQexec(d->driver->connection,
@@ -605 +624 @@
     QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6;
     PGresult* result = PQexec(connection, "select version()");
-    int status =  PQresultStatus(result);
+    int status = PQresultStatus(result);
     if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) {
         QString val = QString::fromAscii(PQgetvalue(result, 0, 0));
-        PQclear(result);
         QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)"));
         rx.setMinimal(true); // enforce non-greedy RegExp
@@ -649 +667 @@
         }
     }
+    PQclear(result);
 
     if (serverVersion < QPSQLDriver::Version71)
@@ -825 +844 @@
     }
     PGresult* res = PQexec(d->connection, "COMMIT");
-    if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) {
+
+    bool transaction_failed = false;
+
+    // XXX
+    // This hack is used to tell if the transaction has succeeded for the protocol versions of
+    // PostgreSQL below. For 7.x and other protocol versions we are left in the dark.
+    // This hack can dissapear once there is an API to query this sort of information.
+    if (d->pro == QPSQLDriver::Version8 ||
+        d->pro == QPSQLDriver::Version81 ||
+        d->pro == QPSQLDriver::Version82) {
+        transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0;
+    }
+
+    if (!res || PQresultStatus(res) != PGRES_COMMAND_OK || transaction_failed) {
         PQclear(res);
         setLastError(qMakeError(tr("Could not commit transaction"),
@@ -895 +927 @@
     qSplitTableName(tbl, schema);
 
+    if (isIdentifierEscaped(tbl, QSqlDriver::TableName))
+        tbl = stripDelimiters(tbl, QSqlDriver::TableName);
+    else
+        tbl = tbl.toLower();
+
+    if (isIdentifierEscaped(schema, QSqlDriver::TableName))
+        schema = stripDelimiters(schema, QSqlDriver::TableName);
+    else
+        schema = schema.toLower();
+
     switch(d->pro) {
     case QPSQLDriver::Version6:
         stmt = QLatin1String("select pg_att1.attname, int(pg_att1.atttypid), pg_cl.relname "
                 "from pg_attribute pg_att1, pg_attribute pg_att2, pg_class pg_cl, pg_index pg_ind "
-                "where lower(pg_cl.relname) = '%1_pkey' "
+                "where pg_cl.relname = '%1_pkey' "
                 "and pg_cl.oid = pg_ind.indexrelid "
                 "and pg_att2.attrelid = pg_ind.indexrelid "
@@ -910 +952 @@
         stmt = QLatin1String("select pg_att1.attname, pg_att1.atttypid::int, pg_cl.relname "
                 "from pg_attribute pg_att1, pg_attribute pg_att2, pg_class pg_cl, pg_index pg_ind "
-                "where lower(pg_cl.relname) = '%1_pkey' "
+                "where pg_cl.relname = '%1_pkey' "
                 "and pg_cl.oid = pg_ind.indexrelid "
                 "and pg_att2.attrelid = pg_ind.indexrelid "
@@ -927 +969 @@
                 "WHERE %1 pg_class.oid IN "
                 "(SELECT indexrelid FROM pg_index WHERE indisprimary = true AND indrelid IN "
-                " (SELECT oid FROM pg_class WHERE lower(relname) = '%2')) "
+                " (SELECT oid FROM pg_class WHERE relname = '%2')) "
                 "AND pg_attribute.attrelid = pg_class.oid "
                 "AND pg_attribute.attisdropped = false "
@@ -935 +977 @@
         else
             stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from "
-                   "pg_namespace where pg_namespace.nspname = '%1') AND ").arg(schema.toLower()));
-        break;
-    }
-
-    i.exec(stmt.arg(tbl.toLower()));
+                   "pg_namespace where pg_namespace.nspname = '%1') AND ").arg(schema));
+        break;
+    }
+
+    i.exec(stmt.arg(tbl));
     while (i.isActive() && i.next()) {
         QSqlField f(i.value(0).toString(), qDecodePSQLType(i.value(1).toInt()));
@@ -957 +999 @@
     QString schema;
     qSplitTableName(tbl, schema);
+
+    if (isIdentifierEscaped(tbl, QSqlDriver::TableName))
+        tbl = stripDelimiters(tbl, QSqlDriver::TableName);
+    else
+        tbl = tbl.toLower();
+
+    if (isIdentifierEscaped(schema, QSqlDriver::TableName))
+        schema = stripDelimiters(schema, QSqlDriver::TableName);
+    else
+        schema = schema.toLower();
 
     QString stmt;
@@ -965 +1017 @@
                 "int(pg_attribute.attrelid), pg_attribute.attnum "
                 "from pg_class, pg_attribute "
-                "where lower(pg_class.relname) = '%1' "
+                "where pg_class.relname = '%1' "
                 "and pg_attribute.attnum > 0 "
                 "and pg_attribute.attrelid = pg_class.oid ");
@@ -974 +1026 @@
                 "pg_attribute.attrelid::int, pg_attribute.attnum "
                 "from pg_class, pg_attribute "
-                "where lower(pg_class.relname) = '%1' "
+                "where pg_class.relname = '%1' "
                 "and pg_attribute.attnum > 0 "
                 "and pg_attribute.attrelid = pg_class.oid ");
@@ -985 +1037 @@
                 "left join pg_attrdef on (pg_attrdef.adrelid = "
                 "pg_attribute.attrelid and pg_attrdef.adnum = pg_attribute.attnum) "
-                "where lower(pg_class.relname) = '%1' "
+                "where pg_class.relname = '%1' "
                 "and pg_attribute.attnum > 0 "
                 "and pg_attribute.attrelid = pg_class.oid "
@@ -1002 +1054 @@
                 "pg_attribute.attrelid and pg_attrdef.adnum = pg_attribute.attnum) "
                 "where %1 "
-                "and lower(pg_class.relname) = '%2' "
+                "and pg_class.relname = '%2' "
                 "and pg_attribute.attnum > 0 "
                 "and pg_attribute.attrelid = pg_class.oid "
@@ -1011 +1063 @@
         else
             stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from "
-                   "pg_namespace where pg_namespace.nspname = '%1')").arg(schema.toLower()));
+                   "pg_namespace where pg_namespace.nspname = '%1')").arg(schema));
         break;
     }
 
     QSqlQuery query(createResult());
-    query.exec(stmt.arg(tbl.toLower()));
+    query.exec(stmt.arg(tbl));
     if (d->pro >= QPSQLDriver::Version71) {
         while (query.next()) {
@@ -1083 +1135 @@
                 // msecs need to be right aligned otherwise psql
                 // interpretes them wrong
-                r = QLatin1String("'") + QString::number(dt.year()) + QLatin1String("-")
-                          + QString::number(dt.month()) + QLatin1String("-")
-                          + QString::number(dt.day()) + QLatin1String(" ")
-                          + tm.toString() + QLatin1String(".")
+                r = QLatin1Char('\'') + QString::number(dt.year()) + QLatin1Char('-')
+                          + QString::number(dt.month()) + QLatin1Char('-')
+                          + QString::number(dt.day()) + QLatin1Char(' ')
+                          + tm.toString() + QLatin1Char('.')
                           + QString::number(tm.msec()).rightJustified(3, QLatin1Char('0'))
-                          + QLatin1String("'");
+                          + QLatin1Char('\'');
             } else {
                 r = QLatin1String("NULL");
@@ -1099 +1151 @@
 #ifndef QT_NO_DATESTRING
             if (field.value().toTime().isValid()) {
-                r = field.value().toTime().toString(Qt::ISODate);
+                r = QLatin1Char('\'') + field.value().toTime().toString(QLatin1String("hh:mm:ss.zzz")) + QLatin1Char('\'');
             } else
 #endif
@@ -1105 +1157 @@
                 r = QLatin1String("NULL");
             }
+            break;
         case QVariant::String:
         {
@@ -1132 +1185 @@
             break;
         }
+        case QVariant::Double: {
+            double val = field.value().toDouble();
+            if (isnan(val))
+                r = QLatin1String("'NaN'");
+            else {
+                int res = isinf(val);
+                if (res == 1)
+                    r = QLatin1String("'Infinity'");
+                else if (res == -1)
+                    r = QLatin1String("'-Infinity'");
+                else
+                    r = QSqlDriver::formatValue(field, trimStrings);
+            }
+            break;
+        }
         default:
             r = QSqlDriver::formatValue(field, trimStrings);
@@ -1143 +1211 @@
 {
     QString res = identifier;
-    if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(QLatin1Char('"')) ) {
+    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
         res.replace(QLatin1Char('"'), QLatin1String("\"\""));
         res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
@@ -1173 +1241 @@
         return false;
     }
-    
+
     int socket = PQsocket(d->connection);
     if (socket) {
-        QString query = QString(QLatin1String("LISTEN %1")).arg(escapeIdentifier(name, QSqlDriver::TableName));
-        if (PQresultStatus(PQexec(d->connection, 
-                                  d->isUtf8 ? query.toUtf8().constData() 
+        QString query = QLatin1String("LISTEN ") + escapeIdentifier(name, QSqlDriver::TableName);
+        if (PQresultStatus(PQexec(d->connection,
+                                  d->isUtf8 ? query.toUtf8().constData()
                                             : query.toLocal8Bit().constData())
                           ) != PGRES_COMMAND_OK) {
@@ -1208 +1276 @@
     }
 
-    QString query = QString(QLatin1String("UNLISTEN %1")).arg(escapeIdentifier(name, QSqlDriver::TableName));
-    if (PQresultStatus(PQexec(d->connection, 
-                              d->isUtf8 ? query.toUtf8().constData() 
+    QString query = QLatin1String("UNLISTEN ") + escapeIdentifier(name, QSqlDriver::TableName);
+    if (PQresultStatus(PQexec(d->connection,
+                              d->isUtf8 ? query.toUtf8().constData()
                                         : query.toLocal8Bit().constData())
                       ) != PGRES_COMMAND_OK) {
@@ -1236 +1304 @@
 {
     PQconsumeInput(d->connection);
-    PGnotify *notify = PQnotifies(d->connection);
-    if (notify) {
+
+    PGnotify *notify = 0;
+    while((notify = PQnotifies(d->connection)) != 0) {
         QString name(QLatin1String(notify->relname));
-
         if (d->seid.contains(name))
             emit notification(name);
         else
-            qWarning("QPSQLDriver: received notification for '%s' which isn't subscribed to.", 
-                qPrintable(name));
+            qWarning("QPSQLDriver: received notification for '%s' which isn't subscribed to.",
+                    qPrintable(name));
 
         qPQfreemem(notify);

trunk/src/sql/drivers/psql/qsql_psql.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/sql/drivers/sqlite/qsql_sqlite.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -64 +64 @@
 
 QT_BEGIN_NAMESPACE
+
+static QString _q_escapeIdentifier(const QString &identifier) 
+{
+    QString res = identifier;
+    if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(QLatin1Char('"')) ) {
+        res.replace(QLatin1Char('"'), QLatin1String("\"\""));
+        res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
+        res.replace(QLatin1Char('.'), QLatin1String("\".\""));
+    }
+    return res;
+}
 
 static QVariant::Type qGetColumnType(const QString &tpName)
@@ -112 +123 @@
     sqlite3_stmt *stmt;
 
-    uint skippedStatus: 1; // the status of the fetchNext() that's skipped
-    uint skipRow: 1; // skip the next fetchNext()?
-    uint utf8: 1;
+    bool skippedStatus; // the status of the fetchNext() that's skipped
+    bool skipRow; // skip the next fetchNext()?
     QSqlRecord rInf;
-    QSql::NumericalPrecisionPolicy precisionPolicy;
+    QVector<QVariant> firstRow;
 };
 
-static const uint initial_cache_size = 128;
-
 QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res) : q(res), access(0),
-    stmt(0), skippedStatus(false), skipRow(false), utf8(false), precisionPolicy(QSql::HighPrecision)
+    stmt(0), skippedStatus(false), skipRow(false)
 {
 }
@@ -182 +190 @@
         Q_ASSERT(!initialFetch);
         skipRow = false;
+        for(int i=0;i<firstRow.count();i++)
+            values[i]=firstRow[i];
         return skippedStatus;
     }
     skipRow = initialFetch;
+
+    if(initialFetch) {
+        firstRow.clear();
+        firstRow.resize(sqlite3_column_count(stmt));
+    }
 
     if (!stmt) {
@@ -213 +228 @@
                 break;
             case SQLITE_FLOAT:
-                switch(precisionPolicy) {
+                switch(q->numericalPrecisionPolicy()) {
                     case QSql::LowPrecisionInt32:
                         values[i + idx] = sqlite3_column_int(stmt, i);
@@ -221 +236 @@
                         break;
                     case QSql::LowPrecisionDouble:
-                        values[i + idx] = sqlite3_column_double(stmt, i);
-                        break;
                     case QSql::HighPrecision:
                     default:
-                        values[i + idx] = QString::fromUtf16(static_cast<const ushort *>(
-                                            sqlite3_column_text16(stmt, i)),
-                                            sqlite3_column_bytes16(stmt, i) / sizeof(ushort));
+                        values[i + idx] = sqlite3_column_double(stmt, i);
                         break;
                 };
@@ -290 +301 @@
             sqlite3_reset(d->stmt);
         break;
-    case QSqlResult::SetNumericalPrecision:
-        Q_ASSERT(data);
-        d->precisionPolicy = *reinterpret_cast<QSql::NumericalPrecisionPolicy *>(data);
-        break;
     default:
-        QSqlResult::virtual_hook(id, data);
+        QSqlCachedResult::virtual_hook(id, data);
     }
 }
@@ -400 +407 @@
         return false;
     }
-    d->skippedStatus = d->fetchNext(cache(), 0, true);
+    d->skippedStatus = d->fetchNext(d->firstRow, 0, true);
     if (lastError().isValid()) {
         setSelect(false);
@@ -482 +489 @@
     case SimpleLocking:
     case FinishQuery:
+    case LowPrecisionNumbers:
         return true;
     case QuerySize:
     case NamedPlaceholders:
     case BatchOperations:
-    case LowPrecisionNumbers:
     case EventNotifications:
     case MultipleResultSets:
@@ -499 +506 @@
 
     opts.remove(QLatin1Char(' '));
-    if (opts.startsWith(QLatin1String("QSQLITE_BUSY_TIMEOUT="))) {
-        bool ok;
-        int nt = opts.mid(21).toInt(&ok);
-        if (ok)
-            return nt;
+    foreach(QString option, opts.split(QLatin1Char(';'))) {
+        if (option.startsWith(QLatin1String("QSQLITE_BUSY_TIMEOUT="))) {
+            bool ok;
+            int nt = option.mid(21).toInt(&ok);
+            if (ok)
+                return nt;
+        }
     }
     return DefaultTimeout;
+}
+
+static int qGetSqliteOpenMode(QString opts)
+{
+    opts.remove(QLatin1Char(' '));
+    foreach(QString option, opts.split(QLatin1Char(';'))) {
+        if (option == QLatin1String("QSQLITE_OPEN_READONLY"))
+                return SQLITE_OPEN_READONLY;
+    }
+    return SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
 }
 
@@ -520 +539 @@
         return false;
 
-    if (sqlite3_open16(db.constData(), &d->access) == SQLITE_OK) {
+    if (sqlite3_open_v2(db.toUtf8().constData(), &d->access, qGetSqliteOpenMode(conOpts), NULL) == SQLITE_OK) {
         sqlite3_busy_timeout(d->access, qGetSqliteTimeout(conOpts));
         setOpen(true);
@@ -632 +651 @@
     QString schema;
     QString table(tableName);
-    int indexOfSeparator = tableName.indexOf(QLatin1String("."));
+    int indexOfSeparator = tableName.indexOf(QLatin1Char('.'));
     if (indexOfSeparator > -1) {
-        schema = tableName.left(indexOfSeparator).append(QLatin1String("."));
+        schema = tableName.left(indexOfSeparator).append(QLatin1Char('.'));
         table = tableName.mid(indexOfSeparator + 1);
     }
-    q.exec(QLatin1String("PRAGMA ") + schema + QLatin1String("table_info ('") + table + QLatin1String("')"));
+    q.exec(QLatin1String("PRAGMA ") + schema + QLatin1String("table_info (") + _q_escapeIdentifier(table) + QLatin1String(")"));
 
     QSqlIndex ind;
@@ -662 +681 @@
         return QSqlIndex();
 
+    QString table = tblname;
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+
     QSqlQuery q(createResult());
     q.setForwardOnly(true);
-    return qGetTableInfo(q, tblname, true);
+    return qGetTableInfo(q, table, true);
 }
 
@@ -672 +695 @@
         return QSqlRecord();
 
+    QString table = tbl;
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+
     QSqlQuery q(createResult());
     q.setForwardOnly(true);
-    return qGetTableInfo(q, tbl);
+    return qGetTableInfo(q, table);
 }
 
@@ -682 +709 @@
 }
 
-QString QSQLiteDriver::escapeIdentifier(const QString &identifier, IdentifierType /*type*/) const
-{
-    QString res = identifier;
-    if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(QLatin1Char('"')) ) {
-        res.replace(QLatin1Char('"'), QLatin1String("\"\""));
-        res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
-        res.replace(QLatin1Char('.'), QLatin1String("\".\""));
-    }
-    return res;
+QString QSQLiteDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const
+{
+    Q_UNUSED(type);
+    return _q_escapeIdentifier(identifier);
 }
 

trunk/src/sql/drivers/sqlite/qsql_sqlite.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/sql/drivers/sqlite2/qsql_sqlite2.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -111 +111 @@
     sqlite_vm *currentMachine;
 
-    uint skippedStatus: 1; // the status of the fetchNext() that's skipped
-    uint skipRow: 1; // skip the next fetchNext()?
-    uint utf8: 1;
+    bool skippedStatus; // the status of the fetchNext() that's skipped
+    bool skipRow; // skip the next fetchNext()?
+    bool utf8;
     QSqlRecord rInf;
-    QSql::NumericalPrecisionPolicy precisionPolicy;
+    QVector<QVariant> firstRow;
 };
 
@@ -121 +121 @@
 
 QSQLite2ResultPrivate::QSQLite2ResultPrivate(QSQLite2Result* res) : q(res), access(0), currentTail(0),
-    currentMachine(0), skippedStatus(false), skipRow(false), utf8(false), precisionPolicy(QSql::HighPrecision)
+    currentMachine(0), skippedStatus(false), skipRow(false), utf8(false)
 {
 }
@@ -168 +168 @@
         const char* lastDot = strrchr(cnames[i], '.');
         const char* fieldName = lastDot ? lastDot + 1 : cnames[i];
-        rInf.append(QSqlField(QString::fromAscii(fieldName),
+        
+        //remove quotations around the field name if any
+        QString fieldStr = QString::fromAscii(fieldName);
+        QLatin1Char quote('\"');
+        if ( fieldStr.length() > 2 && fieldStr.startsWith(quote) && fieldStr.endsWith(quote)) {
+            fieldStr = fieldStr.mid(1);
+            fieldStr.chop(1);
+        }
+        rInf.append(QSqlField(fieldStr,
                               nameToType(QString::fromAscii(cnames[i+numCols]))));
     }
@@ -186 +194 @@
         Q_ASSERT(!initialFetch);
         skipRow = false;
+        for(int i=0;i<firstRow.count(); i++)
+            values[i] = firstRow[i];
         return skippedStatus;
     }
@@ -203 +213 @@
     }
 
+    if(initialFetch) {
+        firstRow.clear();
+        firstRow.resize(colNum);
+    }
+    
     switch(res) {
     case SQLITE_ROW:
@@ -253 +268 @@
         d->finalize();
         break;
-    case QSqlResult::SetNumericalPrecision:
-        Q_ASSERT(data);
-        d->precisionPolicy = *reinterpret_cast<QSql::NumericalPrecisionPolicy *>(data);
-        break;
     default:
-        QSqlResult::virtual_hook(id, data);
+        QSqlCachedResult::virtual_hook(id, data);
     }
 }
@@ -297 +308 @@
     // we have to fetch one row to find out about
     // the structure of the result set
-    d->skippedStatus = d->fetchNext(cache(), 0, true);
+    d->skippedStatus = d->fetchNext(d->firstRow, 0, true);
     if (lastError().isValid()) {
         setSelect(false);
@@ -386 +397 @@
     d->access = sqlite_open(QFile::encodeName(db), 0, &err);
     if (err) {
-        setLastError(QSqlError(tr("Error to open database"), QString::fromAscii(err),
+        setLastError(QSqlError(tr("Error opening database"), QString::fromAscii(err),
                      QSqlError::ConnectionError));
         sqlite_freemem(err);
@@ -461 +472 @@
         return true;
 
-    setLastError(QSqlError(tr("Unable to rollback Transaction"),
+    setLastError(QSqlError(tr("Unable to rollback transaction"),
                            QString::fromAscii(err), QSqlError::TransactionError, res));
     sqlite_freemem(err);
@@ -504 +515 @@
     QSqlQuery q(createResult());
     q.setForwardOnly(true);
+    QString table = tblname;
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
     // finrst find a UNIQUE INDEX
-    q.exec(QLatin1String("PRAGMA index_list('") + tblname + QLatin1String("');"));
+    q.exec(QLatin1String("PRAGMA index_list('") + table + QLatin1String("');"));
     QString indexname;
     while(q.next()) {
@@ -518 +532 @@
     q.exec(QLatin1String("PRAGMA index_info('") + indexname + QLatin1String("');"));
 
-    QSqlIndex index(tblname, indexname);
+    QSqlIndex index(table, indexname);
     while(q.next()) {
         QString name = q.value(2).toString();
@@ -533 +547 @@
     if (!isOpen())
         return QSqlRecord();
+    QString table = tbl;
+    if (isIdentifierEscaped(tbl, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
 
     QSqlQuery q(createResult());
@@ -548 +565 @@
 {
     QString res = identifier;
-    if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(QLatin1Char('"')) ) {
+    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
         res.replace(QLatin1Char('"'), QLatin1String("\"\""));
         res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));

trunk/src/sql/drivers/sqlite2/qsql_sqlite2.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/sql/drivers/tds/qsql_tds.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -165 +165 @@
 extern "C" {
 static int CS_PUBLIC qTdsMsgHandler (DBPROCESS* dbproc,
-                            DBINT /*msgno*/,
+                            DBINT msgno,
                             int msgstate,
                             int severity,
                             char* msgtext,
-                            char* /*srvname*/,
+                            char* srvname,
                             char* /*procname*/,
-                            int /*line*/)
+                            int line)
 {
     QTDSResultPrivate* p = errs()->value(dbproc);
@@ -182 +182 @@
 
     if (severity > 0) {
-        QString errMsg = QString(QLatin1String("%1 (%2)")).arg(QString::fromAscii(msgtext)).arg(
-                                    msgstate);
+        QString errMsg = QString::fromLatin1("%1 (Msg %2, Level %3, State %4, Server %5, Line %6)")
+                         .arg(QString::fromAscii(msgtext))
+                         .arg(msgno)
+                         .arg(severity)
+                         .arg(msgstate)
+                         .arg(QString::fromAscii(srvname))
+                         .arg(line);
         p->addErrorMsg(errMsg);
+        if (severity > 10) {
+            // Severe messages are really errors in the sense of lastError
+            errMsg = p->getErrorMsgs();
+            p->lastError = qMakeError(errMsg, QSqlError::UnknownError, msgno);
+            p->clearErrorMsgs();
+        }
     }
 
@@ -212 +223 @@
 
 
-    QString errMsg = QString(QLatin1String("%1 %2\n")).arg(QString::fromAscii(dberrstr)).arg(
-                                QString::fromAscii(oserrstr));
+    QString errMsg = QString::fromLatin1("%1 %2\n").arg(QLatin1String(dberrstr)).arg(
+                                QLatin1String(oserrstr));
     errMsg += p->getErrorMsgs();
     p->lastError = qMakeError(errMsg, QSqlError::UnknownError, dberr);
@@ -294 +305 @@
     // insert d in error handler dict
     errs()->insert(d->dbproc, d);
+    dbcmd(d->dbproc, "set quoted_identifier on");
+    dbsqlexec(d->dbproc);
 }
 
@@ -368 +381 @@
                     values[idx] = QVariant(QVariant::String);
                 else
-                    values[idx] = QString::fromLocal8Bit((const char*)d->buffer.at(i * 2));
+                    values[idx] = QString::fromLocal8Bit((const char*)d->buffer.at(i * 2)).trimmed();
                 break;
             case QVariant::ByteArray: {
@@ -699 +712 @@
     QSqlQuery t(createResult());
     t.setForwardOnly(true);
+
+    QString table = tablename;
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+
     QString stmt (QLatin1String("select name, type, length, prec from syscolumns "
                    "where id = (select id from sysobjects where name = '%1')"));
-    t.exec(stmt.arg(tablename));
+    t.exec(stmt.arg(table));
     while (t.next()) {
         QSqlField f(t.value(0).toString().simplified(), qDecodeTDSType(t.value(1).toInt()));
@@ -748 +766 @@
     else if (field.type() == QVariant::DateTime) {
         if (field.value().toDateTime().isValid()){
-            r = field.value().toDateTime().toString(QLatin1String("'yyyyMMdd hh:mm:ss'"));
+            r = field.value().toDateTime().toString(QLatin1String("yyyyMMdd hh:mm:ss"));
+            r.prepend(QLatin1String("'"));
+            r.append(QLatin1String("'"));
         } else
             r = QLatin1String("NULL");
@@ -771 +791 @@
     QSqlRecord rec = record(tablename);
 
-    QSqlIndex idx(tablename);
-    if ((!isOpen()) || (tablename.isEmpty()))
+    QString table = tablename;
+    if (isIdentifierEscaped(table, QSqlDriver::TableName))
+        table = stripDelimiters(table, QSqlDriver::TableName);
+
+    QSqlIndex idx(table);
+    if ((!isOpen()) || (table.isEmpty()))
         return QSqlIndex();
 
     QSqlQuery t(createResult());
     t.setForwardOnly(true);
-    t.exec(QString::fromLatin1("sp_helpindex '%1'").arg(tablename));
+    t.exec(QString::fromLatin1("sp_helpindex '%1'").arg(table));
     if (t.next()) {
         QStringList fNames = t.value(2).toString().simplified().split(QLatin1Char(','));
@@ -795 +819 @@
 }
 
+QString QTDSDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const
+{
+    QString res = identifier;
+    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
+        res.replace(QLatin1Char('"'), QLatin1String("\"\""));
+        res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
+        res.replace(QLatin1Char('.'), QLatin1String("\".\""));
+    }
+    return res;
+}
+
 QT_END_NAMESPACE

trunk/src/sql/drivers/tds/qsql_tds.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSql module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -117 +117 @@
     QVariant handle() const;
 
+    QString escapeIdentifier(const QString &identifier, IdentifierType type) const;
+
 protected:
     bool beginTransaction();