diff --git a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/AssistQueryAndPlainInsertColumnsTokenGenerator.java b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/AssistQueryAndPlainInsertColumnsTokenGenerator.java index 04bf7370a428f097a1ed3f58e71de11e490f5f5a..96331eb2e9a493ef61e7ce11a681a0779a9f7caa 100644 --- a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/AssistQueryAndPlainInsertColumnsTokenGenerator.java +++ b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/AssistQueryAndPlainInsertColumnsTokenGenerator.java @@ -19,13 +19,12 @@ package org.apache.shardingsphere.encrypt.rewrite.token.generator.impl; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import org.apache.shardingsphere.encrypt.rewrite.token.generator.BaseEncryptSQLTokenGenerator; import org.apache.shardingsphere.encrypt.strategy.EncryptTable; import org.apache.shardingsphere.sql.parser.relation.statement.SQLStatementContext; import org.apache.shardingsphere.sql.parser.relation.statement.impl.InsertSQLStatementContext; import org.apache.shardingsphere.sql.parser.sql.segment.dml.column.ColumnSegment; -import org.apache.shardingsphere.sql.parser.sql.segment.dml.column.InsertColumnsSegment; import org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement; -import org.apache.shardingsphere.encrypt.rewrite.token.generator.BaseEncryptSQLTokenGenerator; import org.apache.shardingsphere.underlying.rewrite.sql.token.generator.CollectionSQLTokenGenerator; import org.apache.shardingsphere.underlying.rewrite.sql.token.pojo.generic.InsertColumnsToken; @@ -40,8 +39,10 @@ public final class AssistQueryAndPlainInsertColumnsTokenGenerator extends BaseEn @Override protected boolean isGenerateSQLTokenForEncrypt(final SQLStatementContext sqlStatementContext) { - return sqlStatementContext instanceof InsertSQLStatementContext && sqlStatementContext.getSqlStatement().findSQLSegment(InsertColumnsSegment.class).isPresent() - && !((InsertStatement) sqlStatementContext.getSqlStatement()).useDefaultColumns(); + if (!(sqlStatementContext instanceof InsertSQLStatementContext)) { + return false; + } + return ((InsertStatement) sqlStatementContext.getSqlStatement()).getInsertColumns().isPresent() && !((InsertStatement) sqlStatementContext.getSqlStatement()).useDefaultColumns(); } @Override diff --git a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptForUseDefaultInsertColumnsTokenGenerator.java b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptForUseDefaultInsertColumnsTokenGenerator.java index 5827d441686b45859284b442d42eda675cf857f1..a5f3910c6af79d9df291dc94139111a38f080e46 100644 --- a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptForUseDefaultInsertColumnsTokenGenerator.java +++ b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptForUseDefaultInsertColumnsTokenGenerator.java @@ -77,7 +77,7 @@ public final class EncryptForUseDefaultInsertColumnsTokenGenerator extends BaseE } private UseDefaultInsertColumnsToken generateNewSQLToken(final InsertSQLStatementContext sqlStatementContext, final String tableName) { - Optional insertColumnsSegment = sqlStatementContext.getSqlStatement().findSQLSegment(InsertColumnsSegment.class); + Optional insertColumnsSegment = ((InsertStatement) sqlStatementContext.getSqlStatement()).getInsertColumns(); Preconditions.checkState(insertColumnsSegment.isPresent()); Optional encryptTable = getEncryptRule().findEncryptTable(tableName); Preconditions.checkState(encryptTable.isPresent()); diff --git a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/InsertCipherNameTokenGenerator.java b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/InsertCipherNameTokenGenerator.java index 445a63ff58bf6edbb10df2181dda64f35f2ea12f..6408ea43dc550a8f20060142052c1943b6a40128 100644 --- a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/InsertCipherNameTokenGenerator.java +++ b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/InsertCipherNameTokenGenerator.java @@ -24,6 +24,7 @@ import org.apache.shardingsphere.sql.parser.relation.statement.impl.InsertSQLSta import org.apache.shardingsphere.sql.parser.sql.segment.dml.column.ColumnSegment; import org.apache.shardingsphere.sql.parser.sql.segment.dml.column.InsertColumnsSegment; import org.apache.shardingsphere.encrypt.rewrite.token.generator.BaseEncryptSQLTokenGenerator; +import org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement; import org.apache.shardingsphere.underlying.rewrite.sql.token.generator.CollectionSQLTokenGenerator; import org.apache.shardingsphere.underlying.rewrite.sql.token.pojo.generic.SubstitutableColumnNameToken; @@ -38,13 +39,16 @@ public final class InsertCipherNameTokenGenerator extends BaseEncryptSQLTokenGen @Override protected boolean isGenerateSQLTokenForEncrypt(final SQLStatementContext sqlStatementContext) { - Optional insertColumnsSegment = sqlStatementContext.getSqlStatement().findSQLSegment(InsertColumnsSegment.class); - return sqlStatementContext instanceof InsertSQLStatementContext && insertColumnsSegment.isPresent() && !insertColumnsSegment.get().getColumns().isEmpty(); + if (!(sqlStatementContext instanceof InsertSQLStatementContext)) { + return false; + } + Optional insertColumnsSegment = ((InsertStatement) sqlStatementContext.getSqlStatement()).getInsertColumns(); + return insertColumnsSegment.isPresent() && !insertColumnsSegment.get().getColumns().isEmpty(); } @Override public Collection generateSQLTokens(final SQLStatementContext sqlStatementContext) { - Optional sqlSegment = sqlStatementContext.getSqlStatement().findSQLSegment(InsertColumnsSegment.class); + Optional sqlSegment = ((InsertStatement) sqlStatementContext.getSqlStatement()).getInsertColumns(); Preconditions.checkState(sqlSegment.isPresent()); Map logicAndCipherColumns = getEncryptRule().getLogicAndCipherColumns(sqlStatementContext.getTablesContext().getSingleTableName()); Collection result = new LinkedList<>(); diff --git a/shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/impl/RemoveShadowColumnTokenGenerator.java b/shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/impl/RemoveShadowColumnTokenGenerator.java index 47e76d1bf54d63dbd8345cf404f4a1e8352731a8..68fb6fd670204f2e8e4102b19ff671f273aa37b8 100644 --- a/shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/impl/RemoveShadowColumnTokenGenerator.java +++ b/shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/impl/RemoveShadowColumnTokenGenerator.java @@ -24,6 +24,7 @@ import org.apache.shardingsphere.sql.parser.relation.statement.SQLStatementConte import org.apache.shardingsphere.sql.parser.relation.statement.impl.InsertSQLStatementContext; import org.apache.shardingsphere.sql.parser.sql.segment.dml.column.ColumnSegment; import org.apache.shardingsphere.sql.parser.sql.segment.dml.column.InsertColumnsSegment; +import org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement; import org.apache.shardingsphere.underlying.rewrite.sql.token.generator.CollectionSQLTokenGenerator; import org.apache.shardingsphere.underlying.rewrite.sql.token.pojo.generic.RemoveToken; @@ -37,13 +38,16 @@ public final class RemoveShadowColumnTokenGenerator extends BaseShadowSQLTokenGe @Override protected boolean isGenerateSQLTokenForShadow(final SQLStatementContext sqlStatementContext) { - Optional insertColumnsSegment = sqlStatementContext.getSqlStatement().findSQLSegment(InsertColumnsSegment.class); - return sqlStatementContext instanceof InsertSQLStatementContext && insertColumnsSegment.isPresent() && !insertColumnsSegment.get().getColumns().isEmpty(); + if (!(sqlStatementContext instanceof InsertSQLStatementContext)) { + return false; + } + Optional insertColumnsSegment = ((InsertStatement) sqlStatementContext.getSqlStatement()).getInsertColumns(); + return insertColumnsSegment.isPresent() && !insertColumnsSegment.get().getColumns().isEmpty(); } @Override public Collection generateSQLTokens(final SQLStatementContext sqlStatementContext) { - Optional sqlSegment = sqlStatementContext.getSqlStatement().findSQLSegment(InsertColumnsSegment.class); + Optional sqlSegment = ((InsertStatement) sqlStatementContext.getSqlStatement()).getInsertColumns(); Preconditions.checkState(sqlSegment.isPresent()); Collection result = new LinkedList<>(); LinkedList columns = (LinkedList) sqlSegment.get().getColumns(); diff --git a/shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/PreparedJudgementEngineTest.java b/shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/PreparedJudgementEngineTest.java index 0d11b920b3b48478eb4e4c933d1d12f34902a1d6..7d7d0ae7f1148ace05760ab699c6d7cd6884024d 100644 --- a/shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/PreparedJudgementEngineTest.java +++ b/shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/PreparedJudgementEngineTest.java @@ -45,7 +45,7 @@ public final class PreparedJudgementEngineTest { InsertStatement insertStatement = new InsertStatement(); InsertColumnsSegment insertColumnsSegment = new InsertColumnsSegment(0, 0, Arrays.asList(new ColumnSegment(0, 0, new IdentifierValue("id")), new ColumnSegment(0, 0, new IdentifierValue("name")), new ColumnSegment(0, 0, new IdentifierValue("shadow")))); - insertStatement.setColumns(insertColumnsSegment); + insertStatement.setInsertColumns(insertColumnsSegment); InsertSQLStatementContext insertSQLStatementContext = new InsertSQLStatementContext(relationMetas, Arrays.asList(1, "Tom", 2, "Jerry", 3, true), insertStatement); PreparedJudgementEngine preparedJudgementEngine = new PreparedJudgementEngine(shadowRule, insertSQLStatementContext, Arrays.asList(1, "Tom", true)); Assert.assertTrue("should be shadow", preparedJudgementEngine.isShadowSQL()); diff --git a/shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/SimpleJudgementEngineTest.java b/shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/SimpleJudgementEngineTest.java index 1dff860fbfeff601f447370f4a25e3ab0dc5854a..f9cfc9ebb66d876d1e549c8877049140c9954ded 100644 --- a/shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/SimpleJudgementEngineTest.java +++ b/shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/SimpleJudgementEngineTest.java @@ -67,7 +67,7 @@ public final class SimpleJudgementEngineTest { InsertStatement insertStatement = new InsertStatement(); InsertColumnsSegment insertColumnsSegment = new InsertColumnsSegment(0, 0, Arrays.asList(new ColumnSegment(0, 0, new IdentifierValue("id")), new ColumnSegment(0, 0, new IdentifierValue("name")), new ColumnSegment(0, 0, new IdentifierValue("shadow")))); - insertStatement.setColumns(insertColumnsSegment); + insertStatement.setInsertColumns(insertColumnsSegment); insertStatement.getValues() .addAll(Collections.singletonList(new InsertValuesSegment(0, 0, new ArrayList() { { diff --git a/sharding-core/sharding-core-merge/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java b/sharding-core/sharding-core-merge/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java index 59806d8a726e35aabb9f7db749acbb89fbb6338d..bff00c19599f9275313367bbdf532dec333f1f32 100644 --- a/sharding-core/sharding-core-merge/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java +++ b/sharding-core/sharding-core-merge/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java @@ -70,7 +70,7 @@ public final class ShardingResultMergerEngineTest { InsertStatement insertStatement = new InsertStatement(); insertStatement.getAllSQLSegments().add(new TableSegment(0, 0, new IdentifierValue("tbl"))); InsertColumnsSegment insertColumnsSegment = new InsertColumnsSegment(0, 0, Collections.singletonList(new ColumnSegment(0, 0, new IdentifierValue("col")))); - insertStatement.setColumns(insertColumnsSegment); + insertStatement.setInsertColumns(insertColumnsSegment); SQLStatementContext sqlStatementContext = new InsertSQLStatementContext(null, Collections.emptyList(), insertStatement); ShardingSphereProperties properties = new ShardingSphereProperties(new Properties()); assertThat(new ShardingResultMergerEngine().newInstance(DatabaseTypes.getActualDatabaseType("MySQL"), null, properties, sqlStatementContext), instanceOf(TransparentResultMerger.class)); diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java index de41c99af5648ccaf30d320cc3b40f677739193e..6b80e13e06dcd4b1ee9b77ee4a28ea6bf4243b69 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java @@ -41,7 +41,7 @@ public final class GeneratedKeyForUseDefaultInsertColumnsTokenGenerator extends @Override protected UseDefaultInsertColumnsToken generateSQLToken(final SQLStatementContext sqlStatementContext, final GeneratedKey generatedKey) { - Optional insertColumnsSegment = sqlStatementContext.getSqlStatement().findSQLSegment(InsertColumnsSegment.class); + Optional insertColumnsSegment = ((InsertStatement) sqlStatementContext.getSqlStatement()).getInsertColumns(); Preconditions.checkState(insertColumnsSegment.isPresent()); return new UseDefaultInsertColumnsToken(insertColumnsSegment.get().getStopIndex(), getColumnNames((InsertSQLStatementContext) sqlStatementContext, generatedKey)); } diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertColumnTokenGenerator.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertColumnTokenGenerator.java index cb88685b0ef4ffcdb764515b4db44ebc90d015ec..fc426e3343fbb24b84cd76899dacb0a14a17b8b9 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertColumnTokenGenerator.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertColumnTokenGenerator.java @@ -32,13 +32,13 @@ public final class GeneratedKeyInsertColumnTokenGenerator extends BaseGeneratedK @Override protected boolean isGenerateSQLToken(final InsertStatement insertStatement) { - Optional sqlSegment = insertStatement.findSQLSegment(InsertColumnsSegment.class); + Optional sqlSegment = insertStatement.getInsertColumns(); return sqlSegment.isPresent() && !sqlSegment.get().getColumns().isEmpty(); } @Override protected GeneratedKeyInsertColumnToken generateSQLToken(final SQLStatementContext sqlStatementContext, final GeneratedKey generatedKey) { - Optional sqlSegment = sqlStatementContext.getSqlStatement().findSQLSegment(InsertColumnsSegment.class); + Optional sqlSegment = ((InsertStatement) sqlStatementContext.getSqlStatement()).getInsertColumns(); Preconditions.checkState(sqlSegment.isPresent()); return new GeneratedKeyInsertColumnToken(sqlSegment.get().getStopIndex(), generatedKey.getColumnName()); } diff --git a/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/keygen/GeneratedKeyTest.java b/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/keygen/GeneratedKeyTest.java index abaeda796874a15b45d8e65dbf16e91ce56603a5..0bc037282d4be038192c111e2d7d8ee60b6ff000 100644 --- a/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/keygen/GeneratedKeyTest.java +++ b/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/keygen/GeneratedKeyTest.java @@ -58,7 +58,7 @@ public final class GeneratedKeyTest { @Before public void setUp() { insertStatement.setTable(new TableSegment(0, 0, new IdentifierValue("tbl"))); - insertStatement.setColumns(new InsertColumnsSegment(0, 0, Collections.singletonList(new ColumnSegment(0, 0, new IdentifierValue("id"))))); + insertStatement.setInsertColumns(new InsertColumnsSegment(0, 0, Collections.singletonList(new ColumnSegment(0, 0, new IdentifierValue("id"))))); } @Test diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/filler/impl/dml/InsertColumnsFiller.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/filler/impl/dml/InsertColumnsFiller.java index 2ae487835a7d58e6f20e89c390c2c37ee43140d1..f41c210cb5af6348e637881ee1396ba32edf7336 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/filler/impl/dml/InsertColumnsFiller.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/filler/impl/dml/InsertColumnsFiller.java @@ -29,6 +29,6 @@ public final class InsertColumnsFiller implements SQLSegmentFiller getInsertColumns() { - return Optional.fromNullable(columns); + return Optional.fromNullable(insertColumns); } /** @@ -68,7 +68,7 @@ public final class InsertStatement extends DMLStatement implements TableSegmentA * @return columns */ public Collection getColumns() { - return null == columns ? Collections.emptyList() : columns.getColumns(); + return null == insertColumns ? Collections.emptyList() : insertColumns.getColumns(); } /** diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/sql/statement/dml/InsertStatementTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/sql/statement/dml/InsertStatementTest.java index 94bcfb6e642b81bc9beb52c3d40e385926c3c2fe..990f6befddf2e6294399c9bd613656416a391674 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/sql/statement/dml/InsertStatementTest.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/sql/statement/dml/InsertStatementTest.java @@ -45,7 +45,7 @@ public final class InsertStatementTest { public void assertNotUseDefaultColumnsWithColumns() { InsertStatement insertStatement = new InsertStatement(); InsertColumnsSegment insertColumnsSegment = new InsertColumnsSegment(0, 0, Collections.singletonList(new ColumnSegment(0, 0, new IdentifierValue("col")))); - insertStatement.setColumns(insertColumnsSegment); + insertStatement.setInsertColumns(insertColumnsSegment); assertFalse(insertStatement.useDefaultColumns()); } @@ -53,7 +53,7 @@ public final class InsertStatementTest { public void assertNotUseDefaultColumnsWithSetAssignment() { InsertStatement insertStatement = new InsertStatement(); insertStatement.setSetAssignment(new SetAssignmentSegment(0, 0, Collections.emptyList())); - insertStatement.setColumns(new InsertColumnsSegment(0, 0, Collections.emptyList())); + insertStatement.setInsertColumns(new InsertColumnsSegment(0, 0, Collections.emptyList())); assertFalse(insertStatement.useDefaultColumns()); } @@ -61,7 +61,7 @@ public final class InsertStatementTest { public void assertGetColumnNamesForInsertColumns() { InsertStatement insertStatement = new InsertStatement(); InsertColumnsSegment insertColumnsSegment = new InsertColumnsSegment(0, 0, Collections.singletonList(new ColumnSegment(0, 0, new IdentifierValue("col")))); - insertStatement.setColumns(insertColumnsSegment); + insertStatement.setInsertColumns(insertColumnsSegment); assertThat(insertStatement.getColumnNames().size(), is(1)); assertThat(insertStatement.getColumnNames().iterator().next(), is("col")); } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/MySQLDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/MySQLDMLVisitor.java index 31b7d7be43576c2582b628b67a301379544584d8..34e87ec3ec1b3cac21989d667f0bef4d854c17d1 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/MySQLDMLVisitor.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/MySQLDMLVisitor.java @@ -132,7 +132,7 @@ public final class MySQLDMLVisitor extends MySQLVisitor { InsertStatement result = new InsertStatement(); if (null != ctx.columnNames()) { InsertColumnsSegment insertColumnsSegment = (InsertColumnsSegment) visit(ctx.columnNames()); - result.setColumns(insertColumnsSegment); + result.setInsertColumns(insertColumnsSegment); result.getAllSQLSegments().add(insertColumnsSegment); } Collection insertValuesSegments = createInsertValuesSegments(ctx.assignmentValues()); diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/OracleDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/OracleDMLVisitor.java index 65afbf5b1a5170f02265bbbbf49fd6ae35967899..63dbcb3e496442faaf8b2c32e5664b27a6bce01a 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/OracleDMLVisitor.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/OracleDMLVisitor.java @@ -107,7 +107,7 @@ public final class OracleDMLVisitor extends OracleVisitor { InsertStatement result = new InsertStatement(); if (null != ctx.columnNames()) { InsertColumnsSegment insertColumnsSegment = (InsertColumnsSegment) visit(ctx.columnNames()); - result.setColumns(insertColumnsSegment); + result.setInsertColumns(insertColumnsSegment); result.getAllSQLSegments().add(insertColumnsSegment); } Collection insertValuesSegments = createInsertValuesSegments(ctx.assignmentValues()); diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/PostgreSQLDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/PostgreSQLDMLVisitor.java index dbc989cc503308d048eb16630525939ba208b350..1eee19858c91a1434a628d306c6199a7d7288bf7 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/PostgreSQLDMLVisitor.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/PostgreSQLDMLVisitor.java @@ -113,7 +113,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor { InsertStatement result = new InsertStatement(); if (null != ctx.columnNames()) { InsertColumnsSegment insertColumnsSegment = (InsertColumnsSegment) visit(ctx.columnNames()); - result.setColumns(insertColumnsSegment); + result.setInsertColumns(insertColumnsSegment); result.getAllSQLSegments().add(insertColumnsSegment); } Collection insertValuesSegments = createInsertValuesSegments(ctx.assignmentValues()); diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-relation/src/test/java/org/apache/shardingsphere/sql/parser/relation/statement/impl/InsertSQLStatementContextTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-relation/src/test/java/org/apache/shardingsphere/sql/parser/relation/statement/impl/InsertSQLStatementContextTest.java index c27a857cfd0c8e06d16bebd38ebc8e66f32334e9..7e692773d084d827dd80d73c0fc3811df83df188 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-relation/src/test/java/org/apache/shardingsphere/sql/parser/relation/statement/impl/InsertSQLStatementContextTest.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-relation/src/test/java/org/apache/shardingsphere/sql/parser/relation/statement/impl/InsertSQLStatementContextTest.java @@ -44,7 +44,7 @@ public final class InsertSQLStatementContextTest { insertStatement.setTable(new TableSegment(0, 0, new IdentifierValue("tbl"))); InsertColumnsSegment insertColumnsSegment = new InsertColumnsSegment(0, 0, Arrays.asList( new ColumnSegment(0, 0, new IdentifierValue("id")), new ColumnSegment(0, 0, new IdentifierValue("name")), new ColumnSegment(0, 0, new IdentifierValue("status")))); - insertStatement.setColumns(insertColumnsSegment); + insertStatement.setInsertColumns(insertColumnsSegment); setUpInsertValues(insertStatement); InsertSQLStatementContext actual = new InsertSQLStatementContext(mock(RelationMetas.class), Arrays.asList(1, "Tom", 2, "Jerry"), insertStatement); assertInsertSQLStatementContext(actual); diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/SQL92DMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/SQL92DMLVisitor.java index 671e2deb2953118082f4aa80c7740b3820d069bb..438ec7418ec0856f8abf8aa76c6fba8d84eea13e 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/SQL92DMLVisitor.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/SQL92DMLVisitor.java @@ -101,7 +101,7 @@ public final class SQL92DMLVisitor extends SQL92Visitor { InsertStatement result = new InsertStatement(); if (null != ctx.columnNames()) { InsertColumnsSegment insertColumnsSegment = (InsertColumnsSegment) visit(ctx.columnNames()); - result.setColumns(insertColumnsSegment); + result.setInsertColumns(insertColumnsSegment); result.getAllSQLSegments().add(insertColumnsSegment); } Collection insertValuesSegments = createInsertValuesSegments(ctx.assignmentValues()); diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/SQLServerDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/SQLServerDMLVisitor.java index 094f3f825aff94ceafacd135bbcdd0826cf642ca..cbb4730efd4da582445ea6aff3c24ba2aff006f8 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/SQLServerDMLVisitor.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/SQLServerDMLVisitor.java @@ -102,7 +102,7 @@ public final class SQLServerDMLVisitor extends SQLServerVisitor { InsertStatement result = new InsertStatement(); if (null != ctx.columnNames()) { InsertColumnsSegment insertColumnsSegment = (InsertColumnsSegment) visit(ctx.columnNames()); - result.setColumns(insertColumnsSegment); + result.setInsertColumns(insertColumnsSegment); result.getAllSQLSegments().add(insertColumnsSegment); } Collection insertValuesSegments = createInsertValuesSegments(ctx.assignmentValues());