From d069606a9eec0f71296d462f1d88236c1890d99f Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Sun, 11 Sep 2016 22:47:46 +0800
Subject: [PATCH] bug fixed for mysql lexer. issue #1407

---
 .../sql/dialect/mysql/parser/MySqlLexer.java  |  5 ++
 .../sql/mysql/select/MySqlSelectTest_32.java  | 69 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
index 0bd27d097e..e29800b7a0 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
@@ -255,8 +255,13 @@ public class MySqlLexer extends Lexer {
 
                 if (!isIdentifierChar(ch)) {
                     if (ch == '-' && pos < text.length() - 1) {
+                        if (mark > 0 && text.charAt(mark - 1) == '.') {
+                            break;
+                        }
+
                         char next_char = text.charAt(pos + 1);
                         if (isIdentifierChar(next_char)) {
+                            bufPos++;
                             continue;
                         }
                     }
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java
new file mode 100644
index 0000000000..40da46b093
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 1999-2101 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.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
+import org.junit.Assert;
+
+import java.util.List;
+
+public class MySqlSelectTest_32 extends MysqlTest {
+
+    public void test_0() throws Exception {
+        String sql = "SELECT t.id-t.id from system_conn t";
+
+        
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement stmt = statementList.get(0);
+//        print(statementList);
+
+        Assert.assertEquals(1, statementList.size());
+
+        MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+        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 t.id - t.id\n" +
+                            "FROM system_conn t", //
+                                output);
+        }
+        {
+            String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION);
+            Assert.assertEquals("select t.id - t.id\n" +
+                            "from system_conn t", //
+                                output);
+        }
+    }
+    
+    
+    
+}