This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 345cf3c3dd7 Refactor
DialectPipelineSQLBuilder.buildInsertSQLOnDuplicateClause() (#27183)
345cf3c3dd7 is described below
commit 345cf3c3dd726b480900cac29fb0d3f7c6bf5967
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jul 13 23:05:02 2023 +0800
Refactor DialectPipelineSQLBuilder.buildInsertSQLOnDuplicateClause()
(#27183)
* Refactor DialectPipelineSQLBuilder.buildInsertSQLOnDuplicateClause()
* Refactor DialectPipelineSQLBuilder.buildInsertSQLOnDuplicateClause()
---
.../data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java | 2 +-
.../pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java | 8 ++++----
.../opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java | 2 +-
.../opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java | 2 +-
.../postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java | 2 +-
.../postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java
index 57ee91a4a07..c3e2a0f107f 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java
@@ -35,7 +35,7 @@ public final class MySQLPipelineSQLBuilder implements
DialectPipelineSQLBuilder
@Override
public Optional<String> buildInsertSQLOnDuplicateClause(final String
schemaName, final DataRecord dataRecord) {
- StringBuilder result = new StringBuilder(" ON DUPLICATE KEY UPDATE ");
+ StringBuilder result = new StringBuilder("ON DUPLICATE KEY UPDATE ");
for (int i = 0; i < dataRecord.getColumnCount(); i++) {
Column column = dataRecord.getColumn(i);
if (!column.isUpdated()) {
diff --git
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java
index 8e2ede5dc0d..50b725c6ccc 100644
---
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java
+++
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java
@@ -34,15 +34,15 @@ class MySQLPipelineSQLBuilderTest {
private final MySQLPipelineSQLBuilder sqlBuilder = new
MySQLPipelineSQLBuilder();
@Test
- void assertBuildInsertSQLOnDuplicatePart() {
+ void assertBuildInsertSQLOnDuplicateClause() {
String actual = sqlBuilder.buildInsertSQLOnDuplicateClause(null,
mockDataRecord("t1")).orElse(null);
- assertThat(actual, is(" ON DUPLICATE KEY UPDATE
c1=VALUES(c1),c2=VALUES(c2),c3=VALUES(c3)"));
+ assertThat(actual, is("ON DUPLICATE KEY UPDATE
c1=VALUES(c1),c2=VALUES(c2),c3=VALUES(c3)"));
}
@Test
- void assertBuildInsertSQLOnDuplicatePartHasShardingColumn() {
+ void assertBuildInsertSQLOnDuplicateClauseHasShardingColumn() {
String actual = sqlBuilder.buildInsertSQLOnDuplicateClause(null,
mockDataRecord("t2")).orElse(null);
- assertThat(actual, is(" ON DUPLICATE KEY UPDATE
c1=VALUES(c1),c2=VALUES(c2),c3=VALUES(c3)"));
+ assertThat(actual, is("ON DUPLICATE KEY UPDATE
c1=VALUES(c1),c2=VALUES(c2),c3=VALUES(c3)"));
}
@Test
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java
index 731f2dd1edf..1f3f22fd3e3 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java
@@ -39,7 +39,7 @@ public final class OpenGaussPipelineSQLBuilder implements
DialectPipelineSQLBuil
@Override
public Optional<String> buildInsertSQLOnDuplicateClause(final String
schemaName, final DataRecord dataRecord) {
- StringBuilder result = new StringBuilder(" ON DUPLICATE KEY UPDATE ");
+ StringBuilder result = new StringBuilder("ON DUPLICATE KEY UPDATE ");
for (int i = 0; i < dataRecord.getColumnCount(); i++) {
Column column = dataRecord.getColumn(i);
if (column.isUniqueKey()) {
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java
b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java
index e761c17dc41..22283a5e2f3 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java
@@ -33,7 +33,7 @@ class OpenGaussPipelineSQLBuilderTest {
@Test
void assertBuildInsertSQLOnDuplicatePart() {
String actual = sqlBuilder.buildInsertSQLOnDuplicateClause(null,
mockDataRecord("t1")).orElse(null);
- assertThat(actual, is(" ON DUPLICATE KEY UPDATE
c0=EXCLUDED.c0,c1=EXCLUDED.c1,c2=EXCLUDED.c2,c3=EXCLUDED.c3"));
+ assertThat(actual, is("ON DUPLICATE KEY UPDATE
c0=EXCLUDED.c0,c1=EXCLUDED.c1,c2=EXCLUDED.c2,c3=EXCLUDED.c3"));
}
private DataRecord mockDataRecord(final String tableName) {
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java
index adbcc12768f..cdf123ac0dc 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java
@@ -49,7 +49,7 @@ public final class PostgreSQLPipelineSQLBuilder implements
DialectPipelineSQLBui
// Refer to https://www.postgresql.org/docs/current/sql-insert.html
private String buildConflictSQL(final DataRecord dataRecord) {
- StringBuilder result = new StringBuilder(" ON CONFLICT (");
+ StringBuilder result = new StringBuilder("ON CONFLICT (");
for (Column each : RecordUtils.extractPrimaryColumns(dataRecord)) {
result.append(each.getName()).append(',');
}
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java
index c9dc7af4173..3c55505c0b4 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java
@@ -33,9 +33,9 @@ class PostgreSQLPipelineSQLBuilderTest {
private final PostgreSQLPipelineSQLBuilder sqlBuilder = new
PostgreSQLPipelineSQLBuilder();
@Test
- void assertBuildInsertSQLOnDuplicatePart() {
+ void assertBuildInsertSQLOnDuplicateClause() {
String actual = sqlBuilder.buildInsertSQLOnDuplicateClause("schema1",
mockDataRecord()).orElse(null);
- assertThat(actual, is(" ON CONFLICT (order_id) DO UPDATE SET
user_id=EXCLUDED.user_id,status=EXCLUDED.status"));
+ assertThat(actual, is("ON CONFLICT (order_id) DO UPDATE SET
user_id=EXCLUDED.user_id,status=EXCLUDED.status"));
}
private DataRecord mockDataRecord() {
