1
0
Fork 0

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-lazy-index

This commit is contained in:
Jan Steemann 2014-11-09 00:10:10 +01:00
commit d05b47cdb6
4 changed files with 17 additions and 4 deletions

View File

@ -936,7 +936,10 @@ bool AstNode::isTrue () const {
return getMember(1)->isTrue(); return getMember(1)->isTrue();
} }
else if (type == NODE_TYPE_OPERATOR_UNARY_NOT) { else if (type == NODE_TYPE_OPERATOR_UNARY_NOT) {
return ! getMember(0)->isTrue(); if (getMember(0)->isFalse()) {
// ! false => true
return true;
}
} }
return false; return false;
@ -978,7 +981,10 @@ bool AstNode::isFalse () const {
return getMember(1)->isFalse(); return getMember(1)->isFalse();
} }
else if (type == NODE_TYPE_OPERATOR_UNARY_NOT) { else if (type == NODE_TYPE_OPERATOR_UNARY_NOT) {
return ! getMember(0)->isFalse(); if (getMember(0)->isTrue()) {
// ! true => false
return true;
}
} }
return false; return false;

View File

@ -504,6 +504,7 @@
"databaseView", "databaseView",
"databases-menu", "databases-menu",
{ {
users: sessionDummy,
collection: databaseDummy collection: databaseDummy
} }
); );

View File

@ -39,6 +39,10 @@
expect(view.colid).toEqual(0); expect(view.colid).toEqual(0);
expect(view.events).toEqual({ expect(view.events).toEqual({
"click #saveDocumentButton": "saveDocument", "click #saveDocumentButton": "saveDocument",
"click #deleteDocumentButton" : "deleteDocumentModal",
"click #confirmDeleteDocument" : "deleteDocument",
"click #document-from" : "navigateToDocument",
"click #document-to" : "navigateToDocument",
"dblclick #documentEditor tr" : "addProperty" "dblclick #documentEditor tr" : "addProperty"
}); });
}); });

View File

@ -69,7 +69,9 @@
"click #userManagementSearchSubmit" : "search", "click #userManagementSearchSubmit" : "search",
"click #callEditUserPassword" : "editUserPassword", "click #callEditUserPassword" : "editUserPassword",
"click #submitEditUserPassword" : "submitEditUserPassword", "click #submitEditUserPassword" : "submitEditUserPassword",
"click #submitEditCurrentUserProfile" : "submitEditCurrentUserProfile" "click #submitEditCurrentUserProfile" : "submitEditCurrentUserProfile",
"click .css-label" : "checkBoxes",
"change #userSortDesc" : "sorting"
}; };
expect(myEvents).toEqual(myView.events); expect(myEvents).toEqual(myView.events);
}); });