Changeset 846 for trunk/src/sql/drivers/oci/qsql_oci.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/sql/drivers/oci/qsql_oci.cpp (modified) (27 diffs)

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

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -57 +57 @@
 #include <qdebug.h>
 
+
+
+
+
+
+
 #include <oci.h>
 #ifdef max
@@ -88 +94 @@
 #endif
 
-static const ub1 CSID_NCHAR = SQLCS_NCHAR;
+#ifdef OCI_ATTR_CHARSET_FORM
+// Always set the OCI_ATTR_CHARSET_FORM to SQLCS_NCHAR is safe
+// because Oracle server will deal with the implicit Conversion
+// Between CHAR and NCHAR.
+// see: http://download.oracle.com/docs/cd/A91202_01/901_doc/appdev.901/a89857/oci05bnd.htm#422705 
+static const ub1 qOraCharsetForm = SQLCS_NCHAR;
+#endif
+
+#if defined (OCI_UTF16ID)
+static const ub2 qOraCharset = OCI_UTF16ID;
+#else
 static const ub2 qOraCharset = OCI_UCS2ID;
+
 
 typedef QVarLengthArray<sb2, 32> IndicatorArray;
@@ -96 +113 @@
 static QByteArray qMakeOraDate(const QDateTime& dt);
 static QDateTime qMakeDate(const char* oraDate);
+
+
+
+
+
+
+
 static QString qOraWarn(OCIError *err, int *errorCode = 0);
+
 #ifndef Q_CC_SUN
 static // for some reason, Sun CC can't use qOraWarning when it's declared static
@@ -102 +127 @@
 void qOraWarning(const char* msg, OCIError *err);
 static QSqlError qMakeError(const QString& errString, QSqlError::ErrorType type, OCIError *err);
+
+
 
 class QOCIRowId: public QSharedData
@@ -150 +177 @@
     int prefetchRows, prefetchMem;
 
-    void setCharset(OCIBind* hbnd);
     void setStatementAttributes();
     int bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, int pos,
@@ -162 +188 @@
     inline bool isBinaryValue(int i) const
     { return q->bindValueType(i) & QSql::Binary; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 };
 
@@ -192 +253 @@
                         " Couldn't set OCI_ATTR_PREFETCH_MEMORY: ", err);
     }
-}
-
-void QOCIResultPrivate::setCharset(OCIBind* hbnd)
-{
-    int r = 0;
-
-    Q_ASSERT(hbnd);
-
-    r = OCIAttrSet(hbnd,
-                   OCI_HTYPE_BIND,
-                   // this const cast is safe since OCI doesn't touch
-                   // the charset.
-                   const_cast<void *>(static_cast<const void *>(&qOraCharset)),
-                   0,
-                   OCI_ATTR_CHARSET_ID,
-                   err);
-    if (r != 0)
-        qOraWarning("QOCIResultPrivate::setCharset: Couldn't set OCI_ATTR_CHARSET_ID: ", err);
 }
 
@@ -257 +300 @@
                          SQLT_UIN, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
         break;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     case QVariant::Double:
         r = OCIBindByPos(sql, hbnd, err,
@@ -299 +364 @@
                              SQLT_STR, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
             if (r == OCI_SUCCESS)
-                setCharset(*hbnd);
+                setCharset(*hbnd);
             break;
         }
@@ -323 +388 @@
         }
         if (r == OCI_SUCCESS)
-            setCharset(*hbnd);
+            setCharset(*hbnd);
         tmpStorage.append(ba);
         break;
@@ -352 +417 @@
 
 // will assign out value and remove its temp storage.
-static void qOraOutValue(QVariant &value, QList<QByteArray> &storage)
+static void qOraOutValue(QVariant &value, QList<QByteArray> &storage)
 {
     switch (value.type()) {
@@ -364 +429 @@
         value = qMakeDate(storage.takeFirst());
         break;
+
+
+
+
+
+
     case QVariant::String:
-        value = QString::fromUtf16(
-                reinterpret_cast<const ushort *>(storage.takeFirst().constData()));
+        value = QString(
+                reinterpret_cast<const  *>(storage.takeFirst().constData()));
         break;
     default:
@@ -381 +452 @@
             continue;
 
-        qOraOutValue(values[i], tmpStorage);
+        qOraOutValue(values[i], tmpStorage);
 
         QVariant::Type typ = values.at(i).type();
@@ -455 +526 @@
     if (errorCode)
         *errorCode = errcode;
-    return QString::fromUtf16(reinterpret_cast<const ushort *>(errbuf));
+    return QString *>(errbuf));
 }
 
