connectivity/source/drivers/mysqlc/mysqlc_general.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 5b6c922226049d32475a249b0df184955aaa2747 Author: Julien Nabet <[email protected]> AuthorDate: Mon Aug 16 12:48:14 2021 +0200 Commit: Julien Nabet <[email protected]> CommitDate: Mon Aug 16 17:53:58 2021 +0200 Related tdf#143895: Mysql MEDIUMINT is DataType::INTEGER not DataType::SMALLINT Change-Id: I324b18cc164cb2f38b7b8411c557c6c208e8d69d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120536 Reviewed-by: Lionel Mamane <[email protected]> Tested-by: Jenkins (cherry picked from commit 997ff7166ceca0a5af80297a0e789af2ff0c6617) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120447 diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx index 7ed11fe3ff13..878efdc3be24 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx @@ -193,11 +193,11 @@ sal_Int32 mysqlStrToOOOType(const OUString& sType) // TODO other types. if (sType.equalsIgnoreAsciiCase("tiny") || sType.equalsIgnoreAsciiCase("tinyint")) return css::sdbc::DataType::TINYINT; - if (sType.equalsIgnoreAsciiCase("smallint") || sType.equalsIgnoreAsciiCase("mediumint")) + if (sType.equalsIgnoreAsciiCase("smallint")) return css::sdbc::DataType::SMALLINT; if (sType.equalsIgnoreAsciiCase("longtext")) return css::sdbc::DataType::LONGVARCHAR; - if (sType.equalsIgnoreAsciiCase("int")) + if (sType.equalsIgnoreAsciiCase("int") || sType.equalsIgnoreAsciiCase("mediumint")) return css::sdbc::DataType::INTEGER; if (sType.equalsIgnoreAsciiCase("varchar") || sType.equalsIgnoreAsciiCase("set") || sType.equalsIgnoreAsciiCase("enum"))
