Skip to content

Commit 211337b

Browse files
authored
Quote column in PipelineSQLSegmentBuilder. (#34326)
1 parent 06c30c8 commit 211337b

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/segment/PipelineSQLSegmentBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public PipelineSQLSegmentBuilder(final DatabaseType databaseType) {
4141
* @return escaped identifier
4242
*/
4343
public String getEscapedIdentifier(final String identifier) {
44-
return dialectDatabaseMetaData.isReservedWord(identifier) ? dialectDatabaseMetaData.getQuoteCharacter().wrap(identifier) : identifier;
44+
return "*".equals(identifier) ? identifier : dialectDatabaseMetaData.getQuoteCharacter().wrap(identifier);
4545
}
4646

4747
/**

kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/segment/PipelineSQLSegmentBuilderTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,24 @@ void assertGetEscapedIdentifier() {
3838

3939
@Test
4040
void assertGetUnescapedIdentifier() {
41-
assertThat(mysqlBuilder.getEscapedIdentifier("SELECT1"), is("SELECT1"));
41+
assertThat(mysqlBuilder.getEscapedIdentifier("SELECT1"), is("`SELECT1`"));
4242
}
4343

4444
@Test
4545
void assertGetQualifiedTableNameWithUnsupportedSchema() {
46-
assertThat(mysqlBuilder.getQualifiedTableName("foo_schema", "foo_tbl"), is("foo_tbl"));
47-
assertThat(mysqlBuilder.getQualifiedTableName(new QualifiedTable("foo_schema", "foo_tbl")), is("foo_tbl"));
46+
assertThat(mysqlBuilder.getQualifiedTableName("foo_schema", "foo_tbl"), is("`foo_tbl`"));
47+
assertThat(mysqlBuilder.getQualifiedTableName(new QualifiedTable("foo_schema", "foo_tbl")), is("`foo_tbl`"));
4848
}
4949

5050
@Test
5151
void assertGetQualifiedTableNameWithSupportedSchema() {
52-
assertThat(postgresqlBuilder.getQualifiedTableName("foo_schema", "foo_tbl"), is("foo_schema.foo_tbl"));
53-
assertThat(postgresqlBuilder.getQualifiedTableName(new QualifiedTable("foo_schema", "foo_tbl")), is("foo_schema.foo_tbl"));
52+
assertThat(postgresqlBuilder.getQualifiedTableName("foo_schema", "foo_tbl"), is("\"foo_schema\".\"foo_tbl\""));
53+
assertThat(postgresqlBuilder.getQualifiedTableName(new QualifiedTable("foo_schema", "foo_tbl")), is("\"foo_schema\".\"foo_tbl\""));
5454
}
5555

5656
@Test
5757
void assertGetQualifiedTableNameWithSupportedSchemaAndNullSchema() {
58-
assertThat(postgresqlBuilder.getQualifiedTableName(null, "foo_tbl"), is("foo_tbl"));
59-
assertThat(postgresqlBuilder.getQualifiedTableName(new QualifiedTable(null, "foo_tbl")), is("foo_tbl"));
58+
assertThat(postgresqlBuilder.getQualifiedTableName(null, "foo_tbl"), is("\"foo_tbl\""));
59+
assertThat(postgresqlBuilder.getQualifiedTableName(new QualifiedTable(null, "foo_tbl")), is("\"foo_tbl\""));
6060
}
6161
}

kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class MySQLPipelineSQLBuilderTest {
5151
void assertBuildInsertSQLOnDuplicateClause() {
5252
Optional<String> actual = sqlBuilder.buildInsertOnDuplicateClause(createDataRecord());
5353
assertTrue(actual.isPresent());
54-
assertThat(actual.get(), is("ON DUPLICATE KEY UPDATE id=VALUES(id),sc=VALUES(sc),c1=VALUES(c1),c2=VALUES(c2),c3=VALUES(c3)"));
54+
assertThat(actual.get(), is("ON DUPLICATE KEY UPDATE `id`=VALUES(`id`),`sc`=VALUES(`sc`),`c1`=VALUES(`c1`),`c2`=VALUES(`c2`),`c3`=VALUES(`c3`)"));
5555
}
5656

5757
private DataRecord createDataRecord() {

kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void assertBuildCreateSchemaSQL() {
5656
void assertBuildInsertOnDuplicateClause() {
5757
Optional<String> actual = sqlBuilder.buildInsertOnDuplicateClause(createDataRecord());
5858
assertTrue(actual.isPresent());
59-
assertThat(actual.get(), is("ON DUPLICATE KEY UPDATE c0=EXCLUDED.c0,c1=EXCLUDED.c1,c2=EXCLUDED.c2,c3=EXCLUDED.c3"));
59+
assertThat(actual.get(), is("ON DUPLICATE KEY UPDATE \"c0\"=EXCLUDED.\"c0\",\"c1\"=EXCLUDED.\"c1\",\"c2\"=EXCLUDED.\"c2\",\"c3\"=EXCLUDED.\"c3\""));
6060
}
6161

6262
private DataRecord createDataRecord() {

kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void assertBuildInsertSQLOnDuplicateClauseWithEmptyUniqueKey() {
5858
void assertBuildInsertSQLOnDuplicateClause() {
5959
Optional<String> actual = sqlBuilder.buildInsertOnDuplicateClause(createDataRecord());
6060
assertTrue(actual.isPresent());
61-
assertThat(actual.get(), is("ON CONFLICT (order_id) DO UPDATE SET user_id=EXCLUDED.user_id,status=EXCLUDED.status"));
61+
assertThat(actual.get(), is("ON CONFLICT (\"order_id\") DO UPDATE SET \"user_id\"=EXCLUDED.\"user_id\",\"status\"=EXCLUDED.\"status\""));
6262
}
6363

6464
private DataRecord createDataRecord() {

0 commit comments

Comments
 (0)