mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
improved sql parser.
This commit is contained in:
@@ -102,21 +102,21 @@ public class DB2ExprParser extends SQLExprParser {
|
||||
}
|
||||
|
||||
protected SQLExpr dotRest(SQLExpr expr) {
|
||||
if (lexer.identifierEquals("NEXTVAL")) {
|
||||
if (lexer.identifierEquals(FnvHash.Constants.NEXTVAL)) {
|
||||
if (expr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
|
||||
SQLSequenceExpr seqExpr = new SQLSequenceExpr(identExpr, SQLSequenceExpr.Function.NextVal);
|
||||
lexer.nextToken();
|
||||
return seqExpr;
|
||||
}
|
||||
} else if (lexer.identifierEquals("PREVVAL")) {
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.PREVVAL)) {
|
||||
if (expr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
|
||||
SQLSequenceExpr seqExpr = new SQLSequenceExpr(identExpr, SQLSequenceExpr.Function.PrevVal);
|
||||
lexer.nextToken();
|
||||
return seqExpr;
|
||||
}
|
||||
} else if (lexer.identifierEquals("CURRVAL")) {
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.CURRVAL)) {
|
||||
if (expr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
|
||||
SQLSequenceExpr seqExpr = new SQLSequenceExpr(identExpr, SQLSequenceExpr.Function.CurrVal);
|
||||
|
||||
+4
-3
@@ -63,15 +63,15 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
|
||||
super(exprParser);
|
||||
}
|
||||
|
||||
public SQLCreateTableStatement parseCrateTable() {
|
||||
return parseCrateTable(true);
|
||||
public SQLCreateTableStatement parseCreateTable() {
|
||||
return parseCreateTable(true);
|
||||
}
|
||||
|
||||
public MySqlExprParser getExprParser() {
|
||||
return (MySqlExprParser) exprParser;
|
||||
}
|
||||
|
||||
public MySqlCreateTableStatement parseCrateTable(boolean acceptCreate) {
|
||||
public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) {
|
||||
MySqlCreateTableStatement stmt = new MySqlCreateTableStatement();
|
||||
if (acceptCreate) {
|
||||
if (lexer.hasComment() && lexer.isKeepComments()) {
|
||||
@@ -120,6 +120,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
|
||||
|| lexer.token() == Token.PRIMARY //
|
||||
|| lexer.token() == Token.UNIQUE) {
|
||||
SQLTableConstraint constraint = this.parseConstraint();
|
||||
constraint.setParent(stmt);
|
||||
stmt.getTableElementList().add(constraint);
|
||||
} else if (lexer.token() == (Token.INDEX)) {
|
||||
lexer.nextToken();
|
||||
|
||||
@@ -712,7 +712,7 @@ public class MySqlExprParser extends SQLExprParser {
|
||||
}
|
||||
|
||||
accept(Token.LPAREN);
|
||||
this.names(fk.getReferencingColumns());
|
||||
this.names(fk.getReferencingColumns(), fk);
|
||||
accept(Token.RPAREN);
|
||||
|
||||
accept(Token.REFERENCES);
|
||||
|
||||
@@ -22,6 +22,7 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.alibaba.druid.sql.parser.*;
|
||||
import com.alibaba.druid.util.FnvHash;
|
||||
|
||||
public class MySqlLexer extends Lexer {
|
||||
public static SymbolTable quoteTable = new SymbolTable(8192);
|
||||
@@ -226,7 +227,8 @@ public class MySqlLexer extends Lexer {
|
||||
|
||||
final char first = ch;
|
||||
|
||||
if (ch == 'b' && charAt(pos + 1) == '\'') {
|
||||
if (ch == 'b'
|
||||
&& charAt(pos + 1) == '\'') {
|
||||
int i = 2;
|
||||
int mark = pos + 2;
|
||||
for (;;++i) {
|
||||
@@ -336,6 +338,7 @@ public class MySqlLexer extends Lexer {
|
||||
token = Token.IDENTIFIER;
|
||||
stringVal = SymbolTable.global.addSymbol(text, mark, bufPos, hash);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -395,7 +398,9 @@ public class MySqlLexer extends Lexer {
|
||||
stringVal = this.subString(mark + startHintSp, starIndex - startHintSp - mark);
|
||||
token = Token.HINT;
|
||||
} else {
|
||||
stringVal = this.subString(mark, starIndex + 2 - mark);
|
||||
if (!optimizedForParameterized) {
|
||||
stringVal = this.subString(mark, starIndex + 2 - mark);
|
||||
}
|
||||
token = Token.MULTI_LINE_COMMENT;
|
||||
commentCount++;
|
||||
if (keepComments) {
|
||||
|
||||
@@ -114,7 +114,7 @@ public class MySqlStatementParser extends SQLStatementParser {
|
||||
|
||||
public SQLCreateTableStatement parseCreateTable() {
|
||||
MySqlCreateTableParser parser = new MySqlCreateTableParser(this.exprParser);
|
||||
return parser.parseCrateTable();
|
||||
return parser.parseCreateTable();
|
||||
}
|
||||
|
||||
public SQLStatement parseSelect() {
|
||||
@@ -230,7 +230,7 @@ public class MySqlStatementParser extends SQLStatementParser {
|
||||
lexer.reset(markBp, markChar, Token.CREATE);
|
||||
}
|
||||
MySqlCreateTableParser parser = new MySqlCreateTableParser(this.exprParser);
|
||||
MySqlCreateTableStatement stmt = parser.parseCrateTable(false);
|
||||
MySqlCreateTableStatement stmt = parser.parseCreateTable(false);
|
||||
stmt.setHints(hints);
|
||||
|
||||
if (comments != null) {
|
||||
|
||||
@@ -200,13 +200,13 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
|
||||
SQLOrderBy orderBy = x.getOrderBy();
|
||||
if (orderBy != null) {
|
||||
println();
|
||||
orderBy.accept(this);
|
||||
visit(orderBy);
|
||||
}
|
||||
|
||||
SQLLimit limit = x.getLimit();
|
||||
if (limit != null) {
|
||||
println();
|
||||
limit.accept(this);
|
||||
visit(limit);
|
||||
}
|
||||
|
||||
SQLName procedureName = x.getProcedureName();
|
||||
|
||||
+1
-3
@@ -1057,7 +1057,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
|
||||
|
||||
@Override
|
||||
public boolean visit(MysqlForeignKey x) {
|
||||
return super.visit(x);
|
||||
return super.visit((SQLForeignKeyImpl) x);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1310,6 +1310,4 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
|
||||
public void endVisit(MySqlFlushStatement x) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+2
@@ -118,6 +118,7 @@ public class FromSubqueryResolver extends OracleASTVisitorAdapter {
|
||||
String entryName = entry.getAlias();
|
||||
|
||||
SQLCreateViewStatement entryStmt = new SQLCreateViewStatement();
|
||||
entryStmt.setOrReplace(true);
|
||||
entryStmt.setDbType(stmt.getDbType());
|
||||
|
||||
String entryViewName = visitor.generateSubViewName();
|
||||
@@ -136,6 +137,7 @@ public class FromSubqueryResolver extends OracleASTVisitorAdapter {
|
||||
String dbType = stmt.getDbType();
|
||||
for (int i = 0; i < targetList.size() - 1; ++i) {
|
||||
SQLCreateViewStatement targetStmt = (SQLCreateViewStatement) targetList.get(i);
|
||||
targetStmt.setOrReplace(true);
|
||||
targetStmt.setDbType(dbType);
|
||||
targetStmt.setAfterSemi(true);
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class OdpsCreateTableParser extends SQLCreateTableParser {
|
||||
super(exprParser);
|
||||
}
|
||||
|
||||
public SQLCreateTableStatement parseCrateTable(boolean acceptCreate) {
|
||||
public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) {
|
||||
OdpsCreateTableStatement stmt = new OdpsCreateTableStatement();
|
||||
|
||||
if (acceptCreate) {
|
||||
|
||||
@@ -72,7 +72,7 @@ public class OdpsStatementParser extends SQLStatementParser {
|
||||
|
||||
public SQLCreateTableStatement parseCreateTable() {
|
||||
SQLCreateTableParser parser = new OdpsCreateTableParser(this.exprParser);
|
||||
return parser.parseCrateTable();
|
||||
return parser.parseCreateTable();
|
||||
}
|
||||
|
||||
public SQLCreateTableParser getSQLCreateTableParser() {
|
||||
|
||||
+2
-9
@@ -15,19 +15,12 @@
|
||||
*/
|
||||
package com.alibaba.druid.sql.dialect.oracle.parser;
|
||||
|
||||
import com.alibaba.druid.sql.ast.SQLExpr;
|
||||
import com.alibaba.druid.sql.ast.SQLName;
|
||||
import com.alibaba.druid.sql.ast.SQLPartition;
|
||||
import com.alibaba.druid.sql.ast.SQLPartitionBy;
|
||||
import com.alibaba.druid.sql.ast.SQLPartitionByHash;
|
||||
import com.alibaba.druid.sql.ast.SQLPartitionByList;
|
||||
import com.alibaba.druid.sql.ast.SQLPartitionByRange;
|
||||
import com.alibaba.druid.sql.ast.SQLSubPartition;
|
||||
import com.alibaba.druid.sql.ast.SQLSubPartitionBy;
|
||||
import com.alibaba.druid.sql.ast.SQLSubPartitionByHash;
|
||||
import com.alibaba.druid.sql.ast.SQLSubPartitionByList;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLSelect;
|
||||
@@ -53,8 +46,8 @@ public class OracleCreateTableParser extends SQLCreateTableParser {
|
||||
return new OracleCreateTableStatement();
|
||||
}
|
||||
|
||||
public OracleCreateTableStatement parseCrateTable(boolean acceptCreate) {
|
||||
OracleCreateTableStatement stmt = (OracleCreateTableStatement) super.parseCrateTable(acceptCreate);
|
||||
public OracleCreateTableStatement parseCreateTable(boolean acceptCreate) {
|
||||
OracleCreateTableStatement stmt = (OracleCreateTableStatement) super.parseCreateTable(acceptCreate);
|
||||
|
||||
if (lexer.token() == Token.OF) {
|
||||
lexer.nextToken();
|
||||
|
||||
@@ -216,6 +216,7 @@ public class OracleExprParser extends SQLExprParser {
|
||||
|
||||
if ("TIMESTAMP".equalsIgnoreCase(typeName)) {
|
||||
SQLDataTypeImpl timestamp = new SQLDataTypeImpl(typeName);
|
||||
timestamp.setDbType(dbType);
|
||||
|
||||
if (lexer.token() == Token.LPAREN) {
|
||||
lexer.nextToken();
|
||||
@@ -280,7 +281,8 @@ public class OracleExprParser extends SQLExprParser {
|
||||
}
|
||||
|
||||
|
||||
SQLDataType dataType = new SQLDataTypeImpl(typeName);
|
||||
SQLDataTypeImpl dataType = new SQLDataTypeImpl(typeName);
|
||||
dataType.setDbType(dbType);
|
||||
return parseDataTypeRest(dataType);
|
||||
}
|
||||
|
||||
@@ -700,14 +702,14 @@ public class OracleExprParser extends SQLExprParser {
|
||||
return expr;
|
||||
}
|
||||
|
||||
if (lexer.identifierEquals("NEXTVAL")) {
|
||||
if (lexer.identifierEquals(FnvHash.Constants.NEXTVAL)) {
|
||||
if (expr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
|
||||
SQLSequenceExpr seqExpr = new SQLSequenceExpr(identExpr, SQLSequenceExpr.Function.NextVal);
|
||||
lexer.nextToken();
|
||||
return seqExpr;
|
||||
}
|
||||
} else if (lexer.identifierEquals("CURRVAL")) {
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.CURRVAL)) {
|
||||
if (expr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
|
||||
SQLSequenceExpr seqExpr = new SQLSequenceExpr(identExpr, SQLSequenceExpr.Function.CurrVal);
|
||||
@@ -1404,12 +1406,12 @@ public class OracleExprParser extends SQLExprParser {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (lexer.identifierEquals("VALIDATE")) {
|
||||
if (lexer.identifierEquals(FnvHash.Constants.VALIDATE)) {
|
||||
lexer.nextToken();
|
||||
constraint.setValidate(Boolean.TRUE);
|
||||
continue;
|
||||
}
|
||||
if (lexer.identifierEquals("NOVALIDATE")) {
|
||||
if (lexer.identifierEquals(FnvHash.Constants.NOVALIDATE)) {
|
||||
lexer.nextToken();
|
||||
constraint.setValidate(Boolean.FALSE);
|
||||
continue;
|
||||
@@ -1431,7 +1433,7 @@ public class OracleExprParser extends SQLExprParser {
|
||||
|
||||
if (lexer.token() == Token.NOT) {
|
||||
lexer.nextToken();
|
||||
if (lexer.identifierEquals("DEFERRABLE")) {
|
||||
if (lexer.identifierEquals(FnvHash.Constants.DEFERRABLE)) {
|
||||
lexer.nextToken();
|
||||
constraint.setDeferrable(false);
|
||||
continue;
|
||||
@@ -1439,11 +1441,16 @@ public class OracleExprParser extends SQLExprParser {
|
||||
throw new ParserException("TODO " + lexer.info());
|
||||
}
|
||||
|
||||
if (lexer.identifierEquals("DEFERRABLE")) {
|
||||
if (lexer.identifierEquals(FnvHash.Constants.DEFERRABLE)) {
|
||||
lexer.nextToken();
|
||||
constraint.setDeferrable(true);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (lexer.token() == Token.USING) {
|
||||
OracleUsingIndexClause using = parseUsingIndex();
|
||||
constraint.setUsing(using);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -247,7 +247,7 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
}
|
||||
|
||||
public SQLSelectQuery query() {
|
||||
if (lexer.token() == (Token.LPAREN)) {
|
||||
if (lexer.token() == Token.LPAREN) {
|
||||
lexer.nextToken();
|
||||
|
||||
SQLSelectQuery select = query();
|
||||
@@ -270,13 +270,13 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
|
||||
parseHints(queryBlock);
|
||||
|
||||
if (lexer.token() == (Token.DISTINCT)) {
|
||||
if (lexer.token() == Token.DISTINCT) {
|
||||
queryBlock.setDistionOption(SQLSetQuantifier.DISTINCT);
|
||||
lexer.nextToken();
|
||||
} else if (lexer.token() == (Token.UNIQUE)) {
|
||||
} else if (lexer.token() == Token.UNIQUE) {
|
||||
queryBlock.setDistionOption(SQLSetQuantifier.UNIQUE);
|
||||
lexer.nextToken();
|
||||
} else if (lexer.token() == (Token.ALL)) {
|
||||
} else if (lexer.token() == Token.ALL) {
|
||||
queryBlock.setDistionOption(SQLSetQuantifier.ALL);
|
||||
lexer.nextToken();
|
||||
}
|
||||
@@ -304,16 +304,16 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
}
|
||||
|
||||
public SQLSelectQuery queryRest(SQLSelectQuery selectQuery) {
|
||||
if (lexer.token() == (Token.UNION)) {
|
||||
if (lexer.token() == Token.UNION) {
|
||||
SQLUnionQuery union = new SQLUnionQuery();
|
||||
union.setLeft(selectQuery);
|
||||
|
||||
lexer.nextToken();
|
||||
|
||||
if (lexer.token() == (Token.ALL)) {
|
||||
if (lexer.token() == Token.ALL) {
|
||||
union.setOperator(SQLUnionOperator.UNION_ALL);
|
||||
lexer.nextToken();
|
||||
} else if (lexer.token() == (Token.DISTINCT)) {
|
||||
} else if (lexer.token() == Token.DISTINCT) {
|
||||
union.setOperator(SQLUnionOperator.DISTINCT);
|
||||
lexer.nextToken();
|
||||
}
|
||||
@@ -582,10 +582,6 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
}
|
||||
}
|
||||
|
||||
protected String as() {
|
||||
return super.as();
|
||||
}
|
||||
|
||||
@Override
|
||||
public SQLTableSource parseTableSource() {
|
||||
SQLTableSource tableSource = parseTableSourcePrimary();
|
||||
@@ -601,11 +597,11 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
if (lexer.token() == (Token.LPAREN)) {
|
||||
lexer.nextToken();
|
||||
|
||||
OracleSelectSubqueryTableSource tableSource;
|
||||
OracleSelectTableSource tableSource;
|
||||
if (lexer.token() == Token.SELECT || lexer.token() == Token.WITH) {
|
||||
tableSource = new OracleSelectSubqueryTableSource(select());
|
||||
} else if (lexer.token() == (Token.LPAREN)) {
|
||||
tableSource = new OracleSelectSubqueryTableSource(select());
|
||||
} else if (lexer.token() == Token.LPAREN) {
|
||||
tableSource = (OracleSelectTableSource) parseTableSource();
|
||||
} else if (lexer.token() == Token.IDENTIFIER) {
|
||||
SQLTableSource identTable = parseTableSource();
|
||||
accept(Token.RPAREN);
|
||||
@@ -613,9 +609,17 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
} else {
|
||||
throw new ParserException("TODO :" + lexer.info());
|
||||
}
|
||||
|
||||
accept(Token.RPAREN);
|
||||
|
||||
parsePivot((OracleSelectTableSource) tableSource);
|
||||
if (lexer.token() == Token.UNION && tableSource instanceof OracleSelectSubqueryTableSource) {
|
||||
OracleSelectSubqueryTableSource selectSubqueryTableSource = (OracleSelectSubqueryTableSource) tableSource;
|
||||
SQLSelect select = selectSubqueryTableSource.getSelect();
|
||||
SQLSelectQuery selectQuery = this.queryRest(select.getQuery());
|
||||
select.setQuery(selectQuery);
|
||||
}
|
||||
|
||||
parsePivot(tableSource);
|
||||
|
||||
return tableSource;
|
||||
}
|
||||
|
||||
@@ -1606,6 +1606,7 @@ public class OracleStatementParser extends SQLStatementParser {
|
||||
accept(Token.CURSOR);
|
||||
|
||||
dataType = new SQLDataTypeImpl("REF CURSOR");
|
||||
dataType.setDbType(dbType);
|
||||
} else if (lexer.token() == Token.TABLE) {
|
||||
lexer.nextToken();
|
||||
accept(Token.OF);
|
||||
@@ -1619,6 +1620,7 @@ public class OracleStatementParser extends SQLStatementParser {
|
||||
|
||||
String typeName = "TABLE OF " + name.toString() + "%TYPE";
|
||||
dataType = new SQLDataTypeImpl(typeName);
|
||||
dataType.setDbType(dbType);
|
||||
} else if (lexer.identifierEquals("VARRAY")) {
|
||||
lexer.nextToken();
|
||||
accept(Token.LPAREN);
|
||||
@@ -1630,6 +1632,7 @@ public class OracleStatementParser extends SQLStatementParser {
|
||||
lexer.nextToken();
|
||||
String typeName = "VARRAY(" + len + ") OF NUMBER";
|
||||
dataType = new SQLDataTypeImpl(typeName);
|
||||
dataType.setDbType(dbType);
|
||||
} else {
|
||||
throw new ParserException("TODO : " + lexer.info());
|
||||
}
|
||||
|
||||
+9
-4
@@ -139,10 +139,15 @@ public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements
|
||||
@Override
|
||||
public long hashCode64() {
|
||||
if (hashCode64 == 0) {
|
||||
hashCode64 = new SQLPropertyExpr(
|
||||
new SQLPropertyExpr(server, database)
|
||||
, schema)
|
||||
.hashCode64();
|
||||
if (server == null) {
|
||||
hashCode64 = new SQLPropertyExpr(
|
||||
new SQLPropertyExpr(server, database)
|
||||
, schema)
|
||||
.hashCode64();
|
||||
} else {
|
||||
hashCode64 = new SQLPropertyExpr(database, schema)
|
||||
.hashCode64();
|
||||
}
|
||||
}
|
||||
return hashCode64;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user