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

修正测试

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@169 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-05-21 02:53:42 +00:00
parent e707d5a0c9
commit 6e6111b147
24 changed files with 105 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleOutputVisitor.java
+10 -4
View File
@@ -26,6 +26,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
import com.alibaba.druid.sql.ast.expr.SQLObjectCreateExpr;
import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeInterval;
@@ -556,8 +557,14 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
public boolean visit(OracleSelectJoin x) {
x.getLeft().accept(this);
print(" ");
print(OracleSelectJoin.JoinType.toString(x.getJoinType()));
if (x.getJoinType() == JoinType.COMMA) {
print(",");
} else {
print(" ");
print(JoinType.toString(x.getJoinType()));
}
print(" ");
x.getRight().accept(this);
@@ -1621,7 +1628,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
println();
x.getSearchClause().accept(this);
}
if (x.getCycleClause() != null) {
println();
x.getCycleClause().accept(this);
@@ -1684,6 +1691,5 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
public void endVisit(CycleClause x) {
}
}
src/main/java/com/alibaba/druid/sql/parser/SQLParser.java
+20 -1
View File
@@ -65,7 +65,16 @@ public class SQLParser {
return alias;
}
throw new ParserException("Error", 0, 0);
switch (lexer.token()) {
case KEY:
alias = lexer.token().name();
lexer.nextToken();
return alias;
default:
break;
}
throw new ParserException("Error : " + lexer.token());
}
if (lexer.token() == Token.LITERAL_ALIAS) {
@@ -78,6 +87,16 @@ public class SQLParser {
alias = "'" + lexer.stringVal() + "'";
lexer.nextToken();
}
switch (lexer.token()) {
case KEY:
alias = lexer.token().name();
lexer.nextToken();
return alias;
default:
break;
}
return alias;
}
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+8 -4
View File
@@ -63,6 +63,7 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause;
import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause;
import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
@@ -76,7 +77,6 @@ import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint;
import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectJoin;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.SQLSelectSubqueryQuery;
public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
@@ -144,7 +144,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
if (i % 5 == 0) {
println();
}
print(", ");
}
@@ -748,8 +748,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
@Override
public boolean visit(SQLJoinTableSource x) {
x.getLeft().accept(this);
print(" ");
print(OracleSelectJoin.JoinType.toString(x.getJoinType()));
if (x.getJoinType() == JoinType.COMMA) {
print(",");
} else {
print(" ");
print(JoinType.toString(x.getJoinType()));
}
print(" ");
x.getRight().accept(this);