提交 47463ab4 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Move new methods below their callers

上级 355833c4
...@@ -950,20 +950,6 @@ public class Parser { ...@@ -950,20 +950,6 @@ public class Parser {
return false; return false;
} }
private Expression[] parseValuesForInsert() {
ArrayList<Expression> values = Utils.newSmallArrayList();
if (!readIf(")")) {
do {
if (readIf("DEFAULT")) {
values.add(null);
} else {
values.add(readExpression());
}
} while (readIfMore(false));
}
return values.toArray(new Expression[0]);
}
private Prepared parseHelp() { private Prepared parseHelp() {
StringBuilder buff = new StringBuilder( StringBuilder buff = new StringBuilder(
"SELECT * FROM INFORMATION_SCHEMA.HELP"); "SELECT * FROM INFORMATION_SCHEMA.HELP");
...@@ -1377,6 +1363,20 @@ public class Parser { ...@@ -1377,6 +1363,20 @@ public class Parser {
return command; return command;
} }
private Expression[] parseValuesForInsert() {
ArrayList<Expression> values = Utils.newSmallArrayList();
if (!readIf(")")) {
do {
if (readIf("DEFAULT")) {
values.add(null);
} else {
values.add(readExpression());
}
} while (readIfMore(false));
}
return values.toArray(new Expression[0]);
}
private TableFilter readTableFilter() { private TableFilter readTableFilter() {
Table table; Table table;
String alias = null; String alias = null;
...@@ -2603,17 +2603,6 @@ public class Parser { ...@@ -2603,17 +2603,6 @@ public class Parser {
} }
} }
private Expression readFilterCondition() {
if (readIf("FILTER")) {
read("(");
read("WHERE");
Expression filterCondition = readExpression();
read(")");
return filterCondition;
}
return null;
}
private Expression readAggregate(AggregateType aggregateType, String aggregateName) { private Expression readAggregate(AggregateType aggregateType, String aggregateName) {
if (currentSelect == null) { if (currentSelect == null) {
throw getSyntaxError(); throw getSyntaxError();
...@@ -2734,6 +2723,17 @@ public class Parser { ...@@ -2734,6 +2723,17 @@ public class Parser {
return agg; return agg;
} }
private Expression readFilterCondition() {
if (readIf("FILTER")) {
read("(");
read("WHERE");
Expression filterCondition = readExpression();
read(")");
return filterCondition;
}
return null;
}
private AggregateType getAggregateType(String name) { private AggregateType getAggregateType(String name) {
if (!identifiersToUpper) { if (!identifiersToUpper) {
// if not yet converted to uppercase, do it now // if not yet converted to uppercase, do it now
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论