[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - connectivity/source

Tamas Bunth (via logerrit) logerrit at kemper.freedesktop.org
Wed Sep 18 10:34:04 UTC 2019


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

New commits:
commit 882cfc31f88cf62b46c29b737c24afd11b6d560c
Author:     Tamas Bunth <tamas.bunth at collabora.co.uk>
AuthorDate: Wed Sep 11 12:55:20 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Sep 18 12:33:17 2019 +0200

    tdf#126852 Bind TEXT mysql type to Clob
    
    Change-Id: I5a71666f1fafa9507032deffafebf885813a0369
    Reviewed-on: https://gerrit.libreoffice.org/78815
    Tested-by: Jenkins
    Reviewed-by: Tamás Bunth <btomi96 at gmail.com>
    (cherry picked from commit 47a62ede2403772b8743bfcfa0b6dd4be17fec9c)
    Reviewed-on: https://gerrit.libreoffice.org/79083
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index 75b97b4028de..4c7c8465c798 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -202,8 +202,10 @@ sal_Int32 mysqlStrToOOOType(const OUString& sType)
         return css::sdbc::DataType::BLOB;
     if (sType.equalsIgnoreAsciiCase("varbinary"))
         return css::sdbc::DataType::VARBINARY;
-    if (sType.equalsIgnoreAsciiCase("text") || sType.equalsIgnoreAsciiCase("char"))
+    if (sType.equalsIgnoreAsciiCase("char"))
         return css::sdbc::DataType::CHAR;
+    if (sType.equalsIgnoreAsciiCase("text"))
+        return css::sdbc::DataType::CLOB;
     if (sType.equalsIgnoreAsciiCase("binary"))
         return css::sdbc::DataType::BINARY;
     if (sType.equalsIgnoreAsciiCase("time"))


More information about the Libreoffice-commits mailing list