CAY-2443 Make SqlTemplate and SqlExec possible to return generated keys - naming and javadoc
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fcdd5fd5 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fcdd5fd5 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fcdd5fd5 Branch: refs/heads/master Commit: fcdd5fd5c515f62b9c28c9843062c40e0af96fea Parents: d5d3360 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Jul 11 15:23:18 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Jul 11 15:23:18 2018 +0300 ---------------------------------------------------------------------- .../apache/cayenne/access/jdbc/SQLTemplateAction.java | 4 ++-- .../src/main/java/org/apache/cayenne/query/SQLExec.java | 12 +++++++----- .../main/java/org/apache/cayenne/query/SQLTemplate.java | 3 +-- .../test/java/org/apache/cayenne/query/SQLExecIT.java | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcdd5fd5/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 cd44f01..b90ad69 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 @@ -186,8 +186,8 @@ public class SQLTemplateAction implements SQLAction { long t1 = System.currentTimeMillis(); boolean iteratedResult = callback.isIteratedResult(); - PreparedStatement statement = connection.prepareStatement(compiled.getSql(), - query.isReturnGeneratedKeys() ? Statement.RETURN_GENERATED_KEYS : Statement.NO_GENERATED_KEYS); + int generatedKeys = query.isReturnGeneratedKeys() ? Statement.RETURN_GENERATED_KEYS : Statement.NO_GENERATED_KEYS; + PreparedStatement statement = connection.prepareStatement(compiled.getSql(), generatedKeys); try { bind(statement, compiled.getBindings()); http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcdd5fd5/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java index 4ad4a22..aaf7b40 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java @@ -200,21 +200,23 @@ public class SQLExec extends IndirectQuery { } /** + * @return returnGeneratedKeys flag value + * * @since 4.1 - * @return returnGeneratedKeys flag */ public boolean isReturnGeneratedKeys() { return returnGeneratedKeys; } /** - * Sets flag to return generated keys. + * Flag indicating that generated keys should be returned by this query execution. + * Generated keys could be read via {@link QueryResponse#currentList()} method * + * @param returnGeneratedKeys flag value + * @see java.sql.Statement#RETURN_GENERATED_KEYS * @since 4.1 - * @param returnGeneratedKeys - * @return SQLExec query */ - public SQLExec setReturnGeneratedKeys(boolean returnGeneratedKeys) { + public SQLExec returnGeneratedKeys(boolean returnGeneratedKeys) { this.returnGeneratedKeys = returnGeneratedKeys; return this; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcdd5fd5/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java index e5e1250..cc1ded8 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java @@ -637,9 +637,9 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery { } /** + * @return returnGeneratedKeys flag * * @since 4.1 - * @return returnGeneratedKeys flag */ public boolean isReturnGeneratedKeys() { return returnGeneratedKeys; @@ -649,7 +649,6 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery { * Sets flag to return generated keys. * * @since 4.1 - * @param returnGeneratedKeys */ public void setReturnGeneratedKeys(boolean returnGeneratedKeys) { this.returnGeneratedKeys = returnGeneratedKeys; http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcdd5fd5/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java index 7bdbbd9..f04749e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java @@ -61,12 +61,12 @@ public class SQLExecIT extends ServerCase { public void testReturnGeneratedKeys() { if(unitDbAdapter.supportsGeneratedKeys()) { QueryResult response = SQLExec.query("testmap", "INSERT INTO GENERATED_COLUMN (NAME) VALUES ('Surikov')") - .setReturnGeneratedKeys(true) + .returnGeneratedKeys(true) .execute(context); assertEquals(2, response.size()); QueryResult response1 = SQLExec.query("testmap", "INSERT INTO GENERATED_COLUMN (NAME) VALUES ('Sidorov')") - .setReturnGeneratedKeys(false) + .returnGeneratedKeys(false) .execute(context); assertEquals(1, response1.size()); }
