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

[Lionel Elie Mamane (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx |   26 +++++-----
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |   10 +--
 2 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 2c3fdd1236fc22c5d2688f728e58818984b22298
Author:     Lionel Elie Mamane <lionel at mamane.lu>
AuthorDate: Sat May 9 15:34:42 2020 +0200
Commit:     Lionel Elie Mamane <lionel at mamane.lu>
CommitDate: Sun May 10 00:13:05 2020 +0200

    mysql-sdbc: do not lie about supporting XPreparedBatchExecution
    
    Change-Id: I85220307566f04640965f048ee0b5c5c4e552bdb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93863
    Tested-by: Jenkins
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
index 8c9ec1d250db..2b344843deb2 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
@@ -534,18 +534,20 @@ void SAL_CALL OPreparedStatement::clearParameters()
     }
 }
 
-void SAL_CALL OPreparedStatement::clearBatch()
-{
-    mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearBatch",
-                                                            *this);
-}
-
-void SAL_CALL OPreparedStatement::addBatch()
-{
-    mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::addBatch", *this);
-}
-
-Sequence<sal_Int32> SAL_CALL OPreparedStatement::executeBatch() { return Sequence<sal_Int32>(); }
+// void SAL_CALL OPreparedStatement::clearBatch()
+// {
+//     mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearBatch",
+//                                                             *this);
+// }
+
+// void SAL_CALL OPreparedStatement::addBatch()
+// {
+//     mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::addBatch", *this);
+// }
+
+// Sequence<sal_Int32> SAL_CALL OPreparedStatement::executeBatch() {
+//     mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::executeBatch", *this);
+// }
 
 void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
 {
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
index f488e285bc41..3c4edaf411ac 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
+#include <cppuhelper/compbase4.hxx>
 
 namespace connectivity
 {
@@ -52,8 +53,7 @@ struct BindMetaData
     my_bool error = false;
 };
 
-typedef ::cppu::ImplHelper5<css::sdbc::XPreparedStatement, css::sdbc::XParameters,
-                            css::sdbc::XPreparedBatchExecution,
+typedef ::cppu::ImplHelper4<css::sdbc::XPreparedStatement, css::sdbc::XParameters,
                             css::sdbc::XResultSetMetaDataSupplier, css::lang::XServiceInfo>
     OPreparedStatement_BASE;
 
@@ -149,9 +149,9 @@ public:
     void SAL_CALL clearParameters() override;
 
     // XPreparedBatchExecution
-    void SAL_CALL addBatch() override;
-    void SAL_CALL clearBatch() override;
-    css::uno::Sequence<sal_Int32> SAL_CALL executeBatch() override;
+    // void SAL_CALL addBatch() override;
+    // void SAL_CALL clearBatch() override;
+    // css::uno::Sequence<sal_Int32> SAL_CALL executeBatch() override;
 
     // XCloseable
     void SAL_CALL close() override;