This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2ca8894a59b Fix set OnDuplicateKeyColumnsSegment on
PostgreSQLInsertStatement (#34425)
2ca8894a59b is described below
commit 2ca8894a59bf3b5c008e4859a24ee66e59696ea0
Author: shijie wang <328931...@qq.com>
AuthorDate: Fri Jan 31 20:43:29 2025 +0800
Fix set OnDuplicateKeyColumnsSegment on PostgreSQLInsertStatement (#34425)
* fix set OnDuplicateKeyColumnsSegment on PostgreSQLInsertStatement
* fix set OnDuplicateKeyColumnsSegment on OpenGaussInsertStatement
---------
Co-authored-by: wang.shijie <wang.shi...@zhaopin.com.cn>
---
.../parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java | 2 +-
.../postgresql/visitor/statement/PostgreSQLStatementVisitor.java | 2 +-
.../sql/parser/statement/opengauss/dml/OpenGaussInsertStatement.java | 4 ++--
.../parser/statement/postgresql/dml/PostgreSQLInsertStatement.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
index 00d0758eb98..c9d89c6f04e 100644
---
a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
+++
b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
@@ -707,7 +707,7 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
OpenGaussInsertStatement result = (OpenGaussInsertStatement)
visit(ctx.insertRest());
result.setTable((SimpleTableSegment) visit(ctx.insertTarget()));
if (null != ctx.optOnDuplicateKey()) {
-
result.setOnDuplicateKeyColumnsSegment((OnDuplicateKeyColumnsSegment)
visit(ctx.optOnDuplicateKey()));
+ result.setOnDuplicateKeyColumns((OnDuplicateKeyColumnsSegment)
visit(ctx.optOnDuplicateKey()));
}
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
diff --git
a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
index 123cd9fc4ef..704caff98c7 100644
---
a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
+++
b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
@@ -704,7 +704,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
PostgreSQLInsertStatement result = (PostgreSQLInsertStatement)
visit(ctx.insertRest());
result.setTable((SimpleTableSegment) visit(ctx.insertTarget()));
if (null != ctx.optOnConflict()) {
-
result.setOnDuplicateKeyColumnsSegment((OnDuplicateKeyColumnsSegment)
visit(ctx.optOnConflict()));
+ result.setOnDuplicateKeyColumns((OnDuplicateKeyColumnsSegment)
visit(ctx.optOnConflict()));
}
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
diff --git
a/parser/sql/statement/type/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/statement/opengauss/dml/OpenGaussInsertStatement.java
b/parser/sql/statement/type/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/statement/opengauss/dml/OpenGaussInsertStatement.java
index a71726a1b03..61d2081fc55 100644
---
a/parser/sql/statement/type/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/statement/opengauss/dml/OpenGaussInsertStatement.java
+++
b/parser/sql/statement/type/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/statement/opengauss/dml/OpenGaussInsertStatement.java
@@ -34,7 +34,7 @@ public final class OpenGaussInsertStatement extends
InsertStatement implements O
private WithSegment withSegment;
- private OnDuplicateKeyColumnsSegment onDuplicateKeyColumnsSegment;
+ private OnDuplicateKeyColumnsSegment onDuplicateKeyColumns;
private ReturningSegment returningSegment;
@@ -45,7 +45,7 @@ public final class OpenGaussInsertStatement extends
InsertStatement implements O
@Override
public Optional<OnDuplicateKeyColumnsSegment> getOnDuplicateKeyColumns() {
- return Optional.ofNullable(onDuplicateKeyColumnsSegment);
+ return Optional.ofNullable(onDuplicateKeyColumns);
}
@Override
diff --git
a/parser/sql/statement/type/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/statement/postgresql/dml/PostgreSQLInsertStatement.java
b/parser/sql/statement/type/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/statement/postgresql/dml/PostgreSQLInsertStatement.java
index c2712e78dff..5f8aa9585d9 100644
---
a/parser/sql/statement/type/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/statement/postgresql/dml/PostgreSQLInsertStatement.java
+++
b/parser/sql/statement/type/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/statement/postgresql/dml/PostgreSQLInsertStatement.java
@@ -34,7 +34,7 @@ public final class PostgreSQLInsertStatement extends
InsertStatement implements
private WithSegment withSegment;
- private OnDuplicateKeyColumnsSegment onDuplicateKeyColumnsSegment;
+ private OnDuplicateKeyColumnsSegment onDuplicateKeyColumns;
private ReturningSegment returningSegment;
@@ -45,7 +45,7 @@ public final class PostgreSQLInsertStatement extends
InsertStatement implements
@Override
public Optional<OnDuplicateKeyColumnsSegment> getOnDuplicateKeyColumns() {
- return Optional.ofNullable(onDuplicateKeyColumnsSegment);
+ return Optional.ofNullable(onDuplicateKeyColumns);
}
@Override
