From 22843bc8e2299b478d9a528764227652bae0be00 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 28 Aug 2018 17:27:54 +0800 Subject: [PATCH] bug fixed for mysql parser, support unsigned type. --- .../druid/sql/parser/SQLExprParser.java | 16 +++-- .../java/com/alibaba/druid/util/FnvHash.java | 1 + .../select/MySqlSelectTest_207_cast.java | 66 +++++++++++++++++++ 3 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java 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 0aef79a1b4..ac164ca967 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -2505,21 +2505,29 @@ public class SQLExprParser extends SQLParser { } SQLName typeExpr = name(); + final long typeNameHashCode = typeExpr.nameHashCode64(); String typeName = typeExpr.toString(); - - if ("long".equalsIgnoreCase(typeName) // - && lexer.identifierEquals("byte") // + + if (typeNameHashCode == FnvHash.Constants.LONG + && lexer.identifierEquals(FnvHash.Constants.BYTE) && JdbcConstants.MYSQL.equals(getDbType()) // ) { typeName += (' ' + lexer.stringVal()); lexer.nextToken(); - } else if ("double".equalsIgnoreCase(typeName) + } else if (typeNameHashCode == FnvHash.Constants.DOUBLE && JdbcConstants.POSTGRESQL.equals(getDbType()) // ) { typeName += (' ' + lexer.stringVal()); lexer.nextToken(); } + if (typeNameHashCode == FnvHash.Constants.UNSIGNED) { + if (lexer.token == Token.IDENTIFIER) { + typeName += (' ' + lexer.stringVal()); + lexer.nextToken(); + } + } + if (isCharType(typeName)) { SQLCharacterDataType charType = new SQLCharacterDataType(typeName); diff --git a/src/main/java/com/alibaba/druid/util/FnvHash.java b/src/main/java/com/alibaba/druid/util/FnvHash.java index 1177354e88..347b0b630e 100644 --- a/src/main/java/com/alibaba/druid/util/FnvHash.java +++ b/src/main/java/com/alibaba/druid/util/FnvHash.java @@ -447,6 +447,7 @@ public final class FnvHash { long RAW = fnv1a_64_lower("RAW"); long LONG_RAW = fnv1a_64_lower("LONG RAW"); long LONG = fnv1a_64_lower("LONG"); + long BYTE = fnv1a_64_lower("BYTE"); long ROWNUM = fnv1a_64_lower("ROWNUM"); long SYSDATE = fnv1a_64_lower("SYSDATE"); long SQLCODE = fnv1a_64_lower("SQLCODE"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java new file mode 100644 index 0000000000..ad25c397a3 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java @@ -0,0 +1,66 @@ +/* + * 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.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; + +import java.util.List; + +public class MySqlSelectTest_207_cast extends MysqlTest { + + public void test_0() throws Exception { + String sql = "SELECT a.key_label as keyLabel,\n" + + " a.key_type_cd as keyType,\n" + + " a.key_subtp_cd as keySubType,\n" + + " a.key_size as keySize,\n" + + "\n" + + " cast(b.token_no as unsigned int) as tokenNo,\n" + + " b.token_label as tokenLabel\n" + + " FROM kky_prof a, khm_ltoken b\n" + + " WHERE a.key_label is not null\n" + + " AND b.com_id = a.com_id\n" + + " AND a.key_stats_cd = 'Y'"; + + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + assertEquals(1, statementList.size()); + + assertEquals("SELECT a.key_label AS keyLabel, a.key_type_cd AS keyType, a.key_subtp_cd AS keySubType, a.key_size AS keySize, CAST(b.token_no AS unsigned int) AS tokenNo\n" + + "\t, b.token_label AS tokenLabel\n" + + "FROM kky_prof a, khm_ltoken b\n" + + "WHERE a.key_label IS NOT NULL\n" + + "\tAND b.com_id = a.com_id\n" + + "\tAND a.key_stats_cd = 'Y'", // + stmt.toString()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + assertEquals(2, visitor.getTables().size()); + assertEquals(9, visitor.getColumns().size()); + assertEquals(4, visitor.getConditions().size()); + assertEquals(0, visitor.getOrderByColumns().size()); + + + } + +}