You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2019/11/02 09:39:32 UTC
[cayenne] branch master updated (cc72e5a -> 426cd92)
This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git.
from cc72e5a Asciidoc: angle bracket syntax is recognized by IDEA, while "xref" is not
new d814dca minor edits
new 426cd92 minor edits
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc | 8 ++++----
.../docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
[cayenne] 01/02: minor edits
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit d814dca7dd97b03c21c7700407d4da22192d4d26
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Nov 2 12:31:45 2019 +0300
minor edits
---
.../src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc
index 58429ce..7184aa0 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc
@@ -16,8 +16,8 @@
SQL is very powerful and allows to manipulate data in ways that can not always be described as a graph of related entities.
Cayenne acknowledges this fact and provides a facility to execute SQL, sometimes allowing to map results back to
persistent objects. `SQLSelect` and `SQLExec` are a pair of queries that allow to run native SQL. `SQLSelect` can be
-used (as name suggests) to select custom data in form of entities, separate columns, collection of `DataRow` or Object[].
-`SQLExec` is designed to execute any raw SQL code (e.g. updates, deletes, DDLs, etc.).
+used (as the name suggests) to select custom data in form of entities, separate columns, collection of `DataRow` or
+`Object[]`. `SQLExec` is designed to execute any SQL (e.g. updates, deletes, DDLs, etc.).
Both queries support advanced SQL templating, with variable substitution and special directives as described
<<sqlscripting,in the next chapter>>. Here we'll just provide a few simple examples:
@@ -39,12 +39,12 @@ List<String> paintingNames = SQLSelect
// Selecting DataRow with predefined types
List<DataRow> result = SQLSelect
- .dataRowQuery("SELECT * FROM ARTIST", Integer.class, String.class, LocalDateTime.class)
+ .dataRowQuery("SELECT * FROM ARTIST", Integer.class, String.class, LocalDate.class)
.select(context);
// Selecting Object[] with predefined types
List<Object[]> result = SQLSelect
- .scalarQuery("SELECT * FROM ARTIST", Integer.class, String.class, LocalDateTime.class)
+ .scalarQuery("SELECT * FROM ARTIST", Integer.class, String.class, LocalDate.class)
.select(context);
----
[cayenne] 02/02: minor edits
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 426cd925cb62450c2ce78f99ad4892a2ccdd926d
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Nov 2 12:33:02 2019 +0300
minor edits
---
.../src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc
index 1d9ccf1..5d3ebe7 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc
@@ -14,8 +14,8 @@
[#sqlscripting]
==== Scripting SQL Queries
-A powerful feature of `SQLSelect` and `SQLExec` is that a SQL string is treated by Cayenne as a dynamic template. Before
-sending it to DB as a PreparedStatement, the String is evaluated, resolving the dynamic parts. The two main scripting
+A powerful feature of `SQLSelect` and `SQLExec` is that SQL string is treated by Cayenne as a dynamic template. Before
+creating a PreparedStatement, the String is evaluated, resolving its dynamic parts. The two main scripting
elements are "variables" (that look like `$var`) and "directives" (that look like `#directive(p1 p2 p3)`). In the discussion
below we'll use both selecting and updating examples, as scripting works the same way for both `SQLSelect` and `SQLExec`.