diff options
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 5 | ||||
| -rw-r--r-- | dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk | 1 | ||||
| -rw-r--r-- | dbaccess/CppunitTest_dbaccess_hsqldb_test.mk | 5 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/core/misc/dsntypes.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 2 |
6 files changed, 3 insertions, 14 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk index 2240a82b8761..9713871988ea 100644 --- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk +++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk @@ -17,10 +17,6 @@ $(eval $(call gb_CppunitTest_use_externals,dbaccess_RowSetClones,\ boost_headers \ )) -$(eval $(call gb_CppunitTest_use_jars,dbaccess_RowSetClones, \ - sdbc_hsqldb \ -)) - $(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \ basegfx \ comphelper \ @@ -72,7 +68,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_RowSetClones,\ comphelper/util/comphelp \ configmgr/source/configmgr \ connectivity/source/drivers/firebird/firebird_sdbc \ - connectivity/source/drivers/hsqldb/hsqldb \ connectivity/source/drivers/jdbc/jdbc \ connectivity/source/manager/sdbc2 \ dbaccess/util/dba \ diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk index a7122b537a3b..443213fe9410 100644 --- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk +++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_embeddeddb_performancetest, configmgr/source/configmgr \ connectivity/source/cpool/dbpool2 \ connectivity/source/drivers/firebird/firebird_sdbc \ - connectivity/source/drivers/hsqldb/hsqldb \ connectivity/source/drivers/jdbc/jdbc \ connectivity/source/manager/sdbc2 \ dbaccess/util/dba \ diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index e3dcae7473b0..b6bc33a2cf87 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\ configmgr/source/configmgr \ connectivity/source/cpool/dbpool2 \ connectivity/source/drivers/firebird/firebird_sdbc \ - connectivity/source/drivers/hsqldb/hsqldb \ connectivity/source/drivers/jdbc/jdbc \ connectivity/source/manager/sdbc2 \ dbaccess/util/dba \ @@ -74,10 +73,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\ xmloff/util/xo \ )) -$(eval $(call gb_CppunitTest_use_jars,dbaccess_hsqldb_test,\ - sdbc_hsqldb \ -)) - $(eval $(call gb_CppunitTest_use_configuration,dbaccess_hsqldb_test)) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index d7e47ad61b05..104c6328510a 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -382,7 +382,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _r ,m_nControllerLockCount(0) { // some kind of default - m_sConnectURL = "jdbc:"; + m_sConnectURL = "sdbc:embedded:firebird"; m_aTableFilter.realloc(1); m_aTableFilter[0] = "%"; impl_construct_nothrow(); diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 361208c161d5..ca10538029ab 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -297,7 +297,7 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const } } if ( sEmbeddedDatabaseURL.isEmpty() ) - sEmbeddedDatabaseURL = "sdbc:embedded:hsqldb"; + sEmbeddedDatabaseURL = "sdbc:embedded:firebird"; return sEmbeddedDatabaseURL; } diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 6f6d3be85b6b..d62403e56da8 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -602,7 +602,7 @@ namespace dbaui { // Sets jdbc as the default selected database on startup. if (m_pRB_CreateDatabase->IsChecked() ) - return m_pCollection->getTypeDisplayName( "jdbc:" ); + return m_pCollection->getTypeDisplayName( "sdbc:embedded:firebird" ); return OGeneralPage::getDatasourceName( _rSet ); } |