diff options
Diffstat (limited to 'connectivity/source/drivers/firebird/FConnection.cxx')
| -rw-r--r-- | connectivity/source/drivers/firebird/FConnection.cxx | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx index 5efd16562a18..e72b87e42da3 100644 --- a/connectivity/source/drivers/firebird/FConnection.cxx +++ b/connectivity/source/drivers/firebird/FConnection.cxx @@ -103,7 +103,9 @@ static int pr_error(const ISC_STATUS* status, char* operation) return 1; } -void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OConnection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info, + const bool constructNewDatabase) + throw(SQLException) { SAL_INFO("connectivity.firebird", "=> OConnection::construct()."); @@ -113,10 +115,22 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV ISC_STATUS_ARRAY status; /* status vector */ - if (isc_attach_database(status, 0, "/var/tmp/libo-fb/new.fdb", &m_DBHandler, 0, NULL)) - if (pr_error(status, "attach database")) - return; - + if (constructNewDatabase) + { + if (isc_create_database(status, url.getLength(), OUStringToOString(url, RTL_TEXTENCODING_UTF8).getStr(), + &m_DBHandler, 0, NULL, 0)) + { + if(pr_error(status, "create new database")) + return; + } + } + else + { + if (isc_attach_database(status, url.getLength(), OUStringToOString(url, RTL_TEXTENCODING_UTF8).getStr(), + &m_DBHandler, 0, NULL)) + if (pr_error(status, "attach database")) + return; + } osl_atomic_decrement( &m_refCount ); } // XServiceInfo |