diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2018-11-29 17:43:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2018-11-30 09:12:56 +0100 |
| commit | 7991a4d718c282f1fd999e76f683e333b5c220af (patch) | |
| tree | 041ac9ca7678101b28113cc8ca21f10028f21a89 | |
| parent | ef921ee138d563706bd2f3edeb13f737fabe03ec (diff) | |
Disable firebird migration assistant in 6.2
As decided in the ESC meeting on 11/29/2018
Remove the related tests as it was done for 6.1
See: https://gerrit.libreoffice.org/#/c/57508/7
Change-Id: Iadd45ede8d5f30de8701ad04e411c9de23ebba10
Reviewed-on: https://gerrit.libreoffice.org/64262
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | dbaccess/Module_dbaccess.mk | 5 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/datasource.cxx | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index a45acd3af2f4..204854748ec1 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -34,11 +34,6 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\ ifneq ($(OS),iOS) ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) -$(eval $(call gb_Module_add_check_targets,dbaccess,\ - $(if $(ENABLE_JAVA),CppunitTest_dbaccess_hsqlbinary_import) \ - $(if $(ENABLE_JAVA),CppunitTest_dbaccess_tdf119625) \ -)) - # remove if we have a be file for this ifeq ($(ENDIANNESS),little) $(eval $(call gb_Module_add_check_targets,dbaccess,\ diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index b653396e54e7..adb35b93b4f9 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -26,6 +26,7 @@ #include "SharedConnection.hxx" #include "databasedocument.hxx" #include <OAuthenticationContinuation.hxx> +#include <svtools/miscopt.hxx> #include <hsqlimport.hxx> #include <migrwarndlg.hxx> @@ -603,7 +604,9 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString #if ENABLE_FIREBIRD_SDBC bool bNeedMigration = false; - if(m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb") + SvtMiscOptions aMiscOptions; + + if(aMiscOptions.IsExperimentalMode() && m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb") { OUString sMigrEnvVal; osl_getEnvironment(OUString("DBACCESS_HSQL_MIGRATION").pData, |