[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/ui/dlg/directsql.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 31b0920a8018979bd8b0b5bf804edcf61f89fd67
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Dec 27 10:17:24 2017 +0100

    tdf#114702 don't use XMultipleResultset unless DatabaseMetaData says we can
    
    Change-Id: Icec98d35c2f60adf4a31e492c6cb708e82e47a58
    
    (cherry picked from commit 3c567e55e6aed9e0da892d8b9fc09f8a0c784fcc)
    
    Change-Id: Ibf153cf310fbd00012bb34603614f747f9012e4a
    Reviewed-on: https://gerrit.libreoffice.org/47123
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 8d4cfc1946c7..8ea220d90d8e 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -191,9 +191,11 @@ namespace dbaui
         {
             // create a statement
             Reference< XStatement > xStatement = m_xConnection->createStatement();
+
+            Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
             css::uno::Reference< css::sdbc::XMultipleResults > xMR ( xStatement, UNO_QUERY );
 
-            if (xMR.is())
+            if (xMeta.is() && xMeta->supportsMultipleResultSets() && xMR.is())
             {
                 bool hasRS = xStatement->execute(_rStatement);
                 if(hasRS)