Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed issue #2081

This commit is contained in:
Jan Steemann 2016-10-05 17:51:55 +02:00
parent 016b595c6e
commit d9d6588151
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -138,6 +138,8 @@ devel
v3.0.11 (2016-XX-XX)
--------------------
* fixed issue #2081
* fixed issue #2038

4
arangod/Aql/Condition.cpp
View File

@ -414,13 +414,13 @@ std::vector<std::vector<arangodb::basics::AttributeName>> Condition::getConstAtt
if (lhs->isAttributeAccessForVariable(parts) &&
parts.first == reference) {
if (includeNull || (rhs->isConstant() && !rhs->isNullValue())) {
if (includeNull || ((rhs->isConstant() || rhs->type == NODE_TYPE_REFERENCE) && !rhs->isNullValue())) {
result.emplace_back(std::move(parts.second));
}
}
else if (rhs->isAttributeAccessForVariable(parts) &&
parts.first == reference) {
if (includeNull || (lhs->isConstant() && !lhs->isNullValue())) {
if (includeNull || ((lhs->isConstant() || lhs->type == NODE_TYPE_REFERENCE) && !lhs->isNullValue())) {
result.emplace_back(std::move(parts.second));
}
}

4
js/server/modules/@arangodb/aql-helper.js
View File

@ -350,8 +350,8 @@ function findExecutionNodes (plan, nodetype) {
if (plan.hasOwnProperty('plan')) {
what = plan.plan;
}
what.nodes.forEach(function (node) {
if (node.type === nodetype) {
what.nodes.forEach(function(node) {
if (nodetype === undefined || node.type === nodetype) {
matches.push(node);
} else if (node.type === 'SubqueryNode') {
var subPlan = {'plan': node.subquery};