Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Simon Rozman 2016-02-26 13:32:26 +01:00
parent b31e796049
commit a5454cb537
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ZRColaCompile/dbsource.cpp
View File

@ -27,6 +27,8 @@ ZRCola::DBSource::DBSource()
ZRCola::DBSource::~DBSource() ZRCola::DBSource::~DBSource()
{ {
if (m_db)
m_db->Close();
} }
@ -41,22 +43,18 @@ bool ZRCola::DBSource::Open(const wxString& filename)
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
// Open the database. // Open the database.
std::wstring cn; std::wstring cn;
//#ifdef __WIN64__
// cn = L"jdbc:odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};";
//#else
cn = L"Driver={Microsoft Access Driver (*.mdb)};"; cn = L"Driver={Microsoft Access Driver (*.mdb)};";
//#endif
cn += L"Dbq="; cn += L"Dbq=";
cn += filename.c_str(); cn += filename.c_str();
cn += L";Uid=;Pwd=;"; cn += L";Uid=;Pwd=;";
hr = m_db->Open(ATL::CComBSTR(cn.c_str())); hr = m_db->Open(ATL::CComBSTR(cn.c_str()));
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
// Database open and ready.
return true; return true;
} else {
m_db->Close();
} else
LogErrors();
wxLogMessage(_("Could not open database %s (%x)."), filename.c_str(), hr); wxLogMessage(_("Could not open database %s (%x)."), filename.c_str(), hr);
LogErrors();
}
m_db.Release(); m_db.Release();
} else } else
wxLogMessage(_("Creating ADOConnection object failed (%x)."), hr); wxLogMessage(_("Creating ADOConnection object failed (%x)."), hr);