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

improve ParameterizedOutputVisitor

Browse Source
This commit is contained in:
yakolee
2014-05-21 14:49:49 +08:00
parent 7bfdd1cfea
commit 52b66266d8
7 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
+3
View File
@@ -105,6 +105,7 @@ public class MySqlLexer extends Lexer {
stringVal = subString(mark, bufPos);
token = Token.LINE_COMMENT;
hasComment = true;
if (commentHandler != null && commentHandler.handle(lastToken, stringVal)) {
return;
@@ -440,6 +441,7 @@ public class MySqlLexer extends Lexer {
} else {
stringVal = subString(mark, bufPos);
token = Token.MULTI_LINE_COMMENT;
hasComment = true;
}
if (commentHandler != null && commentHandler.handle(lastToken, stringVal)) {
@@ -481,6 +483,7 @@ public class MySqlLexer extends Lexer {
stringVal = subString(mark, bufPos + 1);
token = Token.LINE_COMMENT;
hasComment = true;
if (commentHandler != null && commentHandler.handle(lastToken, stringVal)) {
return;
src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java
+2
View File
@@ -92,6 +92,7 @@ public class OdpsLexer extends Lexer {
} else {
stringVal = subString(mark, bufPos);
token = Token.MULTI_LINE_COMMENT;
hasComment = true;
}
if (token != Token.HINT && !isAllowComment()) {
@@ -134,6 +135,7 @@ public class OdpsLexer extends Lexer {
stringVal = subString(mark + 1, bufPos);
token = Token.LINE_COMMENT;
hasComment = true;
return;
}
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java
+2
View File
@@ -230,6 +230,7 @@ public class OracleLexer extends Lexer {
} else {
stringVal = subString(mark, bufPos);
token = Token.MULTI_LINE_COMMENT;
hasComment = true;
}
if (token != Token.HINT && !isAllowComment()) {
@@ -272,6 +273,7 @@ public class OracleLexer extends Lexer {
stringVal = subString(mark + 1, bufPos);
token = Token.LINE_COMMENT;
hasComment = true;
return;
}
}
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java
+2
View File
@@ -100,6 +100,7 @@ public class SQLServerLexer extends Lexer {
} else {
stringVal = subString(mark, bufPos);
token = Token.MULTI_LINE_COMMENT;
hasComment = true;
}
if (token != Token.HINT && !isAllowComment()) {
@@ -142,6 +143,7 @@ public class SQLServerLexer extends Lexer {
stringVal = subString(mark + 1, bufPos);
token = Token.LINE_COMMENT;
hasComment = true;
return;
}
}
src/main/java/com/alibaba/druid/sql/parser/Lexer.java
+8
View File
@@ -69,6 +69,8 @@ public class Lexer {
private int varIndex = -1;
protected CommentHandler commentHandler;
protected boolean hasComment = false;
public Lexer(String input){
this(input, true);
@@ -747,6 +749,7 @@ public class Lexer {
stringVal = subString(mark, bufPos);
token = Token.MULTI_LINE_COMMENT;
hasComment = true;
return;
}
@@ -777,6 +780,7 @@ public class Lexer {
stringVal = subString(mark + 1, bufPos);
token = Token.LINE_COMMENT;
hasComment = true;
return;
}
}
@@ -1045,4 +1049,8 @@ public class Lexer {
boolean handle(Token lastToken, String comment);
}
public boolean isHasComment() {
return hasComment;
}
}
src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class ParameterizedOutputVisitorUtils {
stmt.accept(visitor);
}
if (visitor.getReplaceCount() == 0) {
if (visitor.getReplaceCount() == 0 && !parser.getLexer().isHasComment()) {
return sql;
}