diff --git a/src/main/java/com/alibaba/druid/mapping/MappingEngine.java b/src/main/java/com/alibaba/druid/mapping/MappingEngine.java index debea1322e..7bb53b783f 100644 --- a/src/main/java/com/alibaba/druid/mapping/MappingEngine.java +++ b/src/main/java/com/alibaba/druid/mapping/MappingEngine.java @@ -46,12 +46,12 @@ public class MappingEngine { return provider.createOutputVisitor(this, out); } - public SQLSelectQueryBlock explainToSQLObject(String sql) { - return provider.explainToSQLObject(this, sql); + public SQLSelectQueryBlock explainToSelectSQLObject(String sql) { + return provider.explainToSelectSQLObject(this, sql); } - public String explainToSQL(String sql) { - SQLSelectQueryBlock query = explainToSQLObject(sql); + public String explainToSelectSQL(String sql) { + SQLSelectQueryBlock query = explainToSelectSQLObject(sql); query.accept(this.createMappingVisitor()); diff --git a/src/main/java/com/alibaba/druid/mapping/spi/MSSQLServerMappingProvider.java b/src/main/java/com/alibaba/druid/mapping/spi/MSSQLServerMappingProvider.java index af23b0b63c..65361d06df 100644 --- a/src/main/java/com/alibaba/druid/mapping/spi/MSSQLServerMappingProvider.java +++ b/src/main/java/com/alibaba/druid/mapping/spi/MSSQLServerMappingProvider.java @@ -21,7 +21,7 @@ public class MSSQLServerMappingProvider implements MappingProvider { return new SQLServerOutputVisitor(out); } - public SQLSelectQueryBlock explainToSQLObject(MappingEngine engine, String sql) { + public SQLSelectQueryBlock explainToSelectSQLObject(MappingEngine engine, String sql) { SQLServerSelectParser selectParser = new SQLServerSelectParser(sql); SQLServerSelectQueryBlock query = (SQLServerSelectQueryBlock) selectParser.query(); diff --git a/src/main/java/com/alibaba/druid/mapping/spi/MappingProvider.java b/src/main/java/com/alibaba/druid/mapping/spi/MappingProvider.java index 8af0a54ca4..3aa78072ac 100644 --- a/src/main/java/com/alibaba/druid/mapping/spi/MappingProvider.java +++ b/src/main/java/com/alibaba/druid/mapping/spi/MappingProvider.java @@ -10,5 +10,5 @@ public interface MappingProvider { SQLASTOutputVisitor createOutputVisitor(MappingEngine engine, Appendable out); - SQLSelectQueryBlock explainToSQLObject(MappingEngine engine, String sql); + SQLSelectQueryBlock explainToSelectSQLObject(MappingEngine engine, String sql); } diff --git a/src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingProvider.java b/src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingProvider.java index e1dddc1e9f..324779e2d0 100644 --- a/src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingProvider.java +++ b/src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingProvider.java @@ -21,7 +21,7 @@ public class MySqlMappingProvider implements MappingProvider { return new MySqlOutputVisitor(out); } - public SQLSelectQueryBlock explainToSQLObject(MappingEngine engine, String sql) { + public SQLSelectQueryBlock explainToSelectSQLObject(MappingEngine engine, String sql) { MySqlSelectParser selectParser = new MySqlSelectParser(sql); MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) selectParser.query(); diff --git a/src/main/java/com/alibaba/druid/mapping/spi/OracleMappingProvider.java b/src/main/java/com/alibaba/druid/mapping/spi/OracleMappingProvider.java index 503bdd3f3f..5ee4557115 100644 --- a/src/main/java/com/alibaba/druid/mapping/spi/OracleMappingProvider.java +++ b/src/main/java/com/alibaba/druid/mapping/spi/OracleMappingProvider.java @@ -19,7 +19,7 @@ public class OracleMappingProvider implements MappingProvider { return new OracleOutputVisitor(out); } - public SQLSelectQueryBlock explainToSQLObject(MappingEngine engine, String sql) { + public SQLSelectQueryBlock explainToSelectSQLObject(MappingEngine engine, String sql) { OracleSelectParser selectParser = new OracleSelectParser(sql); OracleSelectQueryBlock query = (OracleSelectQueryBlock) selectParser.query(); diff --git a/src/test/java/com/alibaba/druid/bvt/mapping/MappingVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/mapping/MappingVisitorTest.java index 14806fbdfa..0523b464c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/mapping/MappingVisitorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/mapping/MappingVisitorTest.java @@ -26,18 +26,18 @@ public class MappingVisitorTest extends TestCase { public void test_0() throws Exception { - Assert.assertEquals("SELECT serviceTag AS \"编号\", ip AS \"IP地址\"\nFROM device", engine.explainToSQL("select *")); + Assert.assertEquals("SELECT serviceTag AS \"编号\", ip AS \"IP地址\"\nFROM device", engine.explainToSelectSQL("select *")); Assert.assertEquals("SELECT serviceTag AS \"编号\", ip AS \"IP地址\"\nFROM device\nWHERE ip = '127.0.0.1'", - engine.explainToSQL("select 编号, IP地址 WHERE IP地址 = '127.0.0.1'")); + engine.explainToSelectSQL("select 编号, IP地址 WHERE IP地址 = '127.0.0.1'")); } public void test_1() throws Exception { engine.setMaxLimit(10); - Assert.assertEquals("SELECT serviceTag AS \"编号\", ip AS \"IP地址\"\nFROM device\nLIMIT 10", engine.explainToSQL("select *")); + Assert.assertEquals("SELECT serviceTag AS \"编号\", ip AS \"IP地址\"\nFROM device\nLIMIT 10", engine.explainToSelectSQL("select *")); Assert.assertEquals("SELECT serviceTag AS \"编号\", ip AS \"IP地址\"\nFROM device\nWHERE ip = '127.0.0.1'\nLIMIT 10", - engine.explainToSQL("select 编号, IP地址 WHERE IP地址 = '127.0.0.1'")); + engine.explainToSelectSQL("select 编号, IP地址 WHERE IP地址 = '127.0.0.1'")); engine.setMaxLimit(null);