This is an automated email from the ASF dual-hosted git repository. rmiddleton pushed a commit to branch odbc-appender-remove-layout in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit aec3b0da68a03360dd62cc998084565b22f496b3 Author: Robert Middleton <[email protected]> AuthorDate: Mon May 1 18:11:46 2023 -0400 Remove the layout for the ODBC appender, since we only insert into columns --- src/main/cpp/odbcappender.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp index b5202c6b..f6f93158 100644 --- a/src/main/cpp/odbcappender.cpp +++ b/src/main/cpp/odbcappender.cpp @@ -192,7 +192,7 @@ void ODBCAppender::setOption(const LogString& option, const LogString& value) bool ODBCAppender::requiresLayout() const { - return _priv->parameterValue.empty(); + return false; } void ODBCAppender::activateOptions(log4cxx::helpers::Pool&) @@ -248,9 +248,7 @@ void ODBCAppender::append(const spi::LoggingEventPtr& event, log4cxx::helpers::P LogString ODBCAppender::getLogStatement(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) const { - LogString sbuf; - getLayout()->format(sbuf, event, p); - return sbuf; + return event->getMessage(); } void ODBCAppender::execute(const LogString& sql, log4cxx::helpers::Pool& p) @@ -645,23 +643,7 @@ void ODBCAppender::flushBuffer(Pool& p) void ODBCAppender::setSql(const LogString& s) { - _priv->sqlStatement = s; - - if (getLayout() == 0) - { - this->setLayout(std::make_shared<PatternLayout>(s)); - } - else - { - PatternLayoutPtr patternLayout; - LayoutPtr asLayout = this->getLayout(); - patternLayout = log4cxx::cast<PatternLayout>(asLayout); - - if (patternLayout != 0) - { - patternLayout->setConversionPattern(s); - } - } + _priv->sqlStatement = s; } #if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32)
