You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/09/21 14:03:16 UTC
[1/3] cayenne git commit: CAY-2364 Wrong logging in SQLTemplate
Repository: cayenne
Updated Branches:
refs/heads/master a4075721b -> f4627713c
CAY-2364 Wrong logging in SQLTemplate
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/bb9f8cdc
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/bb9f8cdc
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/bb9f8cdc
Branch: refs/heads/master
Commit: bb9f8cdcbda33c01ea9bd6d00028812556ac4536
Parents: a407572
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Thu Sep 21 16:01:07 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Thu Sep 21 16:01:07 2017 +0300
----------------------------------------------------------------------
.../cayenne/access/jdbc/SQLTemplateAction.java | 47 +++++++++++---------
1 file changed, 27 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bb9f8cdc/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
index f5d8900..a1f4b3d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
@@ -53,7 +53,7 @@ import org.apache.cayenne.util.Util;
/**
* Implements a strategy for execution of SQLTemplates.
- *
+ *
* @since 1.2 replaces SQLTemplateExecutionPlan
*/
public class SQLTemplateAction implements SQLAction {
@@ -123,12 +123,25 @@ public class SQLTemplateAction implements SQLAction {
callback.nextBatchCount(query, ints);
}
+ private void bindExtendedTypes(ParameterBinding[] bindings) {
+ int i = 1;
+ for (ParameterBinding binding : bindings) {
+ Object value = binding.getValue();
+ ExtendedType extendedType = value != null
+ ? getAdapter().getExtendedTypes().getRegisteredType(value.getClass())
+ : getAdapter().getExtendedTypes().getDefaultType();
+ binding.setExtendedType(extendedType);
+ binding.setStatementPosition(i++);
+ }
+ }
+
private void runWithPositionalParameters(Connection connection, OperationObserver callback, String template,
- Collection<Number> counts, boolean loggable) throws Exception {
+ Collection<Number> counts, boolean loggable) throws Exception {
SQLStatement compiled = dataNode.getSqlTemplateProcessor().processTemplate(template,
query.getPositionalParams());
+ bindExtendedTypes(compiled.getBindings());
if (loggable) {
dataNode.getJdbcEventLogger().logQuery(compiled.getSql(), compiled.getBindings());
}
@@ -158,6 +171,7 @@ public class SQLTemplateAction implements SQLAction {
for (int i = 0; i < batchSize; i++) {
Map<String, ?> nextParameters = it.next();
SQLStatement compiled = dataNode.getSqlTemplateProcessor().processTemplate(template, nextParameters);
+ bindExtendedTypes(compiled.getBindings());
if (loggable) {
dataNode.getJdbcEventLogger().logQuery(compiled.getSql(), compiled.getBindings());
}
@@ -168,7 +182,7 @@ public class SQLTemplateAction implements SQLAction {
}
protected void execute(Connection connection, OperationObserver callback, SQLStatement compiled,
- Collection<Number> updateCounts) throws SQLException, Exception {
+ Collection<Number> updateCounts) throws SQLException, Exception {
long t1 = System.currentTimeMillis();
boolean iteratedResult = callback.isIteratedResult();
@@ -225,7 +239,7 @@ public class SQLTemplateAction implements SQLAction {
@SuppressWarnings({ "unchecked", "rawtypes" })
protected void processSelectResult(SQLStatement compiled, Connection connection, Statement statement,
- ResultSet resultSet, OperationObserver callback, final long startTime) throws Exception {
+ ResultSet resultSet, OperationObserver callback, final long startTime) throws Exception {
boolean iteratedResult = callback.isIteratedResult();
@@ -273,8 +287,8 @@ public class SQLTemplateAction implements SQLAction {
protected RowDescriptorBuilder configureRowDescriptorBuilder(SQLStatement compiled, ResultSet resultSet)
throws SQLException {
RowDescriptorBuilder builder = new RowDescriptorBuilder()
- .setResultSet(resultSet)
- .validateDuplicateColumnNames();
+ .setResultSet(resultSet)
+ .validateDuplicateColumnNames();
// SQLTemplate #result columns take precedence over other ways to determine the type
if (compiled.getResultColumns().length > 0) {
@@ -305,12 +319,12 @@ public class SQLTemplateAction implements SQLAction {
}
switch (query.getColumnNamesCapitalization()) {
- case LOWER:
- builder.useLowercaseColumnNames();
- break;
- case UPPER:
- builder.useUppercaseColumnNames();
- break;
+ case LOWER:
+ builder.useLowercaseColumnNames();
+ break;
+ case UPPER:
+ builder.useUppercaseColumnNames();
+ break;
}
return builder;
@@ -319,7 +333,7 @@ public class SQLTemplateAction implements SQLAction {
/**
* Extracts a template string from a SQLTemplate query. Exists mainly for
* the benefit of subclasses that can customize returned template.
- *
+ *
* @since 1.2
*/
protected String extractTemplateString() {
@@ -336,14 +350,7 @@ public class SQLTemplateAction implements SQLAction {
protected void bind(PreparedStatement preparedStatement, ParameterBinding[] bindings)
throws SQLException, Exception {
// bind parameters
- int i = 1;
for (ParameterBinding binding : bindings) {
- Object value = binding.getValue();
- ExtendedType extendedType = value != null
- ? getAdapter().getExtendedTypes().getRegisteredType(value.getClass())
- : getAdapter().getExtendedTypes().getDefaultType();
- binding.setExtendedType(extendedType);
- binding.setStatementPosition(i++);
dataNode.getAdapter().bindParameter(preparedStatement, binding);
}
[2/3] cayenne git commit: CAY-2364 Wrong logging in SQLTemplate
Posted by nt...@apache.org.
CAY-2364 Wrong logging in SQLTemplate
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/76818df3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/76818df3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/76818df3
Branch: refs/heads/master
Commit: 76818df3b69f87e8a0c91aef48a8957720edcdea
Parents: bb9f8cd
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Thu Sep 21 16:05:33 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Thu Sep 21 16:05:33 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/76818df3/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 248f092..6ee9ba9 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -42,6 +42,7 @@ CAY-2358 NPE when callbacks invoked on null objects
CAY-2359 EJBQL: db path in not supported in ORDER BY
CAY-2362 ColumnSelect: unable to use Property without type
CAY-2363 ColumnSelect: unable to use from nested context
+CAY-2364 Wrong logging in SQLTemplate
----------------------------------
Release: 4.0.B1
[3/3] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/241' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/241' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f4627713
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f4627713
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f4627713
Branch: refs/heads/master
Commit: f4627713c8d4c69fb03a73304664a3c30d1f5941
Parents: a407572 76818df
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Sep 21 17:00:49 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Sep 21 17:00:49 2017 +0300
----------------------------------------------------------------------
.../cayenne/access/jdbc/SQLTemplateAction.java | 47 +++++++++++---------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
2 files changed, 28 insertions(+), 20 deletions(-)
----------------------------------------------------------------------