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

Merge pull request #659 from yakolee/master

Browse Source 
improve sqlserver parser: insert and select_apply
This commit is contained in:
Yako
2014-09-22 16:24:59 +08:00
parent 009e307dba 85a988355d
commit 8ed06bf96b
6 changed files with 239 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java
+6 -2
View File
@@ -113,8 +113,12 @@ public class SQLJoinTableSource extends SQLTableSourceImpl {
CROSS_JOIN("CROSS JOIN"), //
NATURAL_JOIN("NATURAL JOIN"), //
NATURAL_INNER_JOIN("NATURAL INNER JOIN"), //
LEFT_OUTER_JOIN("LEFT JOIN"), RIGHT_OUTER_JOIN("RIGHT JOIN"), FULL_OUTER_JOIN("FULL JOIN"),
STRAIGHT_JOIN("STRAIGHT_JOIN");
LEFT_OUTER_JOIN("LEFT JOIN"), //
RIGHT_OUTER_JOIN("RIGHT JOIN"), //
FULL_OUTER_JOIN("FULL JOIN"),//
STRAIGHT_JOIN("STRAIGHT_JOIN"), //
OUTER_APPLY("OUTER APPLY"),//
CROSS_APPLY("CROSS APPLY");
public final String name;
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerStatementParser.java
+11 -11
View File
@@ -96,20 +96,20 @@ public class SQLServerStatementParser extends SQLStatementParser {
if (lexer.token() == Token.INTO) {
lexer.nextToken();
}
SQLName tableName = this.exprParser.name();
insertStatement.setTableName(tableName);
SQLName tableName = this.exprParser.name();
insertStatement.setTableName(tableName);
if (lexer.token() == Token.LITERAL_ALIAS) {
insertStatement.setAlias(as());
}
if (lexer.token() == Token.LITERAL_ALIAS) {
insertStatement.setAlias(as());
}
parseInsert0_hinits(insertStatement);
parseInsert0_hinits(insertStatement);
if (lexer.token() == Token.IDENTIFIER) {
insertStatement.setAlias(lexer.stringVal());
lexer.nextToken();
}
if (lexer.token() == Token.IDENTIFIER) {
insertStatement.setAlias(lexer.stringVal());
lexer.nextToken();
}
if (lexer.token() == (Token.LPAREN)) {
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+14 -3
View File
@@ -363,7 +363,7 @@ public class SQLSelectParser extends SQLParser {
protected SQLTableSource parseTableSourceRest(SQLTableSource tableSource) {
if ((tableSource.getAlias() == null) || (tableSource.getAlias().length() == 0)) {
if (lexer.token() != Token.LEFT && lexer.token() != Token.RIGHT && lexer.token() != Token.FULL
&& !identifierEquals("STRAIGHT_JOIN") && !identifierEquals("CROSS")) {
&& !identifierEquals("STRAIGHT_JOIN") && !identifierEquals("CROSS") && lexer.token != Token.OUTER) {
String alias = as();
if (alias != null) {
tableSource.setAlias(alias);
@@ -411,8 +411,19 @@ public class SQLSelectParser extends SQLParser {
joinType = SQLJoinTableSource.JoinType.STRAIGHT_JOIN;
} else if (identifierEquals("CROSS")) {
lexer.nextToken();
accept(Token.JOIN);
joinType = SQLJoinTableSource.JoinType.CROSS_JOIN;
if (lexer.token() == Token.JOIN) {
lexer.nextToken();
joinType = SQLJoinTableSource.JoinType.CROSS_JOIN;
} else if (identifierEquals("APPLY")) {
lexer.nextToken();
joinType = SQLJoinTableSource.JoinType.CROSS_APPLY;
}
} else if (lexer.token() == Token.OUTER) {
lexer.nextToken();
if (identifierEquals("APPLY")) {
lexer.nextToken();
joinType = SQLJoinTableSource.JoinType.OUTER_APPLY;
}
}
if (joinType != null) {