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

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/mysql_jdbc/YTable.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ae513765f65c9497533f516e5cde2898c0911a1f
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun May 10 11:22:06 2020 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon May 11 09:31:48 2020 +0200

    tdf#132814: fix put autovalue to Yes in gui for Mysql/MariaDB
    
    See part of bt:
    https://bugs.documentfoundation.org/show_bug.cgi?id=132814#c3
    
    Like this since at least:
    https://cgit.freedesktop.org/libreoffice/core/commit/?id=b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8
    author  Tamas Bunth <tamas.bunth at collabora.co.uk>       2018-10-08 11:04:48 +0200
    committer       Tamás Bunth <btomi96 at gmail.com> 2018-10-14 22:16:05 +0200
    commit  b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8 (patch)
    tree    f1ab6e9fec3c66f0a3285b3ffffcbae38dc7185d
    parent  ba6723431afa843232fadf44e12ddab44e85c9f0 (diff)
    Revert removal of mysql jdbc connector
    And also make some minor fixes so it cooperates with the new mysqlc
    library.
    
    Change-Id: Id328c8378be1555fb5934c738def7fcd62f7a14b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93915
    Tested-by: Jenkins
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit f8c62ed408ae9b390d8268b43f4d49c2c6057227)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93794
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 6eeaf3a23897..67b166d0e13e 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -208,6 +208,8 @@ void SAL_CALL OMySQLTable::alterColumnByName(const OUString& colName,
                     if (sTypeName.indexOf(s_sAutoIncrement) == -1)
                     {
                         sTypeName += OUStringLiteral(" ") + s_sAutoIncrement;
+                        descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),
+                                                     makeAny(sTypeName));
                     }
                 }
                 else