connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 11 ++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
New commits: commit 4b3a1d249748b0589f74fb63a7849edeec543c0f Author: Tamas Bunth <tamas.bu...@collabora.co.uk> AuthorDate: Thu May 30 18:34:03 2019 +0200 Commit: Xisco FaulĂ <xiscofa...@libreoffice.org> CommitDate: Wed Jun 5 11:30:33 2019 +0200 mysqlc: Add support for mysql type INT24 Which is mapped to sal_Int32. Change-Id: Ibf12e92a20034440fa990ed0c6f1196f4ca3f40f Reviewed-on: https://gerrit.libreoffice.org/73217 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.ti...@collabora.com> (cherry picked from commit 3a4c4482ecdc7a7ef4dd944a49d17a9d30d27b78) Reviewed-on: https://gerrit.libreoffice.org/73459 Reviewed-by: Xisco FaulĂ <xiscofa...@libreoffice.org> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index b3630072c143..3b9e4a2aeb57 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> +#include <sal/log.hxx> using namespace rtl; #include <comphelper/string.hxx> @@ -66,6 +67,7 @@ const std::type_index getTypeFromMysqlType(enum_field_types type) case MYSQL_TYPE_SHORT: return std::type_index(typeid(sal_Int16)); case MYSQL_TYPE_LONG: + case MYSQL_TYPE_INT24: return std::type_index(typeid(sal_Int32)); case MYSQL_TYPE_LONGLONG: return std::type_index(typeid(sal_Int64)); @@ -88,7 +90,6 @@ const std::type_index getTypeFromMysqlType(enum_field_types type) case MYSQL_TYPE_BLOB: case MYSQL_TYPE_YEAR: case MYSQL_TYPE_BIT: - case MYSQL_TYPE_INT24: case MYSQL_TYPE_SET: case MYSQL_TYPE_ENUM: case MYSQL_TYPE_GEOMETRY: @@ -266,6 +267,7 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 nColumnIndex) case MYSQL_TYPE_SHORT: return getShort(nColumnIndex); case MYSQL_TYPE_LONG: + case MYSQL_TYPE_INT24: return getInt(nColumnIndex); case MYSQL_TYPE_LONGLONG: return getLong(nColumnIndex); @@ -285,9 +287,10 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 nColumnIndex) case MYSQL_TYPE_NEWDECIMAL: return getString(nColumnIndex); default: - mysqlc_sdbc_driver::throwFeatureNotImplementedException( - "OPreparedResultSet::getRowSetValue", *this); - return ORowSetValue(); + SAL_WARN("connectivity.mysqlc", "OPreparedResultSet::getRowSetValue: unknown type: " + << m_aFields[nColumnIndex - 1].type); + throw SQLException("Unknown column type when fetching result", *this, OUString(), 1, + Any()); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits