fix Open(wxDbConnectInf) when using connection string (patch 1494705)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
de6fbe7596
commit
27b3bd6a59
@ -84,6 +84,7 @@ All:
|
|||||||
Previously, only the buffer would be returned, even if more data was requested.
|
Previously, only the buffer would be returned, even if more data was requested.
|
||||||
- Added wxPowerEvent (currently MSW-only).
|
- Added wxPowerEvent (currently MSW-only).
|
||||||
- Make wx-config compatible with Bourne shells.
|
- Make wx-config compatible with Bourne shells.
|
||||||
|
- Fixed wxDb::Open(wxDbConnectInf) when using connection string (Hellwolf Misty)
|
||||||
|
|
||||||
All (GUI):
|
All (GUI):
|
||||||
|
|
||||||
|
@ -920,7 +920,7 @@ bool wxDb::Open(wxDbConnectInf *dbConnectInf, bool failOnDataTypeUnsupported)
|
|||||||
|
|
||||||
// Use the connection string if one is present
|
// Use the connection string if one is present
|
||||||
if (dbConnectInf->UseConnectionStr())
|
if (dbConnectInf->UseConnectionStr())
|
||||||
return Open(GetConnectionInStr(), failOnDataTypeUnsupported);
|
return Open(dbConnectInf->GetConnectionStr(), failOnDataTypeUnsupported);
|
||||||
else
|
else
|
||||||
return Open(dbConnectInf->GetDsn(), dbConnectInf->GetUserID(),
|
return Open(dbConnectInf->GetDsn(), dbConnectInf->GetUserID(),
|
||||||
dbConnectInf->GetPassword(), failOnDataTypeUnsupported);
|
dbConnectInf->GetPassword(), failOnDataTypeUnsupported);
|
||||||
|
Loading…
Reference in New Issue
Block a user