@@ -641 +712 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QDateTime qMakeDate(const char* oraDate)
 {
-    int century = oraDate[0];
+    int century = ;
     if(century >= 100){
         int year    = uchar(oraDate[1]);
@@ -662 +783 @@
     QOCICols(int size, QOCIResultPrivate* dp);
     ~QOCICols();
-    void setCharset(OCIDefine* dfn);
     int readPiecewise(QVector<QVariant> &values, int index = 0);
     int readLOBs(QVector<QVariant> &values, int index = 0);
@@ -864 +984 @@
                         0, 0, OCI_DEFAULT);
                 if (r == 0)
-                    setCharset(dfn);
+                    );
             }
            break;
@@ -922 +1042 @@
     }
     return &lob;
-}
-
-void QOCICols::setCharset(OCIDefine* dfn)
-{
-    int r = 0;
-
-    Q_ASSERT(dfn);
-
-    r = OCIAttrSet(dfn,
-                   OCI_HTYPE_DEFINE,
-                   // this const cast is safe since OCI doesn't touch
-                   // the charset.
-                   const_cast<void *>(static_cast<const void *>(&qOraCharset)),
-                   0,
-                   OCI_ATTR_CHARSET_ID,
-                   d->err);
-        if (r != 0)
-            qOraWarning("QOCICols::setCharset: Couldn't set OCI_ATTR_CHARSET_ID: ", d->err);
 }
 
@@ -990 +1092 @@
             if (isStringField) {
                 QString str = values.at(fieldNum + index).toString();
-                str += QString::fromUtf16(reinterpret_cast<const ushort *>(col),
-                                          chunkSize / 2);
+                str += QString(reinterpret_cast<const QChar *>(col), chunkSize / 2);
                 values[fieldNum + index] = str;
                 fieldInf[fieldNum].ind = 0;
@@ -1245 +1346 @@
                 break;
 
+
+
+
+
+
+
+
+
+
+
             case QVariant::Double:
                 col.bindAs = SQLT_FLT;
@@ -1316 +1427 @@
                         break;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                     case QVariant::Double:
                          columns[i].lengths[row] = columns[i].maxLen;
@@ -1423 +1550 @@
         QVariant::Type tp = boundValues.at(i).type();
         if (tp != QVariant::List) {
-            qOraOutValue(boundValues[i], tmpStorage);
+            qOraOutValue(boundValues[i], tmpStorage);
             if (*columns[i].indicators == -1)
                 boundValues[i] = QVariant(tp);
@@ -1453 +1580 @@
                     break;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 case SQLT_FLT:
                     (*list)[r] =  *reinterpret_cast<double*>(data + r * columns[i].maxLen);
@@ -1458 +1600 @@
 
                 case SQLT_STR:
-                    (*list)[r] =  QString::fromUtf16(reinterpret_cast<ushort *>(data
+                    (*list)[r] =  QString *>(data
                                                                 + r * columns[i].maxLen));
                     break;
@@ -1609 +1751 @@
             // else fall through
         case QVariant::String:
-            v[index + i] = QString::fromUtf16(reinterpret_cast<const ushort *>(fld.data));
+            v[index + i] = QString *>(fld.data));
             break;
         case QVariant::ByteArray:
@@ -2103 +2245 @@
     } else {
         QString versionStr;
-        versionStr = QString::fromUtf16(reinterpret_cast<ushort *>(vertxt));
+        versionStr = QString *>(vertxt));
         QRegExp vers(QLatin1String("([0-9]+)\\.[0-9\\.]+[0-9]"));
         if (vers.indexIn(versionStr) >= 0)