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

New commits:
commit 3c567e55e6aed9e0da892d8b9fc09f8a0c784fcc
Author: Lionel Elie Mamane <lio...@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
    Reviewed-on: https://gerrit.libreoffice.org/47080
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Tested-by: Julien Nabet <serval2...@yahoo.fr>

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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to