Kaydet (Commit) 98c0b208 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Make Firebird the (unconditional) default for new databases

60db3d2c "dbu: Set Firebird to default in
wizard.." had done so only "..in case experimental feature is checked in", but
Firebird has been made non-experimental meanwhile as documented at <https://
wiki.documentfoundation.org/index.php?title=ReleaseNotes/6.2&oldid=169290#Base>.

<https://bugs.documentfoundation.org/show_bug.cgi?id=123099> "Creating new
'HSQLDB Embedded' database immediately brings up migration-to-Firebird dialog"
discusses that changing the default to Firebird may be beneficial, so lets do
that unconditionally now.

But 60db3d2c had apparently made a mistake,
setting the value returned from OGeneralPageWizard::getDatasourceName to
"sdbc:embedded:firebird" even though the corresponding "Connect to an exisiting
database" list in the new database wizard doesn't even support that (instead of
"sdbc:firebird:", which matches "Firebird File" in that list).  Fixed that now.

(Curiously, ODsnTypeCollection::getEmbeddedDatabase would read a
DefaultEmbeddedDatabase value from the configuration before resorting to the
hardcoded default, but `git log -SDefaultEmbeddedDatabase` makes it look like
there has never been any code to actually write that setting.)

Change-Id: I49b7430f5f8288a6a166ed9184cb438208d56ca1
Reviewed-on: https://gerrit.libreoffice.org/67449
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst a96014f1
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <stringconstants.hxx> #include <stringconstants.hxx>
#include <comphelper/documentconstants.hxx> #include <comphelper/documentconstants.hxx>
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <svtools/miscopt.hxx>
namespace dbaccess namespace dbaccess
{ {
...@@ -300,12 +299,7 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const ...@@ -300,12 +299,7 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const
} }
if ( sEmbeddedDatabaseURL.isEmpty() ) if ( sEmbeddedDatabaseURL.isEmpty() )
{ {
SvtMiscOptions aMiscOptions; sEmbeddedDatabaseURL = "sdbc:embedded:firebird";
if( aMiscOptions.IsExperimentalMode() )
sEmbeddedDatabaseURL = "sdbc:embedded:firebird";
else
sEmbeddedDatabaseURL = "sdbc:embedded:hsqldb";
} }
return sEmbeddedDatabaseURL; return sEmbeddedDatabaseURL;
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <unotools/confignode.hxx> #include <unotools/confignode.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <svtools/miscopt.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
namespace dbaui namespace dbaui
...@@ -597,11 +596,7 @@ namespace dbaui ...@@ -597,11 +596,7 @@ namespace dbaui
// Sets the default selected database on startup. // Sets the default selected database on startup.
if (m_pRB_CreateDatabase->IsChecked() ) if (m_pRB_CreateDatabase->IsChecked() )
{ {
SvtMiscOptions aMiscOptions; return m_pCollection->getTypeDisplayName( "sdbc:firebird:" );
if( aMiscOptions.IsExperimentalMode() )
return m_pCollection->getTypeDisplayName( "sdbc:embedded:firebird" );
else
return m_pCollection->getTypeDisplayName( "jdbc:" );
} }
return OGeneralPage::getDatasourceName( _rSet ); return OGeneralPage::getDatasourceName( _rSet );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment