You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/07/16 06:58:29 UTC
svn commit: r677154 - in /logging/log4cxx/trunk/src: changes/changes.xml
main/cpp/odbcappender.cpp
Author: carnold
Date: Tue Jul 15 21:58:29 2008
New Revision: 677154
URL: http://svn.apache.org/viewvc?rev=677154&view=rev
Log:
LOGCXX-300: ODBCAppender connection settings broken (or just half changed)
Modified:
logging/log4cxx/trunk/src/changes/changes.xml
logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp
Modified: logging/log4cxx/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/changes.xml?rev=677154&r1=677153&r2=677154&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/changes/changes.xml (original)
+++ logging/log4cxx/trunk/src/changes/changes.xml Tue Jul 15 21:58:29 2008
@@ -48,6 +48,7 @@
<action issue="LOGCXX-292">Value continuation does not properly handle CRLF in property files.<action>
<action issue="LOGCXX-293">Escape sequences not recognized in property files.<action>
<action issue="LOGCXX-299">odbcappender.cpp does not compile with unixODBC on linux.</action>
+<action issue="LOGCXX-300">ODBCAppender connection settings broken (or just have changed).</action>
<action issue="LOGCXX-304">BasicConfigurator::configure results in writer not set warning.</action>
</release>
<release version="0.10.0" date="2008-04-03" description="First Apache release">
Modified: logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp?rev=677154&r1=677153&r2=677154&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp Tue Jul 15 21:58:29 2008
@@ -238,16 +238,15 @@
}
- SQLWCHAR* wURL;
+ SQLWCHAR *wURL, *wUser, *wPwd;
encode(&wURL, databaseURL, p);
+ encode(&wUser, databaseUser, p);
+ encode(&wPwd, databasePassword, p);
- SQLWCHAR szOutConnectionString[1024];
- SQLSMALLINT nOutConnctionLength = 0;
-
- ret = SQLDriverConnectW( connection, NULL,
+ ret = SQLConnectW( connection,
wURL, SQL_NTS,
- szOutConnectionString, sizeof( szOutConnectionString ),
- &nOutConnctionLength, SQL_DRIVER_NOPROMPT );
+ wUser, SQL_NTS,
+ wPwd, SQL_NTS);
if (ret < 0)