提交 574a0f4b authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Remove unused command parameter from Parser.readJoin()

上级 cacef49b
...@@ -1369,7 +1369,7 @@ public class Parser { ...@@ -1369,7 +1369,7 @@ public class Parser {
} else { } else {
TableFilter top; TableFilter top;
top = readTableFilter(false); top = readTableFilter(false);
top = readJoin(top, currentSelect, false, false); top = readJoin(top, false, false);
top = getNested(top); top = getNested(top);
read(")"); read(")");
alias = readFromAlias(null); alias = readFromAlias(null);
...@@ -1717,8 +1717,7 @@ public class Parser { ...@@ -1717,8 +1717,7 @@ public class Parser {
return command; return command;
} }
private TableFilter readJoin(TableFilter top, Select command, private TableFilter readJoin(TableFilter top, boolean nested, boolean fromOuter) {
boolean nested, boolean fromOuter) {
boolean joined = false; boolean joined = false;
TableFilter last = top; TableFilter last = top;
while (true) { while (true) {
...@@ -1728,7 +1727,7 @@ public class Parser { ...@@ -1728,7 +1727,7 @@ public class Parser {
read("JOIN"); read("JOIN");
// the right hand side is the 'inner' table usually // the right hand side is the 'inner' table usually
join = readTableFilter(fromOuter); join = readTableFilter(fromOuter);
join = readJoin(join, command, nested, true); join = readJoin(join, nested, true);
Expression on = null; Expression on = null;
if (readIf("ON")) { if (readIf("ON")) {
on = readExpression(); on = readExpression();
...@@ -1740,7 +1739,7 @@ public class Parser { ...@@ -1740,7 +1739,7 @@ public class Parser {
readIf("OUTER"); readIf("OUTER");
read("JOIN"); read("JOIN");
join = readTableFilter(true); join = readTableFilter(true);
join = readJoin(join, command, true, true); join = readJoin(join, true, true);
Expression on = null; Expression on = null;
if (readIf("ON")) { if (readIf("ON")) {
on = readExpression(); on = readExpression();
...@@ -1751,7 +1750,7 @@ public class Parser { ...@@ -1751,7 +1750,7 @@ public class Parser {
} else if (readIf("INNER")) { } else if (readIf("INNER")) {
read("JOIN"); read("JOIN");
join = readTableFilter(fromOuter); join = readTableFilter(fromOuter);
top = readJoin(top, command, false, false); top = readJoin(top, false, false);
Expression on = null; Expression on = null;
if (readIf("ON")) { if (readIf("ON")) {
on = readExpression(); on = readExpression();
...@@ -1759,7 +1758,7 @@ public class Parser { ...@@ -1759,7 +1758,7 @@ public class Parser {
top.addJoin(join, false, false, on); top.addJoin(join, false, false, on);
} else if (readIf("JOIN")) { } else if (readIf("JOIN")) {
join = readTableFilter(fromOuter); join = readTableFilter(fromOuter);
top = readJoin(top, command, false, false); top = readJoin(top, false, false);
Expression on = null; Expression on = null;
if (readIf("ON")) { if (readIf("ON")) {
on = readExpression(); on = readExpression();
...@@ -2150,7 +2149,7 @@ public class Parser { ...@@ -2150,7 +2149,7 @@ public class Parser {
} }
private void parseJoinTableFilter(TableFilter top, final Select command) { private void parseJoinTableFilter(TableFilter top, final Select command) {
top = readJoin(top, command, false, top.isJoinOuter()); top = readJoin(top, false, top.isJoinOuter());
command.addTableFilter(top, true); command.addTableFilter(top, true);
boolean isOuter = false; boolean isOuter = false;
while (true) { while (true) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论