diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml
index 50b45d61fe..08fa1ed512 100644
--- a/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot-starter/pom.xml
@@ -4,14 +4,14 @@
4.0.0
com.alibaba
druid-spring-boot-starter
- 1.1.9-SNAPSHOT
+ 1.1.9
jar
druid-spring-boot-starter
Spring Boot with Druid support,help you simplify Druid config in Spring Boot.
https://github.com/alibaba/druid
- 1.1.8
+ 1.1.9
2.0.0.RELEASE
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java
index 32232017a2..1dcaaae30e 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2018 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.sql.ast.expr;
import com.alibaba.druid.sql.ast.SQLExpr;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlChecksumTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlChecksumTableStatement.java
index 7a2a99b5e8..f85ff4cbee 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlChecksumTableStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlChecksumTableStatement.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2018 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.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
index 2b51601605..68985f8b4d 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
@@ -350,10 +350,20 @@ public class MySqlExprParser extends SQLExprParser {
lexer.nextToken();
if (lexer.token() == Token.IDENTIFIED) {
+ Lexer.SavePoint mark = lexer.mark();
+
lexer.nextToken();
- accept(Token.BY);
- userName.setIdentifiedBy(lexer.stringVal());
- lexer.nextToken();
+ if (lexer.token() == Token.BY) {
+ lexer.nextToken();
+ if (lexer.identifierEquals(FnvHash.Constants.PASSWORD)) {
+ lexer.reset(mark);
+ } else {
+ userName.setIdentifiedBy(lexer.stringVal());
+ lexer.nextToken();
+ }
+ } else {
+ lexer.reset(mark);
+ }
}
return userName;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
index ef26b1e57f..2a2420cd08 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
@@ -2056,8 +2056,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
String identifiedBy = x.getIdentifiedBy();
if (identifiedBy != null) {
- print0(ucase ? " IDENTIFIED BY " : " identified by ");
+ print0(ucase ? " IDENTIFIED BY '" : " identified by '");
print0(identifiedBy);
+ print('\'');
}
return false;
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java
index 86d34ea8d6..d59262cf65 100644
--- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java
@@ -122,7 +122,7 @@ public class MySqlGrantTest_35 extends MysqlTest {
stmt.accept(visitor);
String output = SQLUtils.toMySqlString(stmt);
- assertEquals("GRANT ALL ON * TO hello@'%' IDENTIFIED BY helloPassword WITH MAX_QUERIES_PER_HOUR 90;", //
+ assertEquals("GRANT ALL ON * TO hello@'%' IDENTIFIED BY 'helloPassword' WITH MAX_QUERIES_PER_HOUR 90;", //
output);
assertEquals(0, visitor.getTables().size());
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java
new file mode 100644
index 0000000000..801e995bef
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java
@@ -0,0 +1,27 @@
+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.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+
+import java.util.List;
+
+public class MySqlSelectTest_122 extends MysqlTest {
+
+ public void test_0() throws Exception {
+ String sql = "SELECT 'test1123' from dual WHERE 'test1123' like \"%\"'test'\"%\"";
+
+// System.out.println(sql);
+
+ MySqlStatementParser parser = new MySqlStatementParser(sql);
+ List statementList = parser.parseStatementList();
+ SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0);
+
+ assertEquals(1, statementList.size());
+
+ assertEquals("SELECT 'test1123'\n" +
+ "FROM dual\n" +
+ "WHERE 'test1123' LIKE '%test%'", stmt.toString());
+ }
+}
\ No newline at end of file