ISPN-15717: Fix proto schema, cache configuration in SQL store config

documentation/src/main/asciidoc/topics/code_examples/PersistenceSqlQuery.java

@@ -4,7 +4,7 @@
       .shared("true")
       .keyColumns("name")
       .queriesJdbcConfigurationBuilder()
-         .select("SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 ON t1.name = t2.name WHERE t1.name = :name")
+         .select("SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 WHERE t1.name = :name AND t2.name = :name")
          .selectAll("SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 ON t1.name = t2.name")
          .delete("DELETE FROM Person t1 WHERE t1.name = :name; DELETE FROM Address t2 where t2.name = :name")
          .deleteAll("DELETE FROM Person; DELETE FROM Address")

documentation/src/main/asciidoc/topics/json/persistence_sql_query.json

@@ -6,7 +6,7 @@
         "shared": "true",
         "key-columns": "name",
         "queries": {
-          "select-single": "SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 ON t1.name = t2.name WHERE t1.name = :name",
+          "select-single": "SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 WHERE t1.name = :name AND t2.name = :name",
           "select-all": "SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 ON t1.name = t2.name",
           "delete-single": "DELETE FROM Person t1 WHERE t1.name = :name; DELETE FROM Address t2 where t2.name = :name",
           "delete-all": "DELETE FROM Person; DELETE FROM Address",

documentation/src/main/asciidoc/topics/protobuf/address-db-table.proto

@@ -1,4 +1,4 @@
-package com.example
+package com.example;
 
 message Address {
    optional string street = 1;

documentation/src/main/asciidoc/topics/protobuf/person-db-table.proto

@@ -1,5 +1,7 @@
 package com.example;
 
+import com.example.Address;
+
 enum Sex {
    FEMALE = 1;
    MALE = 2;

documentation/src/main/asciidoc/topics/ref_sql_store_query_configuration.adoc

@@ -26,17 +26,18 @@ include::sql/address.sql[]
 
 Protobuf schema for the "person" and "address" tables are as follows:
 
+.Protobuf schema for the "address" table
+[source,proto,options="nowrap",subs=attributes+,role="secondary"]
+----
+include::protobuf/address-db-table.proto[]
+----
+
 .Protobuf schema for the "person" table
 [source,proto,options="nowrap",subs=attributes+,role="primary"]
 ----
 include::protobuf/person-db-table.proto[]
 ----
 
-.Protobuf schema for the "address" table
-[source,proto,options="nowrap",subs=attributes+,role="secondary"]
-----
-include::protobuf/address-db-table.proto[]
-----
 
 [discrete]
 == Cache configuration

documentation/src/main/asciidoc/topics/xml/persistence_sql_query.xml

@@ -7,7 +7,7 @@
                             connection-url="jdbc:postgresql://localhost:5432/postgres"
                             username="postgres"
                             password="changeme"/>
-      <queries select-single="SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 ON t1.name = t2.name WHERE t1.name = :name"
+      <queries select-single="SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 WHERE t1.name = :name AND t2.name = :name"
         select-all="SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 ON t1.name = t2.name"
         delete-single="DELETE FROM Person t1 WHERE t1.name = :name; DELETE FROM Address t2 where t2.name = :name"
         delete-all="DELETE FROM Person; DELETE FROM Address"

documentation/src/main/asciidoc/topics/yaml/persistence_sql_query.yaml

@@ -5,7 +5,7 @@ distributedCache:
       shared: "true"
       keyColumns: "name"
       queries:
-        selectSingle: "SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 ON t1.name = t2.name WHERE t1.name = :name"
+        selectSingle: "SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 WHERE t1.name = :name AND t2.name = :name"
         selectAll: "SELECT t1.name, t1.picture, t1.sex, t1.birthdate, t1.accepted_tos, t2.street, t2.city, t2.zip FROM Person t1 JOIN Address t2 ON t1.name = t2.name"
         deleteSingle: "DELETE FROM Person t1 WHERE t1.name = :name; DELETE FROM Address t2 where t2.name = :name"
         deleteAll: "DELETE FROM Person; DELETE FROM Address"