[Libreoffice-commits] core.git: connectivity/source

[Libreoffice Gerrit user]

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

New commits:
commit e33424dd887cb1a11a3dba2513ef0f4bf93a6dbe
Author:     Tamas Bunth <tamas.bunth at collabora.co.uk>
AuthorDate: Wed Oct 31 15:03:14 2018 +0100
Commit:     Tamás Bunth <btomi96 at gmail.com>
CommitDate: Wed Oct 31 23:51:40 2018 +0100

    mysqlc: Add support for mediumnint and char types
    
    When reading column types from information schema, it can be mediumint
    and char types as well. Mediumint should be 3 bytes long. We can use
    sal_Int32 for that.
    
    Change-Id: Id3507b1f38cabfb96800fc7743c911e36609a346
    Reviewed-on: https://gerrit.libreoffice.org/62697
    Tested-by: Jenkins
    Reviewed-by: Tamás Bunth <btomi96 at gmail.com>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index 179241193332..aa0b0a9e4e5a 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -187,7 +187,7 @@ 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"))
+    if (sType.equalsIgnoreAsciiCase("smallint") || sType.equalsIgnoreAsciiCase("mediumint"))
         return css::sdbc::DataType::SMALLINT;
     if (sType.equalsIgnoreAsciiCase("longtext"))
         return css::sdbc::DataType::LONGVARCHAR;
@@ -202,7 +202,7 @@ sal_Int32 mysqlStrToOOOType(const OUString& sType)
         return css::sdbc::DataType::BLOB;
     if (sType.equalsIgnoreAsciiCase("varbinary"))
         return css::sdbc::DataType::VARBINARY;
-    if (sType.equalsIgnoreAsciiCase("text"))
+    if (sType.equalsIgnoreAsciiCase("text") || sType.equalsIgnoreAsciiCase("char"))
         return css::sdbc::DataType::CHAR;
     if (sType.equalsIgnoreAsciiCase("binary"))
         return css::sdbc::DataType::BINARY;