提交 749aa5a5 authored 作者: Sergi Vladykin's avatar Sergi Vladykin

Minor cleanup and build fix.

上级 73970918
...@@ -1086,7 +1086,7 @@ public class Select extends Query { ...@@ -1086,7 +1086,7 @@ public class Select extends Query {
StatementBuilder buff = new StatementBuilder(); StatementBuilder buff = new StatementBuilder();
for (TableFilter f : topFilters) { for (TableFilter f : topFilters) {
Table t = f.getTable(); Table t = f.getTable();
if ((t instanceof TableView) && ((TableView) t).isRecursive()) { if (t.isView() && ((TableView) t).isRecursive()) {
buff.append("WITH RECURSIVE ").append(t.getName()).append('('); buff.append("WITH RECURSIVE ").append(t.getName()).append('(');
buff.resetCount(); buff.resetCount();
for (Column c : t.getColumns()) { for (Column c : t.getColumns()) {
......
...@@ -816,10 +816,11 @@ public class TableFilter implements ColumnResolver { ...@@ -816,10 +816,11 @@ public class TableFilter implements ColumnResolver {
} }
return buff.toString(); return buff.toString();
} }
if ((table instanceof TableView) && ((TableView) table).isRecursive()) if (table.isView() && ((TableView) table).isRecursive()) {
buff.append(table.getName()); buff.append(table.getName());
else } else {
buff.append(table.getSQL()); buff.append(table.getSQL());
}
if (table.isView() && ((TableView) table).isInvalid()) { if (table.isView() && ((TableView) table).isInvalid()) {
throw DbException.get(ErrorCode.VIEW_IS_INVALID_2, table.getName(), "not compiled"); throw DbException.get(ErrorCode.VIEW_IS_INVALID_2, table.getName(), "not compiled");
} }
......
...@@ -314,6 +314,9 @@ public class Build extends BuildBase { ...@@ -314,6 +314,9 @@ public class Build extends BuildBase {
downloadOrVerify("ext/jts-core-1.14.0.jar", downloadOrVerify("ext/jts-core-1.14.0.jar",
"com/vividsolutions", "jts-core", "1.14.0", "com/vividsolutions", "jts-core", "1.14.0",
"ff63492fba33a395f0da17720dd1716aba0d8c84", offline); "ff63492fba33a395f0da17720dd1716aba0d8c84", offline);
downloadOrVerify("ext/junit-4.12.jar",
"junit", "junit", "4.12",
"2973d150c0dc1fefe998f834810d68f278ea58ec", offline);
} }
private void downloadOrVerify(String target, String group, String artifact, private void downloadOrVerify(String target, String group, String artifact,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论