Merge pull request #3569 from WaylanPunch/master

Collection.addAll() and @Override annotation
This commit is contained in:
温绍锦
2020-04-06 22:06:02 +08:00
committed by GitHub
6 changed files with 8 additions and 6 deletions
@@ -247,9 +247,7 @@ public class SQLSelect extends SQLObjectImpl {
}
if (this.hints != null) {
for (SQLHint hint : this.hints) {
x.hints.add(hint);
}
x.hints.addAll(this.hints);
}
x.forBrowse = forBrowse;
@@ -166,9 +166,7 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery
SQLInListExpr inListItem = (SQLInListExpr) item;
if (inListExpr.getExpr().equals(inListItem.getExpr())) {
TreeSet<SQLExpr> set = new TreeSet<SQLExpr>();
for (SQLExpr itemItem : inListItem.getTargetList()) {
set.add(itemItem);
}
set.addAll(inListItem.getTargetList());
List<SQLExpr> andList = new ArrayList<SQLExpr>();
for (SQLExpr exprItem : inListExpr.getTargetList()) {
@@ -47,5 +47,6 @@ public interface SQLSelectBuilder {
SQLSelectBuilder whereOr(String sql);
@Override
String toString();
}
@@ -139,6 +139,7 @@ public class SQLDeleteBuilderImpl implements SQLDeleteBuilder {
return new SQLDeleteStatement();
}
@Override
public String toString() {
return SQLUtils.toSQLString(stmt, dbType);
}
@@ -81,6 +81,7 @@ public class SQLSelectBuilderImpl implements SQLSelectBuilder {
return stmt;
}
@Override
public SQLSelectBuilderImpl select(String... columns) {
SQLSelectQueryBlock queryBlock = getQueryBlock();
@@ -267,6 +268,7 @@ public class SQLSelectBuilderImpl implements SQLSelectBuilder {
return new SQLSelectGroupByClause();
}
@Override
public String toString() {
return SQLUtils.toSQLString(stmt, dbType);
}
@@ -119,6 +119,7 @@ public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBui
return this;
}
@Override
public SQLUpdateBuilderImpl set(String... items) {
SQLUpdateStatement update = getSQLUpdateStatement();
for (String item : items) {
@@ -178,6 +179,7 @@ public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBui
return new SQLUpdateStatement();
}
@Override
public String toString() {
return SQLUtils.toSQLString(stmt, dbType);
}