Fix obvious mistakes like spelling errors

This commit is contained in:
Zhanhui Li
2014-08-08 00:20:12 +08:00
parent 6c9df6ef2b
commit 2921b89fcc
196 changed files with 1157 additions and 1284 deletions
@@ -15,11 +15,11 @@
*/
package com.alibaba.druid.sql.ast;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType {
protected String name;
@@ -59,7 +59,7 @@ public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType {
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((arguments == null) ? 0 : arguments.hashCode());
result = prime * result + arguments.hashCode();
result = prime * result + ((name == null) ? 0 : name.hashCode());
return result;
}
@@ -70,9 +70,7 @@ public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType {
if (obj == null) return false;
if (getClass() != obj.getClass()) return false;
SQLDataTypeImpl other = (SQLDataTypeImpl) obj;
if (arguments == null) {
if (other.arguments != null) return false;
} else if (!arguments.equals(other.arguments)) return false;
if (!arguments.equals(other.arguments)) return false;
if (name == null) {
if (other.name != null) return false;
} else if (!name.equals(other.name)) return false;
@@ -16,5 +16,5 @@
package com.alibaba.druid.sql.ast;
public interface SQLName extends SQLExpr {
String getSimleName();
String getSimpleName();
}
@@ -15,12 +15,12 @@
*/
package com.alibaba.druid.sql.ast;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import java.util.ArrayList;
import java.util.List;
public class SQLOrderBy extends SQLObjectImpl {
protected final List<SQLSelectOrderByItem> items = new ArrayList<SQLSelectOrderByItem>();
@@ -58,7 +58,7 @@ public class SQLOrderBy extends SQLObjectImpl {
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((items == null) ? 0 : items.hashCode());
result = prime * result + items.hashCode();
return result;
}
@@ -68,10 +68,7 @@ public class SQLOrderBy extends SQLObjectImpl {
if (obj == null) return false;
if (getClass() != obj.getClass()) return false;
SQLOrderBy other = (SQLOrderBy) obj;
if (items == null) {
if (other.items != null) return false;
} else if (!items.equals(other.items)) return false;
return true;
return items.equals(other.items);
}
@@ -16,5 +16,5 @@
package com.alibaba.druid.sql.ast;
public enum SQLOrderingSpecification {
ASC, DESC;
ASC, DESC
}
@@ -1,10 +1,10 @@
package com.alibaba.druid.sql.ast;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
/*
* Copyright 1999-2011 Alibaba Group Holding Ltd.
*
@@ -62,7 +62,7 @@ public class SQLOver extends SQLObjectImpl {
final int prime = 31;
int result = 1;
result = prime * result + ((orderBy == null) ? 0 : orderBy.hashCode());
result = prime * result + ((partitionBy == null) ? 0 : partitionBy.hashCode());
result = prime * result + partitionBy.hashCode();
return result;
}
@@ -85,14 +85,7 @@ public class SQLOver extends SQLObjectImpl {
} else if (!orderBy.equals(other.orderBy)) {
return false;
}
if (partitionBy == null) {
if (other.partitionBy != null) {
return false;
}
} else if (!partitionBy.equals(other.partitionBy)) {
return false;
}
return true;
return partitionBy.equals(other.partitionBy);
}
}
@@ -33,7 +33,7 @@ public class SQLIdentifierExpr extends SQLExprImpl implements SQLName {
this.name = name;
}
public String getSimleName() {
public String getSimpleName() {
return name;
}
@@ -34,7 +34,7 @@ public class SQLPropertyExpr extends SQLExprImpl implements SQLName {
}
public String getSimleName() {
public String getSimpleName() {
return name;
}
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class NotNullConstraint extends SQLConstaintImpl implements SQLColumnConstraint {
public class NotNullConstraint extends SQLConstraintImpl implements SQLColumnConstraint {
public NotNullConstraint(){
@@ -20,14 +20,14 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLAlterTableAddConstraint extends SQLObjectImpl implements SQLAlterTableItem {
private SQLConstaint constraint;
private SQLConstraint constraint;
private boolean withNoCheck = false;
public SQLAlterTableAddConstraint(){
}
public SQLAlterTableAddConstraint(SQLConstaint constraint){
public SQLAlterTableAddConstraint(SQLConstraint constraint){
this.setConstraint(constraint);
}
@@ -39,11 +39,11 @@ public class SQLAlterTableAddConstraint extends SQLObjectImpl implements SQLAlte
visitor.endVisit(this);
}
public SQLConstaint getConstraint() {
public SQLConstraint getConstraint() {
return constraint;
}
public void setConstraint(SQLConstaint constraint) {
public void setConstraint(SQLConstraint constraint) {
if (constraint != null) {
constraint.setParent(this);
}
@@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLAlterTableDropForeinKey extends SQLObjectImpl implements SQLAlterTableItem {
public class SQLAlterTableDropForeignKey extends SQLObjectImpl implements SQLAlterTableItem {
private SQLName indexName;
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLDataTypeImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLCharactorDataType extends SQLDataTypeImpl {
public class SQLCharacterDataType extends SQLDataTypeImpl {
private String charSetName;
private String collate;
@@ -28,7 +28,7 @@ public class SQLCharactorDataType extends SQLDataTypeImpl {
public final static String CHAR_TYPE_BYTE = "BYTE";
public final static String CHAR_TYPE_CHAR = "CHAR";
public SQLCharactorDataType(String name){
public SQLCharacterDataType(String name){
super(name);
}
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLCheck extends SQLConstaintImpl implements SQLTableElement {
public class SQLCheck extends SQLConstraintImpl implements SQLTableElement {
private SQLExpr expr;
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLColumnCheck extends SQLConstaintImpl implements SQLColumnConstraint {
public class SQLColumnCheck extends SQLConstraintImpl implements SQLColumnConstraint {
private SQLExpr expr;
@@ -15,6 +15,6 @@
*/
package com.alibaba.druid.sql.ast.statement;
public interface SQLColumnConstraint extends SQLConstaint {
public interface SQLColumnConstraint extends SQLConstraint {
}
@@ -15,21 +15,21 @@
*/
package com.alibaba.druid.sql.ast.statement;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import java.util.ArrayList;
import java.util.List;
public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElement {
protected SQLName name;
protected SQLDataType dataType;
protected SQLExpr defaultExpr;
protected final List<SQLColumnConstraint> constaints = new ArrayList<SQLColumnConstraint>(0);
protected final List<SQLColumnConstraint> constraints = new ArrayList<SQLColumnConstraint>(0);
protected SQLExpr comment;
protected Boolean enable;
@@ -73,8 +73,8 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen
this.defaultExpr = defaultExpr;
}
public List<SQLColumnConstraint> getConstaints() {
return constaints;
public List<SQLColumnConstraint> getConstraints() {
return constraints;
}
@Override
@@ -94,7 +94,7 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen
this.acceptChild(visitor, name);
this.acceptChild(visitor, dataType);
this.acceptChild(visitor, defaultExpr);
this.acceptChild(visitor, constaints);
this.acceptChild(visitor, constraints);
}
visitor.endVisit(this);
}
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLColumnPrimaryKey extends SQLConstaintImpl implements SQLColumnConstraint {
public class SQLColumnPrimaryKey extends SQLConstraintImpl implements SQLColumnConstraint {
@Override
protected void accept0(SQLASTVisitor visitor) {
@@ -21,7 +21,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLColumnReference extends SQLConstaintImpl implements SQLColumnConstraint {
public class SQLColumnReference extends SQLConstraintImpl implements SQLColumnConstraint {
private SQLName table;
private List<SQLName> columns = new ArrayList<SQLName>();
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLColumnUniqueKey extends SQLConstaintImpl implements SQLColumnConstraint {
public class SQLColumnUniqueKey extends SQLConstraintImpl implements SQLColumnConstraint {
@Override
protected void accept0(SQLASTVisitor visitor) {
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
public interface SQLConstaint extends SQLObject {
public interface SQLConstraint extends SQLObject {
SQLName getName();
@@ -18,12 +18,12 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
public abstract class SQLConstaintImpl extends SQLObjectImpl implements SQLConstaint {
public abstract class SQLConstraintImpl extends SQLObjectImpl implements SQLConstraint {
private SQLName name;
private Boolean enable;
public SQLConstaintImpl(){
public SQLConstraintImpl(){
}
@@ -19,7 +19,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLName;
public interface SQLForeignKeyConstraint extends SQLConstaint, SQLTableElement, SQLTableConstaint {
public interface SQLForeignKeyConstraint extends SQLConstraint, SQLTableElement, SQLTableConstraint {
List<SQLName> getReferencingColumns();
@@ -21,7 +21,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLForeignKeyImpl extends SQLConstaintImpl implements SQLForeignKeyConstraint {
public class SQLForeignKeyImpl extends SQLConstraintImpl implements SQLForeignKeyConstraint {
private SQLName referencedTableName;
private List<SQLName> referencingColumns = new ArrayList<SQLName>();
@@ -15,6 +15,6 @@
*/
package com.alibaba.druid.sql.ast.statement;
public interface SQLTableConstaint extends SQLConstaint, SQLTableElement {
public interface SQLTableConstraint extends SQLConstraint, SQLTableElement {
}
@@ -21,7 +21,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLUnique extends SQLConstaintImpl implements SQLUniqueConstraint, SQLTableElement {
public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint, SQLTableElement {
private final List<SQLExpr> columns = new ArrayList<SQLExpr>();
@@ -19,7 +19,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
public interface SQLUniqueConstraint extends SQLConstaint {
public interface SQLUniqueConstraint extends SQLConstraint {
List<SQLExpr> getColumns();
@@ -16,13 +16,13 @@
package com.alibaba.druid.sql.dialect.mysql.ast;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.statement.SQLTableConstaint;
import com.alibaba.druid.sql.ast.statement.SQLTableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLUnique;
import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class MySqlKey extends SQLUnique implements SQLUniqueConstraint, SQLTableConstaint {
public class MySqlKey extends SQLUnique implements SQLUniqueConstraint, SQLTableConstraint {
private SQLName indexName;
@@ -27,7 +27,7 @@ public class MysqlForeignKey extends SQLForeignKeyImpl {
private SQLName indexName;
private boolean hasConstaint;
private boolean hasConstraint;
private Match referenceMatch;
@@ -43,12 +43,12 @@ public class MysqlForeignKey extends SQLForeignKeyImpl {
this.indexName = indexName;
}
public boolean isHasConstaint() {
return hasConstaint;
public boolean isHasConstraint() {
return hasConstraint;
}
public void setHasConstaint(boolean hasConstaint) {
this.hasConstaint = hasConstaint;
public void setHasConstraint(boolean hasConstraint) {
this.hasConstraint = hasConstraint;
}
@Override
@@ -45,11 +45,11 @@ public class MySqlUserName extends MySqlExprImpl implements SQLName {
visitor.endVisit(this);
}
public String getSimleName() {
public String getSimpleName() {
return userName + '@' + host;
}
public String toString() {
return getSimleName();
return getSimpleName();
}
}
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLTableConstaint;
import com.alibaba.druid.sql.ast.statement.SQLTableConstraint;
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;
@@ -136,7 +136,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
} else if (lexer.token() == (Token.KEY)) {
stmt.getTableElementList().add(parseConstraint());
} else if (lexer.token() == (Token.PRIMARY)) {
SQLTableConstaint pk = parseConstraint();
SQLTableConstraint pk = parseConstraint();
pk.setParent(stmt);
stmt.getTableElementList().add(pk);
} else if (lexer.token() == (Token.FOREIGN)) {
@@ -595,7 +595,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
return false;
}
protected SQLTableConstaint parseConstraint() {
protected SQLTableConstraint parseConstraint() {
SQLName name = null;
boolean hasConstaint = false;
if (lexer.token() == (Token.CONSTRAINT)) {
@@ -661,21 +661,21 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
MySqlPrimaryKey pk = this.getExprParser().parsePrimaryKey();
pk.setName(name);
pk.setHasConstaint(hasConstaint);
return (SQLTableConstaint) pk;
return (SQLTableConstraint) pk;
}
if (lexer.token() == Token.UNIQUE) {
MySqlUnique uk = this.getExprParser().parseUnique();
uk.setName(name);
uk.setHasConstaint(hasConstaint);
return (SQLTableConstaint) uk;
return (SQLTableConstraint) uk;
}
if (lexer.token() == Token.FOREIGN) {
MysqlForeignKey fk = this.getExprParser().parseForeignKey();
fk.setName(name);
fk.setHasConstaint(hasConstaint);
return (SQLTableConstaint) fk;
fk.setHasConstraint(hasConstaint);
return (SQLTableConstraint) fk;
}
throw new ParserException("TODO :" + lexer.token());
@@ -37,7 +37,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint;
@@ -2206,7 +2206,7 @@ public class MySqlStatementParser extends SQLStatementParser {
} else if (lexer.token() == Token.FOREIGN) {
MysqlForeignKey fk = this.getExprParser().parseForeignKey();
fk.setName(constraintName);
fk.setHasConstaint(true);
fk.setHasConstraint(true);
SQLAlterTableAddConstraint item = new SQLAlterTableAddConstraint(fk);
@@ -2430,7 +2430,7 @@ public class MySqlStatementParser extends SQLStatementParser {
lexer.nextToken();
accept(Token.KEY);
SQLName indexName = this.exprParser.name();
SQLAlterTableDropForeinKey item = new SQLAlterTableDropForeinKey();
SQLAlterTableDropForeignKey item = new SQLAlterTableDropForeignKey();
item.setIndexName(indexName);
stmt.getItems().add(item);
} else if (lexer.token() == Token.PRIMARY) {
@@ -31,7 +31,7 @@ import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem;
import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLColumnConstraint;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
@@ -312,7 +312,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print(" AUTO_INCREMENT");
}
for (SQLColumnConstraint item : x.getConstaints()) {
for (SQLColumnConstraint item : x.getConstraints()) {
print(' ');
item.accept(this);
}
@@ -353,8 +353,8 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
}
if (x instanceof SQLCharactorDataType) {
SQLCharactorDataType charType = (SQLCharactorDataType) x;
if (x instanceof SQLCharacterDataType) {
SQLCharacterDataType charType = (SQLCharacterDataType) x;
if (charType.getCharSetName() != null) {
print(" CHARACTER SET ");
print(charType.getCharSetName());
@@ -368,7 +368,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
return false;
}
public boolean visit(SQLCharactorDataType x) {
public boolean visit(SQLCharacterDataType x) {
print(x.getName());
if (x.getArguments().size() > 0) {
print("(");
@@ -2838,7 +2838,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public boolean visit(MysqlForeignKey x) {
if (x.isHasConstaint()) {
if (x.isHasConstraint()) {
print("CONSTRAINT ");
if (x.getName() != null) {
x.getName().accept(this);
@@ -15,10 +15,6 @@
*/
package com.alibaba.druid.sql.dialect.mysql.visitor;
import java.security.AccessControlException;
import java.util.List;
import java.util.Properties;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
@@ -37,6 +33,10 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils;
import com.alibaba.druid.sql.visitor.ParameterizedVisitor;
import java.security.AccessControlException;
import java.util.List;
import java.util.Properties;
public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor implements ParameterizedVisitor {
private boolean shardingSupport = true;
@@ -51,12 +51,12 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor implemen
super(appender);
try {
configFromPropety(System.getProperties());
configFromProperty(System.getProperties());
} catch (AccessControlException e) {
}
}
public void configFromPropety(Properties properties) {
public void configFromProperty(Properties properties) {
{
String property = properties.getProperty("druid.parameterized.shardingSupport");
if ("true".equals(property)) {
@@ -30,7 +30,7 @@ public class OracleDbLinkExpr extends SQLExprImpl implements SQLName, OracleExpr
}
public String getSimleName() {
public String getSimpleName() {
return dbLink;
}
@@ -15,12 +15,12 @@
*/
package com.alibaba.druid.sql.dialect.oracle.ast.stmt;
import com.alibaba.druid.sql.ast.statement.SQLConstaint;
import com.alibaba.druid.sql.ast.statement.SQLConstraint;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
public class OracleAlterTableAddConstaint extends OracleAlterTableItem {
private SQLConstaint constraint;
private SQLConstraint constraint;
@Override
public void accept0(OracleASTVisitor visitor) {
@@ -30,11 +30,11 @@ public class OracleAlterTableAddConstaint extends OracleAlterTableItem {
visitor.endVisit(this);
}
public SQLConstaint getConstraint() {
public SQLConstraint getConstraint() {
return constraint;
}
public void setConstraint(SQLConstaint constraint) {
public void setConstraint(SQLConstraint constraint) {
this.constraint = constraint;
}
@@ -16,11 +16,11 @@
package com.alibaba.druid.sql.dialect.oracle.ast.stmt;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.statement.SQLConstaint;
import com.alibaba.druid.sql.ast.statement.SQLConstraint;
import com.alibaba.druid.sql.ast.statement.SQLTableElement;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject;
public interface OracleConstraint extends OracleSQLObject, SQLConstaint, SQLTableElement {
public interface OracleConstraint extends OracleSQLObject, SQLConstraint, SQLTableElement {
SQLName getExceptionsInto();
@@ -36,7 +36,7 @@ import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr;
import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint;
@@ -242,7 +242,7 @@ public class OracleExprParser extends SQLExprParser {
}
if (isCharType(typeName)) {
SQLCharactorDataType charType = new SQLCharactorDataType(typeName);
SQLCharacterDataType charType = new SQLCharacterDataType(typeName);
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
@@ -251,10 +251,10 @@ public class OracleExprParser extends SQLExprParser {
if (identifierEquals("CHAR")) {
lexer.nextToken();
charType.setCharType(SQLCharactorDataType.CHAR_TYPE_CHAR);
charType.setCharType(SQLCharacterDataType.CHAR_TYPE_CHAR);
} else if (identifierEquals("BYTE")) {
lexer.nextToken();
charType.setCharType(SQLCharactorDataType.CHAR_TYPE_BYTE);
charType.setCharType(SQLCharacterDataType.CHAR_TYPE_BYTE);
}
accept(Token.RPAREN);
@@ -28,7 +28,7 @@ import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem;
import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
@@ -3141,7 +3141,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
}
public boolean visit(SQLCharactorDataType x) {
public boolean visit(SQLCharacterDataType x) {
print(x.getName());
if (x.getArguments().size() > 0) {
print("(");
@@ -49,7 +49,7 @@ public class SQLServerColumnDefinition extends SQLColumnDefinition implements SQ
this.acceptChild(visitor, name);
this.acceptChild(visitor, dataType);
this.acceptChild(visitor, defaultExpr);
this.acceptChild(visitor, constaints);
this.acceptChild(visitor, constraints);
this.acceptChild(visitor, identity);
}
visitor.endVisit(this);
@@ -45,7 +45,7 @@ public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements
}
}
public String getSimleName() {
public String getSimpleName() {
if (schema != null) {
return schema;
}
@@ -267,7 +267,7 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe
visitColumnDefault(x);
}
for (SQLColumnConstraint item : x.getConstaints()) {
for (SQLColumnConstraint item : x.getConstraints()) {
print(' ');
item.accept(this);
}
@@ -16,7 +16,7 @@
package com.alibaba.druid.sql.parser;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLConstaint;
import com.alibaba.druid.sql.ast.statement.SQLConstraint;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLTableElement;
@@ -76,7 +76,7 @@ public class SQLCreateTableParser extends SQLDDLParser {
|| lexer.token == Token.UNIQUE //
|| lexer.token == Token.CHECK //
|| lexer.token == Token.CONSTRAINT) {
SQLConstaint constraint = this.exprParser.parseConstaint();
SQLConstraint constraint = this.exprParser.parseConstaint();
constraint.setParent(createTable);
createTable.getTableElementList().add((SQLTableElement) constraint);
} else if (lexer.token() == Token.TABLESPACE) {
@@ -100,7 +100,7 @@ public class SQLCreateTableParser extends SQLDDLParser {
// while
// (this.tokenList.current().equals(OracleToken.ConstraintToken)) {
// parseConstaint(table.getConstaints());
// parseConstaint(table.getConstraints());
//
// if (this.tokenList.current().equals(OracleToken.CommaToken))
// ;
@@ -15,7 +15,7 @@
*/
package com.alibaba.druid.sql.parser;
import com.alibaba.druid.sql.ast.statement.SQLTableConstaint;
import com.alibaba.druid.sql.ast.statement.SQLTableConstraint;
public class SQLDDLParser extends SQLStatementParser {
@@ -27,7 +27,7 @@ public class SQLDDLParser extends SQLStatementParser {
super(exprParser);
}
protected SQLTableConstaint parseConstraint() {
protected SQLTableConstraint parseConstraint() {
if (lexer.token() == Token.CONSTRAINT) {
lexer.nextToken();
}
@@ -62,14 +62,14 @@ import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.ast.statement.NotNullConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLColumnPrimaryKey;
import com.alibaba.druid.sql.ast.statement.SQLColumnReference;
import com.alibaba.druid.sql.ast.statement.SQLColumnUniqueKey;
import com.alibaba.druid.sql.ast.statement.SQLConstaint;
import com.alibaba.druid.sql.ast.statement.SQLConstraint;
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint;
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl;
import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey;
@@ -1314,7 +1314,7 @@ public class SQLExprParser extends SQLParser {
String typeName = typeExpr.toString();
if (isCharType(typeName)) {
SQLCharactorDataType charType = new SQLCharactorDataType(typeName);
SQLCharacterDataType charType = new SQLCharacterDataType(typeName);
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
@@ -1359,7 +1359,7 @@ public class SQLExprParser extends SQLParser {
;
}
protected SQLDataType parseCharTypeRest(SQLCharactorDataType charType) {
protected SQLDataType parseCharTypeRest(SQLCharacterDataType charType) {
if (identifierEquals("CHARACTER")) {
lexer.nextToken();
@@ -1418,7 +1418,7 @@ public class SQLExprParser extends SQLParser {
if (lexer.token() == Token.NOT) {
lexer.nextToken();
accept(Token.NULL);
column.getConstaints().add(new NotNullConstraint());
column.getConstraints().add(new NotNullConstraint());
return parseColumnRest(column);
}
@@ -1431,7 +1431,7 @@ public class SQLExprParser extends SQLParser {
if (lexer.token == Token.PRIMARY) {
lexer.nextToken();
accept(Token.KEY);
column.getConstaints().add(new SQLColumnPrimaryKey());
column.getConstraints().add(new SQLColumnPrimaryKey());
return parseColumnRest(column);
}
@@ -1440,7 +1440,7 @@ public class SQLExprParser extends SQLParser {
if (lexer.token() == Token.KEY) {
lexer.nextToken();
}
column.getConstaints().add(new SQLColumnPrimaryKey());
column.getConstraints().add(new SQLColumnPrimaryKey());
return parseColumnRest(column);
}
@@ -1454,7 +1454,7 @@ public class SQLExprParser extends SQLParser {
accept(Token.KEY);
SQLColumnPrimaryKey pk = new SQLColumnPrimaryKey();
pk.setName(name);
column.getConstaints().add(pk);
column.getConstraints().add(pk);
return parseColumnRest(column);
}
@@ -1462,7 +1462,7 @@ public class SQLExprParser extends SQLParser {
lexer.nextToken();
SQLColumnUniqueKey uk = new SQLColumnUniqueKey();
uk.setName(name);
column.getConstaints().add(uk);
column.getConstraints().add(uk);
return parseColumnRest(column);
}
@@ -1474,7 +1474,7 @@ public class SQLExprParser extends SQLParser {
accept(Token.LPAREN);
this.names(ref.getColumns(), ref);
accept(Token.RPAREN);
column.getConstaints().add(ref);
column.getConstraints().add(ref);
return parseColumnRest(column);
}
@@ -1483,7 +1483,7 @@ public class SQLExprParser extends SQLParser {
accept(Token.NULL);
NotNullConstraint notNull = new NotNullConstraint();
notNull.setName(name);
column.getConstaints().add(notNull);
column.getConstraints().add(notNull);
return parseColumnRest(column);
}
@@ -1491,7 +1491,7 @@ public class SQLExprParser extends SQLParser {
SQLColumnCheck check = parseColumnCheck();
check.setName(name);
check.setParent(column);
column.getConstaints().add(check);
column.getConstraints().add(check);
return parseColumnRest(column);
}
@@ -1507,7 +1507,7 @@ public class SQLExprParser extends SQLParser {
if (lexer.token == Token.CHECK) {
SQLColumnCheck check = parseColumnCheck();
column.getConstaints().add(check);
column.getConstraints().add(check);
return parseColumnRest(column);
}
@@ -1590,7 +1590,7 @@ public class SQLExprParser extends SQLParser {
}
}
public SQLConstaint parseConstaint() {
public SQLConstraint parseConstaint() {
SQLName name = null;
if (lexer.token() == Token.CONSTRAINT) {
@@ -1598,7 +1598,7 @@ public class SQLExprParser extends SQLParser {
name = this.name();
}
SQLConstaint constraint;
SQLConstraint constraint;
if (lexer.token() == Token.PRIMARY) {
constraint = parsePrimaryKey();
} else if (lexer.token() == Token.UNIQUE) {
@@ -41,7 +41,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLCallStatement;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLCommentStatement;
import com.alibaba.druid.sql.ast.statement.SQLConstaint;
import com.alibaba.druid.sql.ast.statement.SQLConstraint;
import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement;
import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
@@ -705,7 +705,7 @@ public class SQLStatementParser extends SQLParser {
lexer.nextToken();
acceptIdentifier("NOCHECK");
acceptIdentifier("ADD");
SQLConstaint check = this.exprParser.parseConstaint();
SQLConstraint check = this.exprParser.parseConstaint();
SQLAlterTableAddConstraint addCheck = new SQLAlterTableAddConstraint();
addCheck.setWithNoCheck(true);
@@ -73,7 +73,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint;
@@ -83,7 +83,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableRenameColumn;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLCallStatement;
import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnConstraint;
@@ -472,7 +472,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
return false;
}
public boolean visit(SQLCharactorDataType x) {
public boolean visit(SQLCharacterDataType x) {
visit((SQLDataType) x);
return false;
}
@@ -883,7 +883,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
visitColumnDefault(x);
}
for (SQLColumnConstraint item : x.getConstaints()) {
for (SQLColumnConstraint item : x.getConstraints()) {
boolean newLine = item instanceof SQLForeignKeyConstraint //
|| item instanceof SQLPrimaryKey //
|| item instanceof SQLColumnCheck //
@@ -1571,7 +1571,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
}
@Override
public boolean visit(SQLAlterTableDropForeinKey x) {
public boolean visit(SQLAlterTableDropForeignKey x) {
print("DROP FOREIGN KEY ");
x.getIndexName().accept(this);
return false;
@@ -58,7 +58,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint;
@@ -67,7 +67,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableRenameColumn;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLCallStatement;
import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
@@ -257,9 +257,9 @@ public interface SQLASTVisitor {
void endVisit(SQLDataType x);
boolean visit(SQLCharactorDataType x);
boolean visit(SQLCharacterDataType x);
void endVisit(SQLCharactorDataType x);
void endVisit(SQLCharacterDataType x);
boolean visit(SQLDeleteStatement x);
@@ -425,9 +425,9 @@ public interface SQLASTVisitor {
void endVisit(SQLCheck x);
boolean visit(SQLAlterTableDropForeinKey x);
boolean visit(SQLAlterTableDropForeignKey x);
void endVisit(SQLAlterTableDropForeinKey x);
void endVisit(SQLAlterTableDropForeignKey x);
boolean visit(SQLAlterTableDropPrimaryKey x);
@@ -59,7 +59,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint;
@@ -68,7 +68,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableRenameColumn;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLCallStatement;
import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
@@ -732,12 +732,12 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
}
@Override
public boolean visit(SQLCharactorDataType x) {
public boolean visit(SQLCharacterDataType x) {
return true;
}
@Override
public void endVisit(SQLCharactorDataType x) {
public void endVisit(SQLCharacterDataType x) {
}
@@ -762,12 +762,12 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
}
@Override
public boolean visit(SQLAlterTableDropForeinKey x) {
public boolean visit(SQLAlterTableDropForeignKey x) {
return true;
}
@Override
public void endVisit(SQLAlterTableDropForeinKey x) {
public void endVisit(SQLAlterTableDropForeignKey x) {
}
@@ -42,7 +42,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddIndex;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
@@ -1146,7 +1146,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
}
@Override
public boolean visit(SQLAlterTableDropForeinKey x) {
public boolean visit(SQLAlterTableDropForeignKey x) {
return false;
}
@@ -1243,13 +1243,13 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
column.accept(this);
}
String table = x.getReferencedTableName().getSimleName();
String table = x.getReferencedTableName().getSimpleName();
setCurrentTable(table);
TableStat stat = getTableStat(table);
stat.incrementReferencedCount();
for (SQLName column : x.getReferencedColumns()) {
String columnName = column.getSimleName();
String columnName = column.getSimpleName();
addColumn(table, columnName);
}