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,6 +20,9 @@ import java.util.List;
|
||||
|
||||
import com.alibaba.druid.sql.ast.SQLName;
|
||||
import com.alibaba.druid.sql.ast.SQLObjectImpl;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex;
|
||||
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
|
||||
|
||||
public class SQLAlterTableAddIndex extends SQLObjectImpl implements SQLAlterTableItem {
|
||||
@@ -95,4 +98,28 @@ public class SQLAlterTableAddIndex extends SQLObjectImpl implements SQLAlterTabl
|
||||
public void setKey(boolean key) {
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
public void cloneTo(MySqlTableIndex x) {
|
||||
if (name != null) {
|
||||
x.setName(name.clone());
|
||||
}
|
||||
for (SQLSelectOrderByItem item : items) {
|
||||
SQLSelectOrderByItem item2 = item.clone();
|
||||
item2.setParent(x);
|
||||
x.getColumns().add(item);
|
||||
}
|
||||
x.setIndexType(type);
|
||||
}
|
||||
|
||||
public void cloneTo(MySqlKey x) {
|
||||
if (name != null) {
|
||||
x.setName(name.clone());
|
||||
}
|
||||
for (SQLSelectOrderByItem item : items) {
|
||||
SQLSelectOrderByItem item2 = item.clone();
|
||||
item2.setParent(x);
|
||||
x.getColumns().add(item);
|
||||
}
|
||||
x.setIndexType(type);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -108,6 +108,10 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.setName(new SQLIdentifierExpr(name));
|
||||
}
|
||||
|
||||
public SQLDataType getDataType() {
|
||||
return dataType;
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.ast.*;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex;
|
||||
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
|
||||
@@ -210,7 +211,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
|
||||
if (element instanceof MySqlUnique) {
|
||||
MySqlUnique unique = (MySqlUnique) element;
|
||||
|
||||
SQLExpr column = unique.getColumns().get(0);
|
||||
SQLExpr column = unique.getColumns().get(0).getExpr();
|
||||
if (column instanceof SQLIdentifierExpr
|
||||
&& SQLUtils.nameEquals(columnName, ((SQLIdentifierExpr) column).getName())) {
|
||||
return unique.columns.size() > 1;
|
||||
@@ -218,7 +219,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
|
||||
} else if (element instanceof MySqlKey) {
|
||||
MySqlKey unique = (MySqlKey) element;
|
||||
|
||||
SQLExpr column = unique.getColumns().get(0);
|
||||
SQLExpr column = unique.getColumns().get(0).getExpr();
|
||||
if (column instanceof SQLIdentifierExpr
|
||||
&& SQLUtils.nameEquals(columnName, ((SQLIdentifierExpr) column).getName())) {
|
||||
return true;
|
||||
@@ -236,7 +237,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
|
||||
if (element instanceof MySqlUnique) {
|
||||
MySqlUnique unique = (MySqlUnique) element;
|
||||
|
||||
SQLExpr column = unique.getColumns().get(0);
|
||||
SQLExpr column = unique.getColumns().get(0).getExpr();
|
||||
if (column instanceof SQLIdentifierExpr
|
||||
&& SQLUtils.nameEquals(columnName, ((SQLIdentifierExpr) column).getName())) {
|
||||
return unique.columns.size() == 1;
|
||||
@@ -264,7 +265,8 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
|
||||
for (SQLTableElement element : tableElementList) {
|
||||
if (element instanceof SQLUniqueConstraint) {
|
||||
SQLUniqueConstraint unique = (SQLUniqueConstraint) element;
|
||||
for (SQLExpr columnExpr : unique.getColumns()) {
|
||||
for (SQLSelectOrderByItem item : unique.getColumns()) {
|
||||
SQLExpr columnExpr = item.getExpr();
|
||||
if (columnExpr instanceof SQLIdentifierExpr) {
|
||||
String keyColumName = ((SQLIdentifierExpr) columnExpr).getName();
|
||||
keyColumName = SQLUtils.normalize(keyColumName);
|
||||
@@ -571,6 +573,9 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
|
||||
|
||||
} else if (item instanceof SQLAlterTableRenameColumn) {
|
||||
return apply((SQLAlterTableRenameColumn) item);
|
||||
|
||||
} else if (item instanceof SQLAlterTableAddIndex) {
|
||||
return apply((SQLAlterTableAddIndex) item);
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -695,6 +700,29 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean apply(SQLAlterTableAddIndex item) {
|
||||
if (item.isKey()) {
|
||||
MySqlPrimaryKey x = new MySqlPrimaryKey();
|
||||
item.cloneTo(x);
|
||||
x.setParent(this);
|
||||
this.tableElementList.add(x);
|
||||
return true;
|
||||
}
|
||||
if (item.isUnique()) {
|
||||
MySqlUnique x = new MySqlUnique();
|
||||
item.cloneTo(x);
|
||||
x.setParent(this);
|
||||
this.tableElementList.add(x);
|
||||
return true;
|
||||
}
|
||||
|
||||
MySqlTableIndex x = new MySqlTableIndex();
|
||||
item.cloneTo(x);
|
||||
x.setParent(this);
|
||||
this.tableElementList.add(x);
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean apply(SQLAlterTableAddColumn item) {
|
||||
int startIndex = tableElementList.size();
|
||||
if (item.isFirst()) {
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
package com.alibaba.druid.sql.ast.statement;
|
||||
|
||||
import com.alibaba.druid.sql.SQLUtils;
|
||||
import com.alibaba.druid.sql.ast.SQLDataType;
|
||||
import com.alibaba.druid.sql.ast.SQLExpr;
|
||||
import com.alibaba.druid.sql.ast.SQLObjectImpl;
|
||||
import com.alibaba.druid.sql.ast.SQLReplaceable;
|
||||
@@ -80,6 +81,26 @@ public class SQLSelectItem extends SQLObjectImpl implements SQLReplaceable {
|
||||
return SQLUtils.normalize(alias);
|
||||
}
|
||||
|
||||
public SQLDataType computeDataType() {
|
||||
if (expr instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
|
||||
if (identExpr.getResolvedColumn() != null) {
|
||||
return identExpr.getResolvedColumn().getDataType();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
if (expr instanceof SQLPropertyExpr) {
|
||||
SQLPropertyExpr propertyExpr = (SQLPropertyExpr) expr;
|
||||
if (propertyExpr.getResolvedColumn() != null) {
|
||||
return propertyExpr.getResolvedColumn().getDataType();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getAlias() {
|
||||
return this.alias;
|
||||
}
|
||||
|
||||
@@ -26,13 +26,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
|
||||
|
||||
public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint, SQLTableElement {
|
||||
|
||||
protected final List<SQLExpr> columns = new ArrayList<SQLExpr>();
|
||||
protected final List<SQLSelectOrderByItem> columns = new ArrayList<SQLSelectOrderByItem>();
|
||||
|
||||
public SQLUnique(){
|
||||
|
||||
}
|
||||
|
||||
public List<SQLExpr> getColumns() {
|
||||
public List<SQLSelectOrderByItem> getColumns() {
|
||||
return columns;
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint,
|
||||
if (column != null) {
|
||||
column.setParent(this);
|
||||
}
|
||||
this.columns.add(column);
|
||||
this.columns.add(new SQLSelectOrderByItem(column));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -53,7 +53,8 @@ public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint,
|
||||
}
|
||||
|
||||
public boolean containsColumn(String column) {
|
||||
for (SQLExpr expr : columns) {
|
||||
for (SQLSelectOrderByItem item : columns) {
|
||||
SQLExpr expr = item.getExpr();
|
||||
if (expr instanceof SQLIdentifierExpr) {
|
||||
if (SQLUtils.nameEquals(((SQLIdentifierExpr) expr).getName(), column)) {
|
||||
return true;
|
||||
@@ -66,9 +67,10 @@ public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint,
|
||||
public void cloneTo(SQLUnique x) {
|
||||
super.cloneTo(x);
|
||||
|
||||
for (SQLExpr column : columns) {
|
||||
SQLExpr columnClone = column.clone();
|
||||
x.addColumn(columnClone);
|
||||
for (SQLSelectOrderByItem column : columns) {
|
||||
SQLSelectOrderByItem column2 = column.clone();
|
||||
column2.setParent(x);
|
||||
x.columns.add(column2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,7 +83,8 @@ public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint,
|
||||
public void simplify() {
|
||||
super.simplify();
|
||||
|
||||
for (SQLExpr column : columns) {
|
||||
for (SQLSelectOrderByItem item : columns) {
|
||||
SQLExpr column = item.getExpr();
|
||||
if (column instanceof SQLIdentifierExpr) {
|
||||
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) column;
|
||||
String columnName = identExpr.getName();
|
||||
|
||||
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
|
||||
|
||||
public interface SQLUniqueConstraint extends SQLConstraint {
|
||||
|
||||
List<SQLExpr> getColumns();
|
||||
List<SQLSelectOrderByItem> getColumns();
|
||||
|
||||
boolean containsColumn(String column);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user