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

Tamas Bunth (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 31 17:58:54 UTC 2019


 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit acafd1ac87cb23a447353b8f0419a25fbe1c4430
Author:     Tamas Bunth <tamas.bunth at collabora.co.uk>
AuthorDate: Wed Sep 12 17:31:26 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jul 31 19:58:09 2019 +0200

    mysqlc: getTablePrivileges not implemented, so..
    
    it should throw an exception.
    
    Reviewed-on: https://gerrit.libreoffice.org/60460
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 19f8ea668833a4dc90244792cbf91881b0ca9a07)
    
    Change-Id: I32b0b5dde0bcfd8cc59d0814a9f35d43c0f58ae1
    Reviewed-on: https://gerrit.libreoffice.org/76750
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index be8dc496de2e..bca56e119626 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -1046,14 +1046,9 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier(const Any
 Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTablePrivileges(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/)
 {
-    Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
-                                         "org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
-                                     UNO_QUERY);
-    std::vector<std::vector<Any>> rRows;
     // TODO
     SAL_WARN("connectivity.mysqlc", "method not implemented");
-    lcl_setRows_throw(xResultSet, 12, rRows);
-    return xResultSet;
+    throw SQLException("getTablePrivileges method not implemented", *this, "IM001", 0, Any());
 }
 
 Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference(


More information about the Libreoffice-commits mailing list