Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Fix obvious mistakes like spelling errors

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java
+2 -2
View File
@@ -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;
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MysqlForeignKey.java
+5 -5
View File
@@ -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
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java
+2 -2
View File
@@ -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();
}
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
+7 -7
View File
@@ -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());
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+3 -3
View File
@@ -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) {
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+6 -6
View File
@@ -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);
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java
+6 -6
View File
@@ -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)) {
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class OracleDbLinkExpr extends SQLExprImpl implements SQLName, OracleExpr
}
public String getSimleName() {
public String getSimpleName() {
return dbLink;
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java
+4 -4
View File
@@ -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;
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java
+2 -2
View File
@@ -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();
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+4 -4
View File
@@ -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);
src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
+2 -2
View File
@@ -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("(");
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java
+1 -1
View File
@@ -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);
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements
}
}
public String getSimleName() {
public String getSimpleName() {
if (schema != null) {
return schema;
}
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java
+1 -1
View File
@@ -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);
}