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:
@@ -20,7 +20,7 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLTableElement;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint;
|
||||
import com.alibaba.druid.util.FNVUtils;
|
||||
import com.alibaba.druid.util.FnvHash;
|
||||
|
||||
/**
|
||||
* Created by wenshao on 08/06/2017.
|
||||
@@ -51,7 +51,7 @@ public class SchemaObjectImpl implements SchemaObject {
|
||||
}
|
||||
|
||||
public SQLColumnDefinition findColumn(String columName) {
|
||||
long hash = FNVUtils.fnv_64_lower_normalized(columName);
|
||||
long hash = FnvHash.hashCode64(columName);
|
||||
return findColumn(hash);
|
||||
}
|
||||
|
||||
|
||||
@@ -16,14 +16,11 @@
|
||||
package com.alibaba.druid.sql.repository;
|
||||
|
||||
import com.alibaba.druid.sql.ast.SQLDeclareItem;
|
||||
import com.alibaba.druid.sql.ast.SQLName;
|
||||
import com.alibaba.druid.sql.ast.SQLObject;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLTableSource;
|
||||
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@@ -105,7 +102,7 @@ public interface SchemaResolveVisitor extends SQLASTVisitor {
|
||||
if (declares == null) {
|
||||
declares = new HashMap<Long, SQLDeclareItem>();
|
||||
}
|
||||
declares.put(x.getName().name_hash_lower(), x);
|
||||
declares.put(x.getName().nameHashCode64(), x);
|
||||
}
|
||||
|
||||
protected SQLDeclareItem findDeclare(long nameHash) {
|
||||
|
||||
@@ -22,7 +22,7 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement
|
||||
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement;
|
||||
import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitorAdapter;
|
||||
import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter;
|
||||
import com.alibaba.druid.util.FNVUtils;
|
||||
import com.alibaba.druid.util.FnvConstants;
|
||||
import com.alibaba.druid.util.PGUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -815,7 +815,7 @@ class SchemaResolveVisitorFactory {
|
||||
}
|
||||
|
||||
public boolean visit(SQLIdentifierExpr x) {
|
||||
if (PGUtils.isPseudoColumn(x.name_hash_lower())) {
|
||||
if (PGUtils.isPseudoColumn(x.nameHashCode64())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1255,7 +1255,7 @@ class SchemaResolveVisitorFactory {
|
||||
SQLIdentifierExpr identifierExpr = (SQLIdentifierExpr) orderByItemExpr;
|
||||
identifierExpr.setResolvedTableSource(table);
|
||||
|
||||
SQLColumnDefinition column = x.findColumn(identifierExpr.name_hash_lower());
|
||||
SQLColumnDefinition column = x.findColumn(identifierExpr.nameHashCode64());
|
||||
if (column != null) {
|
||||
identifierExpr.setResolvedColumn(column);
|
||||
}
|
||||
@@ -1414,10 +1414,10 @@ class SchemaResolveVisitorFactory {
|
||||
}
|
||||
|
||||
String ident = x.getName();
|
||||
long hash = x.name_hash_lower();
|
||||
long hash = x.nameHashCode64();
|
||||
SQLTableSource tableSource = null;
|
||||
|
||||
if ((hash == FNVUtils.LEVEL || hash == FNVUtils.CONNECT_BY_ISCYCLE)
|
||||
if ((hash == FnvConstants.LEVEL || hash == FnvConstants.CONNECT_BY_ISCYCLE)
|
||||
&& ctx.object instanceof SQLSelectQueryBlock) {
|
||||
SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) ctx.object;
|
||||
if (queryBlock.getStartWith() != null
|
||||
@@ -1527,7 +1527,7 @@ class SchemaResolveVisitorFactory {
|
||||
SQLExpr expr = ((SQLExprTableSource) tableSource).getExpr();
|
||||
if (expr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
|
||||
long identHash = identExpr.name_hash_lower();
|
||||
long identHash = identExpr.nameHashCode64();
|
||||
|
||||
tableSource = unwrapAlias(ctx, tableSource, identHash);
|
||||
}
|
||||
@@ -1562,7 +1562,7 @@ class SchemaResolveVisitorFactory {
|
||||
SQLExpr ownerObj = x.getOwner();
|
||||
if (ownerObj instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr owner = (SQLIdentifierExpr) ownerObj;
|
||||
owner_hash = owner.name_hash_lower();
|
||||
owner_hash = owner.nameHashCode64();
|
||||
} else if (ownerObj instanceof SQLPropertyExpr) {
|
||||
owner_hash = ((SQLPropertyExpr) ownerObj).hashCode64();
|
||||
}
|
||||
@@ -1625,7 +1625,7 @@ class SchemaResolveVisitorFactory {
|
||||
|
||||
if (tableSource != null) {
|
||||
x.setResolvedTableSource(tableSource);
|
||||
SQLColumnDefinition column = tableSource.findColumn(x.name_hash_lower());
|
||||
SQLColumnDefinition column = tableSource.findColumn(x.nameHashCode64());
|
||||
if (column != null) {
|
||||
x.setResolvedColumn(column);
|
||||
}
|
||||
@@ -1717,7 +1717,7 @@ class SchemaResolveVisitorFactory {
|
||||
}
|
||||
SQLTableSource tableSource = x.findTableSource(propertyExpr.getOwnernName());
|
||||
if (tableSource != null) {
|
||||
column = tableSource.findColumn(propertyExpr.name_hash_lower());
|
||||
column = tableSource.findColumn(propertyExpr.nameHashCode64());
|
||||
if (column != null) {
|
||||
propertyExpr.setResolvedColumn(column);
|
||||
}
|
||||
@@ -1726,7 +1726,7 @@ class SchemaResolveVisitorFactory {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
|
||||
visitor.visit(identExpr);
|
||||
|
||||
long name_hash = identExpr.name_hash_lower();
|
||||
long name_hash = identExpr.nameHashCode64();
|
||||
|
||||
SQLColumnDefinition column = identExpr.getResolvedColumn();
|
||||
if (column != null) {
|
||||
@@ -1786,7 +1786,7 @@ class SchemaResolveVisitorFactory {
|
||||
|
||||
if (orderByItemExpr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr orderByItemIdentExpr = (SQLIdentifierExpr) orderByItemExpr;
|
||||
long hash = orderByItemIdentExpr.name_hash_lower();
|
||||
long hash = orderByItemIdentExpr.nameHashCode64();
|
||||
SQLSelectItem selectItem = x.findSelectItem(hash);
|
||||
|
||||
if (selectItem != null) {
|
||||
@@ -1901,7 +1901,7 @@ class SchemaResolveVisitorFactory {
|
||||
|
||||
if (orderByItemExpr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr orderByItemIdentExpr = (SQLIdentifierExpr) orderByItemExpr;
|
||||
long hash = orderByItemIdentExpr.name_hash_lower();
|
||||
long hash = orderByItemIdentExpr.nameHashCode64();
|
||||
|
||||
SQLSelectItem selectItem = null;
|
||||
if (queryBlock != null) {
|
||||
@@ -1971,7 +1971,7 @@ class SchemaResolveVisitorFactory {
|
||||
if (identifierExpr != null) {
|
||||
checkParameter(visitor, identifierExpr);
|
||||
|
||||
SQLTableSource tableSource = unwrapAlias(visitor.getContext(), null, identifierExpr.name_hash_lower());
|
||||
SQLTableSource tableSource = unwrapAlias(visitor.getContext(), null, identifierExpr.nameHashCode64());
|
||||
if (tableSource != null) {
|
||||
identifierExpr.setResolvedTableSource(tableSource);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user