aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfirnsy <firnsy@securixlive.com>2011-03-25 21:15:21 +1100
committerfirnsy <firnsy@securixlive.com>2011-03-25 21:29:36 +1100
commitff50a9c10b0b64f7b853aedc22c938efd3dad4fd (patch)
tree61920791ef1786469b1abdae4f72936a7c6636f9
parent1392683508346d1372f3a46e524fd0fc22ef2f41 (diff)
changed: cosmetics and log when an unsupported field type is detected by the mysql wrapper.
-rw-r--r--xbmc/dbwrappers/mysqldataset.cpp87
1 files changed, 44 insertions, 43 deletions
diff --git a/xbmc/dbwrappers/mysqldataset.cpp b/xbmc/dbwrappers/mysqldataset.cpp
index a18d3799dd..99eea6d529 100644
--- a/xbmc/dbwrappers/mysqldataset.cpp
+++ b/xbmc/dbwrappers/mysqldataset.cpp
@@ -1309,49 +1309,50 @@ bool MysqlDataset::query(const char *query) {
field_value &v = res->at(i);
switch (fields[i].type)
{
- case MYSQL_TYPE_LONGLONG:
- case MYSQL_TYPE_DECIMAL:
- case MYSQL_TYPE_NEWDECIMAL:
- case MYSQL_TYPE_TINY:
- case MYSQL_TYPE_SHORT:
- case MYSQL_TYPE_INT24:
- case MYSQL_TYPE_LONG:
- if (row[i] != NULL)
- {
- v.set_asInt(atoi(row[i]));
- }
- else
- {
- v.set_asInt(0);
- }
- break;
- case MYSQL_TYPE_FLOAT:
- case MYSQL_TYPE_DOUBLE:
- if (row[i] != NULL)
- {
- v.set_asDouble(atof(row[i]));
- }
- else
- {
- v.set_asDouble(0);
- }
- break;
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_VAR_STRING:
- case MYSQL_TYPE_VARCHAR:
- if (row[i] != NULL) v.set_asString((const char *)row[i] );
- break;
- case MYSQL_TYPE_TINY_BLOB:
- case MYSQL_TYPE_MEDIUM_BLOB:
- case MYSQL_TYPE_LONG_BLOB:
- case MYSQL_TYPE_BLOB:
- if (row[i] != NULL) v.set_asString((const char *)row[i]);
- break;
- case MYSQL_TYPE_NULL:
- default:
- v.set_asString("");
- v.set_isNull();
- break;
+ case MYSQL_TYPE_LONGLONG:
+ case MYSQL_TYPE_DECIMAL:
+ case MYSQL_TYPE_NEWDECIMAL:
+ case MYSQL_TYPE_TINY:
+ case MYSQL_TYPE_SHORT:
+ case MYSQL_TYPE_INT24:
+ case MYSQL_TYPE_LONG:
+ if (row[i] != NULL)
+ {
+ v.set_asInt(atoi(row[i]));
+ }
+ else
+ {
+ v.set_asInt(0);
+ }
+ break;
+ case MYSQL_TYPE_FLOAT:
+ case MYSQL_TYPE_DOUBLE:
+ if (row[i] != NULL)
+ {
+ v.set_asDouble(atof(row[i]));
+ }
+ else
+ {
+ v.set_asDouble(0);
+ }
+ break;
+ case MYSQL_TYPE_STRING:
+ case MYSQL_TYPE_VAR_STRING:
+ case MYSQL_TYPE_VARCHAR:
+ if (row[i] != NULL) v.set_asString((const char *)row[i] );
+ break;
+ case MYSQL_TYPE_TINY_BLOB:
+ case MYSQL_TYPE_MEDIUM_BLOB:
+ case MYSQL_TYPE_LONG_BLOB:
+ case MYSQL_TYPE_BLOB:
+ if (row[i] != NULL) v.set_asString((const char *)row[i]);
+ break;
+ case MYSQL_TYPE_NULL:
+ default:
+ CLog::Log(LOGDEBUG,"MYSQL: Unknown field type: %u", fields[i].type);
+ v.set_asString("");
+ v.set_isNull();
+ break;
}
}
result.records.push_back(res);