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

[Libreoffice Gerrit user]

 connectivity/source/drivers/firebird/Connection.cxx |    2 +-
 connectivity/source/drivers/firebird/Driver.cxx     |    3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9247233195996d82f3530fcef0310ccb6e1c2304
Author:     Lionel Elie Mamane <lionel at mamane.lu>
AuthorDate: Mon Jan 28 15:44:36 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Jan 29 18:06:34 2019 +0100

    tdf#106463 set new firebird connections as autocommit by default
    
    as per SDBC specifications
    
    Change-Id: I132a8e565468bcacf0fa5ee0dfb62bf0dd717e24
    
    (cherry picked from commit e9e1813a6ebe6e3015e04347b15a18aebc4e0fa7)
    
    Change-Id: I4e95f45f2915613d9515c55e3fad60869feab1a2
    Reviewed-on: https://gerrit.libreoffice.org/67046
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index b7f1276a8d4f..ba2fba974d78 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -87,7 +87,7 @@ Connection::Connection()
     , m_sFirebirdURL()
     , m_bIsEmbedded(false)
     , m_bIsFile(false)
-    , m_bIsAutoCommit(false)
+    , m_bIsAutoCommit(true)
     , m_bIsReadOnly(false)
     , m_aTransactionIsolation(TransactionIsolation::REPEATABLE_READ)
 #if SAL_TYPES_SIZEOFPOINTER == 8
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 199529016995..8e81ae9ae9b8 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -181,9 +181,6 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect(
     Reference< XConnection > xCon = pCon;
     pCon->construct(url, info);
 
-    if (url == "sdbc:embedded:firebird")
-        pCon->setAutoCommit(true);
-
     m_xConnections.push_back(WeakReferenceHelper(*pCon));
 
     return xCon;