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:
+3
-3
@@ -444,7 +444,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
|
||||
|
||||
SQLName columnName = x.getColumnName();
|
||||
if (columnName != null) {
|
||||
addColumn(table, columnName.getSimpleName(), tableName.nameHashCode64(), columnName.nameHashCode64());
|
||||
addColumn(table, columnName.getSimpleName());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -954,7 +954,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
|
||||
|
||||
SQLName column = x.getColumnName();
|
||||
String columnName = column.toString();
|
||||
addColumn(tableName, columnName, table.nameHashCode64(), column.nameHashCode64());
|
||||
addColumn(tableName, columnName);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -972,7 +972,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
|
||||
|
||||
SQLName column = x.getNewColumnDefinition().getName();
|
||||
String columnName = column.toString();
|
||||
addColumn(tableName, columnName, table.nameHashCode64(), column.nameHashCode64());
|
||||
addColumn(tableName, columnName);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -68,8 +68,7 @@ public class OdpsSchemaStatVisitor extends SchemaStatVisitor implements OdpsASTV
|
||||
SQLExpr tableName = tableSource.getExpr();
|
||||
|
||||
if (tableName instanceof SQLName) {
|
||||
String ident = ((SQLName) tableName).toString();
|
||||
TableStat stat = getTableStat(tableName);
|
||||
TableStat stat = getTableStat((SQLName) tableName);
|
||||
stat.incrementInsertCount();
|
||||
|
||||
}
|
||||
|
||||
@@ -76,11 +76,8 @@ public class OracleDbLinkExpr extends SQLExprImpl implements SQLName, OracleExpr
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((dbLink == null) ? 0 : dbLink.hashCode());
|
||||
result = prime * result + ((expr == null) ? 0 : expr.hashCode());
|
||||
return result;
|
||||
long value = hashCode64();
|
||||
return (int)(value ^ (value >>> 32));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -95,21 +92,7 @@ public class OracleDbLinkExpr extends SQLExprImpl implements SQLName, OracleExpr
|
||||
return false;
|
||||
}
|
||||
OracleDbLinkExpr other = (OracleDbLinkExpr) obj;
|
||||
if (dbLink == null) {
|
||||
if (other.dbLink != null) {
|
||||
return false;
|
||||
}
|
||||
} else if (!dbLink.equals(other.dbLink)) {
|
||||
return false;
|
||||
}
|
||||
if (expr == null) {
|
||||
if (other.expr != null) {
|
||||
return false;
|
||||
}
|
||||
} else if (!expr.equals(other.expr)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
return this.hashCode64() == other.hashCode64();
|
||||
}
|
||||
|
||||
public OracleDbLinkExpr clone() {
|
||||
@@ -138,14 +121,14 @@ public class OracleDbLinkExpr extends SQLExprImpl implements SQLName, OracleExpr
|
||||
if (expr instanceof SQLName) {
|
||||
hash = ((SQLName) expr).hashCode64();
|
||||
|
||||
hash ^= '.';
|
||||
hash ^= '@';
|
||||
hash *= FnvHash.PRIME;
|
||||
} else if (expr == null){
|
||||
hash = FnvHash.BASIC;
|
||||
} else {
|
||||
hash = FnvHash.fnv1a_64_lower(expr.toString());
|
||||
|
||||
hash ^= '.';
|
||||
hash ^= '@';
|
||||
hash *= FnvHash.PRIME;
|
||||
}
|
||||
hash = FnvHash.hashCode64(hash, dbLink);
|
||||
|
||||
@@ -480,7 +480,7 @@ public class OracleExprParser extends SQLExprParser {
|
||||
if (acceptLPAREN) {
|
||||
accept(Token.LPAREN);
|
||||
}
|
||||
|
||||
|
||||
if (lexer.token() == Token.PLUS) {
|
||||
lexer.nextToken();
|
||||
accept(Token.RPAREN);
|
||||
@@ -508,7 +508,7 @@ public class OracleExprParser extends SQLExprParser {
|
||||
return primaryRest(treatExpr);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return super.methodRest(expr, false);
|
||||
}
|
||||
|
||||
@@ -878,11 +878,31 @@ public class OracleExprParser extends SQLExprParser {
|
||||
interval.setValue(new SQLCharExpr(lexer.stringVal()));
|
||||
lexer.nextToken();
|
||||
|
||||
|
||||
OracleIntervalType type = OracleIntervalType.valueOf(lexer.stringVal());
|
||||
OracleIntervalType type;
|
||||
if (lexer.identifierEquals(FnvHash.Constants.YEAR)) {
|
||||
lexer.nextToken();
|
||||
type = OracleIntervalType.YEAR;
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.MONTH)) {
|
||||
lexer.nextToken();
|
||||
type = OracleIntervalType.MONTH;
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.DAY)) {
|
||||
lexer.nextToken();
|
||||
type = OracleIntervalType.DAY;
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.HOUR)) {
|
||||
lexer.nextToken();
|
||||
type = OracleIntervalType.HOUR;
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.MINUTE)) {
|
||||
lexer.nextToken();
|
||||
type = OracleIntervalType.MINUTE;
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.SECOND)) {
|
||||
lexer.nextToken();
|
||||
type = OracleIntervalType.SECOND;
|
||||
} else {
|
||||
throw new ParserException("illegal interval type. " + lexer.info());
|
||||
}
|
||||
|
||||
interval.setType(type);
|
||||
lexer.nextToken();
|
||||
|
||||
|
||||
if (lexer.token() == Token.LPAREN) {
|
||||
lexer.nextToken();
|
||||
if (lexer.token() != Token.LITERAL_INT) {
|
||||
|
||||
@@ -922,8 +922,6 @@ public class OracleStatementParser extends SQLStatementParser {
|
||||
if (lexer.token() == Token.ELSE) {
|
||||
lexer.nextToken();
|
||||
|
||||
|
||||
|
||||
SQLIfStatement.Else elseItem = new SQLIfStatement.Else();
|
||||
this.parseStatementList(elseItem.getStatements(), -1, elseItem);
|
||||
stmt.setElseItem(elseItem);
|
||||
|
||||
+15
-19
@@ -151,9 +151,7 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle
|
||||
}
|
||||
|
||||
if (tableExpr instanceof SQLName) {
|
||||
String ident = tableExpr.toString();
|
||||
|
||||
TableStat stat = getTableStat(ident);
|
||||
TableStat stat = getTableStat((SQLName) tableExpr);
|
||||
stat.incrementUpdateCount();
|
||||
} else {
|
||||
tableSource.accept(this);
|
||||
@@ -176,13 +174,13 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle
|
||||
}
|
||||
|
||||
public boolean visit(OracleSelectQueryBlock x) {
|
||||
if (x.getInto() instanceof SQLName) {
|
||||
String tableName = x.getInto().toString();
|
||||
TableStat stat = getTableStat(tableName);
|
||||
if (stat != null) {
|
||||
stat.incrementInsertCount();
|
||||
}
|
||||
}
|
||||
SQLExprTableSource into = x.getInto();
|
||||
// if (into != null && into.getExpr() instanceof SQLName) {
|
||||
// TableStat stat = getTableStat((SQLName) into.getExpr());
|
||||
// if (stat != null) {
|
||||
// stat.incrementInsertCount();
|
||||
// }
|
||||
// }
|
||||
|
||||
return visit((SQLSelectQueryBlock) x);
|
||||
}
|
||||
@@ -638,9 +636,7 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle
|
||||
public boolean visit(InsertIntoClause x) {
|
||||
|
||||
if (x.getTableName() instanceof SQLName) {
|
||||
String ident = ((SQLName) x.getTableName()).toString();
|
||||
|
||||
TableStat stat = getTableStat(ident);
|
||||
TableStat stat = getTableStat(x.getTableName());
|
||||
stat.incrementInsertCount();
|
||||
}
|
||||
|
||||
@@ -729,8 +725,7 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle
|
||||
|
||||
@Override
|
||||
public boolean visit(OracleLockTableStatement x) {
|
||||
String tableName = x.getTable().toString();
|
||||
getTableStat(tableName);
|
||||
getTableStat(x.getTable());
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -902,11 +897,12 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle
|
||||
@Override
|
||||
public boolean visit(OracleAlterTableModify x) {
|
||||
SQLAlterTableStatement stmt = (SQLAlterTableStatement) x.getParent();
|
||||
String table = stmt.getName().toString();
|
||||
SQLName tableName = stmt.getName();
|
||||
String table = tableName.toString();
|
||||
|
||||
for (SQLColumnDefinition column : x.getColumns()) {
|
||||
String columnName = column.getName().toString();
|
||||
addColumn(table, columnName);
|
||||
SQLName columnName = column.getName();
|
||||
addColumn(table, columnName.toString());
|
||||
|
||||
}
|
||||
|
||||
@@ -1333,7 +1329,7 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle
|
||||
}
|
||||
|
||||
if (sql != null) {
|
||||
List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, getDbType());
|
||||
List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, dbType);
|
||||
for (SQLStatement stmt : stmtList) {
|
||||
stmt.accept(this);
|
||||
}
|
||||
|
||||
+2
-6
@@ -139,9 +139,7 @@ public class PGSchemaStatVisitor extends SchemaStatVisitor implements PGASTVisit
|
||||
|
||||
SQLName tableName = x.getTableName();
|
||||
{
|
||||
String ident = tableName.toString();
|
||||
|
||||
TableStat stat = getTableStat(ident);
|
||||
TableStat stat = getTableStat(tableName);
|
||||
stat.incrementInsertCount();
|
||||
}
|
||||
|
||||
@@ -181,9 +179,7 @@ public class PGSchemaStatVisitor extends SchemaStatVisitor implements PGASTVisit
|
||||
x.getWith().accept(this);
|
||||
}
|
||||
|
||||
String ident = x.getTableName().toString();
|
||||
|
||||
TableStat stat = getTableStat(ident);
|
||||
TableStat stat = getTableStat(x.getTableName());
|
||||
stat.incrementUpdateCount();
|
||||
|
||||
accept(x.getFrom());
|
||||
|
||||
+1
-3
@@ -84,9 +84,7 @@ public class SQLServerSchemaStatVisitor extends SchemaStatVisitor implements SQL
|
||||
|
||||
@Override
|
||||
public boolean visit(SQLServerUpdateStatement x) {
|
||||
String ident = x.getTableName().toString();
|
||||
|
||||
TableStat stat = getTableStat(ident);
|
||||
TableStat stat = getTableStat(x.getTableName());
|
||||
stat.incrementUpdateCount();
|
||||
|
||||
accept(x.getItems());
|
||||
|
||||
Reference in New Issue
Block a user