You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2020/12/13 17:30:11 UTC
[logging-log4j2] branch release-2.x updated: [LOG4J2-2976]
JdbcAppender composes an incorrect INSERT statement without a ColumnMapping
element.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 585fca1 [LOG4J2-2976] JdbcAppender composes an incorrect INSERT statement without a ColumnMapping element.
585fca1 is described below
commit 585fca13a17fc7211fe7149aa125ceedf1018c2f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Dec 13 12:30:06 2020 -0500
[LOG4J2-2976] JdbcAppender composes an incorrect INSERT statement
without a ColumnMapping element.
---
.../log4j/core/appender/db/jdbc/JdbcDatabaseManager.java | 16 ++++++++--------
src/changes/changes.xml | 3 +++
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
index 5117da8..5a6db17 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
@@ -359,14 +359,14 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
colMapping);
i++;
}
- if (data.columnConfigs != null) {
- for (final ColumnConfig colConfig : data.columnConfigs) {
- final String columnName = colConfig.getColumnName();
- appendColumnName(i, columnName, sb);
- logger().trace(messagePattern, sqlVerb, colConfig.getClass().getSimpleName(), i, columnName,
- colConfig);
- i++;
- }
+ }
+ if (data.columnConfigs != null) {
+ for (final ColumnConfig colConfig : data.columnConfigs) {
+ final String columnName = colConfig.getColumnName();
+ appendColumnName(i, columnName, sb);
+ logger().trace(messagePattern, sqlVerb, colConfig.getClass().getSimpleName(), i, columnName,
+ colConfig);
+ i++;
}
}
}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6db8070..03dba8a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -102,6 +102,9 @@
<action issue="LOG4J2-2967" dev="ckozak" type="fix">
Fix JsonTemplateLayout index based parameter resolution when messages contain too few parameters.
</action>
+ <action issue="LOG4J2-2976" dev="ckozak" type="fix">
+ JdbcAppender composes an incorrect INSERT statement without a ColumnMapping element.
+ </action>
</release>
<release version="2.14.0" date="2020-11-06" description="GA Release 2.14.0">
<action issue="LOG4J2-2925" dev="rgoers" type="fix">