[cayenne] branch master updated: CAY-2659 Use new SQLBuilder utility to generate SQL for batch queries

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new a857b9e  CAY-2659 Use new SQLBuilder utility to generate SQL for batch 
queries
a857b9e is described below

commit a857b9ea78fcbcf65a2fe3016d5e03ef7c34c16e
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Fri May 29 11:38:21 2020 +0300

    CAY-2659 Use new SQLBuilder utility to generate SQL for batch queries
---
 .../java/org/apache/cayenne/access/sqlbuilder/InsertBuilder.java  | 4 ++--
 .../java/org/apache/cayenne/access/sqlbuilder/UpdateBuilder.java  | 4 ++--
 .../sqlbuilder/sqltree/{ValuesNode.java => InsertValuesNode.java} | 8 ++++++--
 .../org/apache/cayenne/access/sqlbuilder/sqltree/NodeType.java    | 3 ++-
 .../sqlbuilder/sqltree/{SetNode.java => UpdateSetNode.java}       | 6 +++---
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/InsertBuilder.java
 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/InsertBuilder.java
index 2c112f5..fa1e3c7 100644
--- 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/InsertBuilder.java
+++ 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/InsertBuilder.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.access.sqlbuilder;
 import org.apache.cayenne.access.sqlbuilder.sqltree.InsertColumnsNode;
 import org.apache.cayenne.access.sqlbuilder.sqltree.InsertNode;
 import org.apache.cayenne.access.sqlbuilder.sqltree.TableNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.ValuesNode;
+import org.apache.cayenne.access.sqlbuilder.sqltree.InsertValuesNode;
 
 /**
  * @since 4.2
@@ -48,7 +48,7 @@ public class InsertBuilder extends BaseBuilder {
     }
 
     public InsertBuilder value(ValueNodeBuilder valueNode) {
-        node(VALUES_NODE, ValuesNode::new).addChild(valueNode.build());
+        node(VALUES_NODE, InsertValuesNode::new).addChild(valueNode.build());
         return this;
     }
 }
diff --git 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilder.java
 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilder.java
index 429ac8f..4dad52a 100644
--- 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilder.java
+++ 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilder.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.access.sqlbuilder;
 
-import org.apache.cayenne.access.sqlbuilder.sqltree.SetNode;
+import org.apache.cayenne.access.sqlbuilder.sqltree.UpdateSetNode;
 import org.apache.cayenne.access.sqlbuilder.sqltree.TableNode;
 import org.apache.cayenne.access.sqlbuilder.sqltree.UpdateNode;
 import org.apache.cayenne.access.sqlbuilder.sqltree.WhereNode;
@@ -39,7 +39,7 @@ public class UpdateBuilder extends BaseBuilder {
     }
 
     public UpdateBuilder set(NodeBuilder setExpression) {
-        node(SET_NODE, SetNode::new).addChild(setExpression.build());
+        node(SET_NODE, UpdateSetNode::new).addChild(setExpression.build());
         return this;
     }
 
diff --git 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/ValuesNode.java
 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/InsertValuesNode.java
similarity index 90%
rename from 
cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/ValuesNode.java
rename to 
cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/InsertValuesNode.java
index fb82fc7..695af52 100644
--- 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/ValuesNode.java
+++ 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/InsertValuesNode.java
@@ -24,11 +24,15 @@ import 
org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
 /**
  * @since 4.2
  */
-public class ValuesNode extends Node {
+public class InsertValuesNode extends Node {
+
+    public InsertValuesNode() {
+        super(NodeType.INSERT_VALUES);
+    }
 
     @Override
     public Node copy() {
-        return new ValuesNode();
+        return new InsertValuesNode();
     }
 
     @Override
diff --git 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/NodeType.java
 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/NodeType.java
index af5b222..575d330 100644
--- 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/NodeType.java
+++ 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/NodeType.java
@@ -37,5 +37,6 @@ public enum NodeType {
     JOIN,
     FROM,
     UPDATE_SET,
-    INSERT_COLUMNS
+    INSERT_COLUMNS,
+    INSERT_VALUES
 }
diff --git 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/SetNode.java
 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/UpdateSetNode.java
similarity index 93%
rename from 
cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/SetNode.java
rename to 
cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/UpdateSetNode.java
index eb57d2d..7c20a60 100644
--- 
a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/SetNode.java
+++ 
b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/UpdateSetNode.java
@@ -24,15 +24,15 @@ import 
org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
 /**
  * @since 4.2
  */
-public class SetNode extends Node {
+public class UpdateSetNode extends Node {
 
-    public SetNode() {
+    public UpdateSetNode() {
         super(NodeType.UPDATE_SET);
     }
 
     @Override
     public Node copy() {
-        return new SetNode();
+        return new UpdateSetNode();
     }
 
     @Override