Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improved sql parser

Browse Source
This commit is contained in:
shaojin.wensj
2022-11-14 16:44:02 +08:00
parent 5473b2665d
commit 962e16534e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/alibaba/druid/sql/parser/Lexer.java
+2 -2
View File
@@ -2272,7 +2272,7 @@ public class Lexer {
boolean ident = false;
for (; ; ) {
ch = charAt(++pos);
if (isEOF() || ch == ';' || ch == '；') {
if (isEOF() || ch == ';' || ch == '；' || ch == '\r' || ch == '\n') {
pos--;
bufPos--;
break;
@@ -2318,7 +2318,7 @@ public class Lexer {
this.ch = charAt(pos);
if (dbType == DbType.odps && !isWhitespace(endChar)) {
while (isIdentifierChar(this.ch) && ch != ';') {
while (isIdentifierChar(this.ch) && ch != ';' && ch != '；') {
++pos;
bufPos++;
this.ch = charAt(pos);
core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLexerTest.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class OdpsLexerTest extends TestCase {
lexer.nextToken();
assertEquals(Token.IDENTIFIER, lexer.token());
lexer.nextToken();
assertEquals(Token.IDENTIFIER, lexer.token());
assertEquals(Token.VARIANT, lexer.token());
assertEquals("@{yyyyMMdd}_${rundt}", lexer.stringVal());
}
core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest37.java
+2 -2
View File
@@ -29,11 +29,11 @@ public class OdpsSelectTest37 extends TestCase {
String sql = "-- abc\u001A" +
"\nselect * from t";
assertEquals("-- abc\n" +
assertEquals("-- abc\u001A\n" +
"SELECT *\n" +
"FROM t", SQLUtils.formatOdps(sql));
assertEquals("-- abc\n" +
assertEquals("-- abc\u001A\n" +
"select *\n" +
"from t", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));