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

diff --git a/docs/changes.txt b/docs/changes.txt
index 462bec058a4514228a4ce67a6926669dc245fb02..33f4128f38befa671d5218ca5143d270e87bdae5 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -84,6 +84,7 @@ All:
   Previously, only the buffer would be returned, even if more data was requested.
 - Added wxPowerEvent (currently MSW-only).
 - Make wx-config compatible with Bourne shells.
+- Fixed wxDb::Open(wxDbConnectInf) when using connection string (Hellwolf Misty)
 
 All (GUI):
 

diff --git a/src/common/db.cpp b/src/common/db.cpp
index b1640ae1dd64923f96c30c87dab9cb68b2f27647..d7843f4f39667bb3088d6d7377d0dbfcbcf6ea9e 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -920,7 +920,7 @@ bool wxDb::Open(wxDbConnectInf *dbConnectInf, bool failOnDataTypeUnsupported)
 
     // Use the connection string if one is present
     if (dbConnectInf->UseConnectionStr())
-        return Open(GetConnectionInStr(), failOnDataTypeUnsupported);
+        return Open(dbConnectInf->GetConnectionStr(), failOnDataTypeUnsupported);
     else
         return Open(dbConnectInf->GetDsn(), dbConnectInf->GetUserID(),
                     dbConnectInf->GetPassword(), failOnDataTypeUnsupported);