diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-08 01:43:00 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-08 01:43:00 (GMT) |
| commit | 56768688cc49c2dd2234598b41ebbfd046937ac5 (patch) | |
| tree | 029ced5da670e8b64901827508502454e0a167aa /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 038f6fc10092da1414fd2efff353671dbf862995 (diff) | |
| parent | 9bc81769eb6ebc9bd62fe3c1d86e67ddccbed8b6 (diff) | |
| download | Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.zip Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.tar.gz Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/sql/drivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index c0f866e..2261887 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -320,6 +320,16 @@ static bool qIsBlob(int t) || t == MYSQL_TYPE_LONG_BLOB; } +static bool qIsInteger(int t) +{ + return t == MYSQL_TYPE_TINY + || t == MYSQL_TYPE_SHORT + || t == MYSQL_TYPE_LONG + || t == MYSQL_TYPE_LONGLONG + || t == MYSQL_TYPE_INT24; +} + + void QMYSQLResultPrivate::bindBlobs() { int i; @@ -368,6 +378,13 @@ bool QMYSQLResultPrivate::bindInValues() fieldInfo->length = 0; hasBlobs = true; } else { + // fieldInfo->length specifies the display width, which may be too + // small to hold valid integer values (see + // http://dev.mysql.com/doc/refman/5.0/en/numeric-types.html ), so + // always use the MAX_BIGINT_WIDTH for integer types + if (qIsInteger(fieldInfo->type)) { + fieldInfo->length = MAX_BIGINT_WIDTH; + } fieldInfo->type = MYSQL_TYPE_STRING; } bind = &inBinds[i]; |