diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index be0dc0a2f0..9dd503b1c8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -1957,6 +1957,10 @@ public class MySqlStatementParser extends SQLStatementParser { break; } else { expr = this.exprParser.primaryRest(expr); + if(lexer.token() != Token.COMMA && lexer.token() != Token.RPAREN) { + expr = this.exprParser.exprRest(expr); + } + valueExprList.add(expr); if (lexer.token() == Token.COMMA) { lexer.nextToken(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java index 7564d5f2c2..9208bc450c 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java @@ -1725,7 +1725,12 @@ public class SQLEvalVisitorUtils { } if (a instanceof Integer || b instanceof Integer) { - return castToInteger(a).equals(castToInteger(b)); + Integer inta = castToInteger(a); + Integer intb = castToInteger(b); + if (inta == null || intb == null) { + return false; + } + return inta.equals(intb); } if (a instanceof Short || b instanceof Short) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_9.java new file mode 100644 index 0000000000..0f5ca7241f --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_9.java @@ -0,0 +1,50 @@ +/* + * Copyright 1999-2011 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; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; + +public class MySqlInsertTest_9 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "insert into sequence values('seq_wlb_order_log',268234128+10000000,now());"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + SQLInsertStatement insertStmt = (SQLInsertStatement) stmt; + + Assert.assertEquals(3, insertStmt.getValues().getValues().size()); + Assert.assertEquals(0, insertStmt.getColumns().size()); + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + Assert.assertEquals("INSERT INTO sequence" + + "\nVALUES ('seq_wlb_order_log', 268234128 + 10000000, now())", SQLUtils.toMySqlString(insertStmt)); + } +}