Skip to content

Commit 610113d

Browse files
authored
Handle null JdbcMappingHint gracefully and improve SQL log formatting (#1262)
2 parents c743eef + 093b9f4 commit 610113d

File tree

6 files changed

+587
-8
lines changed

6 files changed

+587
-8
lines changed

doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ public <BASIC> Void visitInParameter(InParameter<BASIC> parameter, Context p)
116116
Wrapper<BASIC> wrapper = parameter.getWrapper();
117117
p.appendRawSql("?, ");
118118
p.appendFormattedSql(
119-
wrapper.accept(config.getDialect().getSqlLogFormattingVisitor(), formattingFunction, null));
119+
wrapper.accept(
120+
config.getDialect().getSqlLogFormattingVisitor(), formattingFunction, parameter));
120121
p.appendFormattedSql(", ");
121122
p.addParameter(parameter);
122123
return null;

doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ public <BASIC, CONTAINER> void addLiteralValue(Scalar<BASIC, CONTAINER> scalar)
988988
String literal =
989989
scalar
990990
.getWrapper()
991-
.accept(config.getDialect().getSqlLogFormattingVisitor(), formattingFunction, null);
991+
.accept(config.getDialect().getSqlLogFormattingVisitor(), formattingFunction, scalar);
992992
rawSqlBuf.append(literal);
993993
formattedSqlBuf.append(literal);
994994
}
@@ -1009,7 +1009,8 @@ protected <BASIC> void appendParameterInternal(InParameter<BASIC> parameter) {
10091009
String formatted =
10101010
parameter
10111011
.getWrapper()
1012-
.accept(config.getDialect().getSqlLogFormattingVisitor(), formattingFunction, null);
1012+
.accept(
1013+
config.getDialect().getSqlLogFormattingVisitor(), formattingFunction, parameter);
10131014
formattedSqlBuf.append(formatted);
10141015
}
10151016

doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ public <BASIC> void appendParameter(InParameter<BASIC> parameter) {
6666
rawSql.append("?");
6767
Wrapper<BASIC> wrapper = parameter.getWrapper();
6868
formattedSql.append(
69-
wrapper.accept(config.getDialect().getSqlLogFormattingVisitor(), formattingFunction, null));
69+
wrapper.accept(
70+
config.getDialect().getSqlLogFormattingVisitor(), formattingFunction, parameter));
7071
parameters.add(parameter);
7172
}
7273

0 commit comments

Comments
 (0)