dbaccess/Module_dbaccess.mk | 2 - dbaccess/source/core/dataaccess/datasource.cxx | 30 ------------------------- 2 files changed, 32 deletions(-)
New commits: commit 443da1959d02569c59d064748a06d39c6dbb2f64 Author: Tamas Bunth <tamas.bu...@collabora.co.uk> Date: Wed Jun 20 11:22:38 2018 +0200 Disable migration in this release Change-Id: I4bac897da4146750375f855b0180bb2d32bd3617 Reviewed-on: https://gerrit.libreoffice.org/56154 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index a97578c02508..9bc2253f7465 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -36,7 +36,6 @@ ifneq ($(OS),IOS) ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_firebird_test \ - CppunitTest_dbaccess_hsqlbinary_import \ )) endif @@ -45,7 +44,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_empty_stdlib_save \ CppunitTest_dbaccess_nolib_save \ CppunitTest_dbaccess_macros_test \ - CppunitTest_dbaccess_hsqlschema_import \ )) ifeq ($(ENABLE_JAVA),TRUE) diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index ffe45b4521a0..4689d2594773 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -583,25 +583,6 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString Reference< XDriverManager > xManager; -#if ENABLE_FIREBIRD_SDBC - bool bNeedMigration = false; - if(m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb") - { - OUString sMigrEnvVal; - osl_getEnvironment(OUString("DBACCESS_HSQL_MIGRATION").pData, - &sMigrEnvVal.pData); - if(!sMigrEnvVal.isEmpty()) - bNeedMigration = true; - else - { - MigrationWarnDialog aWarnDlg{nullptr}; - bNeedMigration = aWarnDlg.run() == RET_OK; - } - if (bNeedMigration) - m_pImpl->m_sConnectURL = "sdbc:embedded:firebird"; - } -#endif - try { xManager.set( ConnectionPool::create( m_pImpl->m_aContext ), UNO_QUERY_THROW ); } catch( const Exception& ) { } @@ -713,17 +694,6 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString throwGenericSQLException( sMessage, static_cast< XDataSource* >( this ), makeAny( aContext ) ); } -#if ENABLE_FIREBIRD_SDBC - if( bNeedMigration ) - { - Reference< css::document::XDocumentSubStorageSupplier> xDocSup( - m_pImpl->getDocumentSubStorageSupplier() ); - dbahsql::HsqlImporter importer(xReturn, - xDocSup->getDocumentSubStorage("database",ElementModes::READWRITE) ); - importer.importHsqlDatabase(); - } -#endif - return xReturn; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits