[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_general.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b04a0ddd3ca8f5d1b1b38208ef59fb27321378b8
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon Aug 16 12:48:14 2021 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Aug 16 18:35:20 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 <lionel at mamane.lu>
    Tested-by: Jenkins
    (cherry picked from commit 997ff7166ceca0a5af80297a0e789af2ff0c6617)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120448

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"))