提交 623788c4 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Remove unused fromOuter parameter from Parser.readTableFilter()

上级 574a0f4b
...@@ -1348,7 +1348,7 @@ public class Parser { ...@@ -1348,7 +1348,7 @@ public class Parser {
return command; return command;
} }
private TableFilter readTableFilter(boolean fromOuter) { private TableFilter readTableFilter() {
Table table; Table table;
String alias = null; String alias = null;
if (readIf("(")) { if (readIf("(")) {
...@@ -1368,7 +1368,7 @@ public class Parser { ...@@ -1368,7 +1368,7 @@ public class Parser {
query, currentSelect); query, currentSelect);
} else { } else {
TableFilter top; TableFilter top;
top = readTableFilter(false); top = readTableFilter();
top = readJoin(top, false, false); top = readJoin(top, false, false);
top = getNested(top); top = getNested(top);
read(")"); read(")");
...@@ -1726,7 +1726,7 @@ public class Parser { ...@@ -1726,7 +1726,7 @@ public class Parser {
readIf("OUTER"); readIf("OUTER");
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();
join = readJoin(join, nested, true); join = readJoin(join, nested, true);
Expression on = null; Expression on = null;
if (readIf("ON")) { if (readIf("ON")) {
...@@ -1738,7 +1738,7 @@ public class Parser { ...@@ -1738,7 +1738,7 @@ public class Parser {
} else if (readIf("LEFT")) { } else if (readIf("LEFT")) {
readIf("OUTER"); readIf("OUTER");
read("JOIN"); read("JOIN");
join = readTableFilter(true); join = readTableFilter();
join = readJoin(join, true, true); join = readJoin(join, true, true);
Expression on = null; Expression on = null;
if (readIf("ON")) { if (readIf("ON")) {
...@@ -1749,7 +1749,7 @@ public class Parser { ...@@ -1749,7 +1749,7 @@ public class Parser {
throw getSyntaxError(); throw getSyntaxError();
} else if (readIf("INNER")) { } else if (readIf("INNER")) {
read("JOIN"); read("JOIN");
join = readTableFilter(fromOuter); join = readTableFilter();
top = readJoin(top, false, false); top = readJoin(top, false, false);
Expression on = null; Expression on = null;
if (readIf("ON")) { if (readIf("ON")) {
...@@ -1757,7 +1757,7 @@ public class Parser { ...@@ -1757,7 +1757,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();
top = readJoin(top, false, false); top = readJoin(top, false, false);
Expression on = null; Expression on = null;
if (readIf("ON")) { if (readIf("ON")) {
...@@ -1766,11 +1766,11 @@ public class Parser { ...@@ -1766,11 +1766,11 @@ public class Parser {
top.addJoin(join, false, false, on); top.addJoin(join, false, false, on);
} else if (readIf("CROSS")) { } else if (readIf("CROSS")) {
read("JOIN"); read("JOIN");
join = readTableFilter(fromOuter); join = readTableFilter();
top.addJoin(join, false, false, null); top.addJoin(join, false, false, null);
} else if (readIf("NATURAL")) { } else if (readIf("NATURAL")) {
read("JOIN"); read("JOIN");
join = readTableFilter(fromOuter); join = readTableFilter();
Column[] tableCols = last.getTable().getColumns(); Column[] tableCols = last.getTable().getColumns();
Column[] joinCols = join.getTable().getColumns(); Column[] joinCols = join.getTable().getColumns();
String tableSchema = last.getTable().getSchema().getName(); String tableSchema = last.getTable().getSchema().getName();
...@@ -2104,7 +2104,7 @@ public class Parser { ...@@ -2104,7 +2104,7 @@ public class Parser {
private void parseSelectSimpleFromPart(Select command) { private void parseSelectSimpleFromPart(Select command) {
do { do {
TableFilter filter = readTableFilter(false); TableFilter filter = readTableFilter();
parseJoinTableFilter(filter, command); parseJoinTableFilter(filter, command);
} while (readIf(",")); } while (readIf(","));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论