ISPN-15717: [Follow-up] Fix proto schema, cache configuration in SQL

store config
infinispan · Mar 20, 2024 · d13e825 · d13e825
1 parent 047e998
commit d13e825
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/documentation/src/main/asciidoc/topics/code_examples/PersistenceSqlQuery.java b/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 WHERE t1.name = :name AND t2.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 ON 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")

diff --git a/documentation/src/main/asciidoc/topics/json/persistence_sql_query.json b/documentation/src/main/asciidoc/topics/json/persistence_sql_query.json
@@ -5,8 +5,14 @@
         "dialect": "POSTGRES",
         "shared": "true",
         "key-columns": "name",
+        "connection-pool": {
+          "username": "postgres",
+          "password": "changeme",
+          "driver": "org.postgresql.Driver",
+          "connection-url": "jdbc:postgresql://localhost:5432/postgres"
+        },
         "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-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 = :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",

diff --git a/documentation/src/main/asciidoc/topics/protobuf/person-db-table.proto b/documentation/src/main/asciidoc/topics/protobuf/person-db-table.proto
@@ -1,6 +1,6 @@
 package com.example;
 
-import com.example.Address;
+import "/path/to/address.proto";
 
 enum Sex {
    FEMALE = 1;

diff --git a/documentation/src/main/asciidoc/topics/xml/persistence_sql_query.xml b/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 WHERE t1.name = :name AND t2.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 ON 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"

diff --git a/documentation/src/main/asciidoc/topics/yaml/persistence_sql_query.yaml b/documentation/src/main/asciidoc/topics/yaml/persistence_sql_query.yaml
@@ -4,8 +4,13 @@ distributedCache:
       dialect: "POSTGRES"
       shared: "true"
       keyColumns: "name"
+      connectionPool: 
+        username: "postgres"
+        password: "changeme"
+        driver: "org.postgresql.Driver"
+        connectionUrl: "jdbc:postgresql://localhost:5432/postgres"      
       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 WHERE t1.name = :name AND t2.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 ON 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"