diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 2eff76d9dc..3a417de7ef 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -240,6 +240,8 @@ public class SQLExprParser extends SQLParser { SQLDateExpr dateExpr = new SQLDateExpr(); dateExpr.setLiteral(literal); sqlExpr = dateExpr; + } else if (JdbcConstants.MYSQL.equalsIgnoreCase(dbType) && ident.startsWith("0x") && (ident.length() % 2) == 0) { + sqlExpr = new SQLHexExpr(ident.substring(2)); } else { sqlExpr = new SQLIdentifierExpr(ident); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_36.java index 7a153f200f..be87bf186c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_36.java @@ -35,6 +35,6 @@ public class MySqlParameterizedOutputVisitorTest_36 extends TestCase { visitor.setExportTables(true); visitor.setPrettyFormat(false); statement.accept(visitor); - System.out.println(out); + assertEquals("INSERT INTO v_j (jb) VALUES (?)", out.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java new file mode 100644 index 0000000000..4b90914434 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java @@ -0,0 +1,85 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql.select; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import org.junit.Assert; + +import java.util.List; + +public class MySqlSelectTest_37 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "SELECT * FROM mytable where md5=x'AD9133D47CEB2222A68662BD7600D890'"; + + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement stmt = statementList.get(0); + + Assert.assertEquals(1, statementList.size()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); + stmt.accept(visitor); + +// System.out.println("Tables : " + visitor.getTables()); +// System.out.println("fields : " + visitor.getColumns()); +// System.out.println("coditions : " + visitor.getConditions()); +// System.out.println("orderBy : " + visitor.getOrderByColumns()); + +// Assert.assertEquals(1, visitor.getTables().size()); +// Assert.assertEquals(1, visitor.getColumns().size()); +// Assert.assertEquals(0, visitor.getConditions().size()); +// Assert.assertEquals(0, visitor.getOrderByColumns().size()); + + { + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("SELECT *\n" + + "FROM mytable\n" + + "WHERE md5 = 0xAD9133D47CEB2222A68662BD7600D890", // + output); + } + { + String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + Assert.assertEquals("select *\n" + + "from mytable\n" + + "where md5 = 0xAD9133D47CEB2222A68662BD7600D890", // + output); + } + + { + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("SELECT *\n" + + "FROM mytable\n" + + "WHERE md5 = 0xAD9133D47CEB2222A68662BD7600D890", // + output); + } + + { + String output = SQLUtils.toMySqlString(stmt, new SQLUtils.FormatOption(true, true, true)); + Assert.assertEquals("SELECT *\n" + + "FROM mytable\n" + + "WHERE md5 = ?", // + output); + } + } + + + +}