diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-12 06:28:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-12 06:28:09 (GMT) |
| commit | 5393499e4500ca7038ab6e95453cff89eface2f3 (patch) | |
| tree | 449e0cfe2947cff734cd576fa530321be4f3f25f /src | |
| parent | dcae386d0387ebb28e6a15659844c4207ad50a63 (diff) | |
| parent | 89d015151924b2e9386b8bdf36156de5c6914e4e (diff) | |
| download | Qt-5393499e4500ca7038ab6e95453cff89eface2f3.zip Qt-5393499e4500ca7038ab6e95453cff89eface2f3.tar.gz Qt-5393499e4500ca7038ab6e95453cff89eface2f3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Ensure that the entire CLOB can be returned from an Oracle database
Diffstat (limited to 'src')
| -rw-r--r-- | src/sql/drivers/oci/qsql_oci.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index 01c4124..4a211fc 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -517,7 +517,7 @@ QVariant::Type qDecodeOCIType(const QString& ocitype, QSql::NumericalPrecisionPo } else if (ocitype == QLatin1String("LONG") || ocitype == QLatin1String("NCLOB") || ocitype == QLatin1String("CLOB")) - type = QVariant::String; + type = QVariant::ByteArray; else if (ocitype == QLatin1String("RAW") || ocitype == QLatin1String("LONG RAW") || ocitype == QLatin1String("ROWID") || ocitype == QLatin1String("BLOB") || ocitype == QLatin1String("CFILE") || ocitype == QLatin1String("BFILE")) @@ -543,7 +543,6 @@ QVariant::Type qDecodeOCIType(int ocitype, QSql::NumericalPrecisionPolicy precis case SQLT_AVC: case SQLT_RDD: case SQLT_LNG: - case SQLT_CLOB: #ifdef SQLT_INTERVAL_YM case SQLT_INTERVAL_YM: #endif @@ -581,6 +580,7 @@ QVariant::Type qDecodeOCIType(int ocitype, QSql::NumericalPrecisionPolicy precis case SQLT_LVC: case SQLT_LVB: case SQLT_BLOB: + case SQLT_CLOB: case SQLT_FILE: case SQLT_NTY: case SQLT_REF: |