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

AQL_NEIGHBORS: make the error checking behaviour similar to the non-cluster version.

This commit is contained in:
Wilfried Goesgens 2015-11-12 10:36:23 +01:00
parent 8b9a8b80b5
commit 91fccfd7ea
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/server/modules/org/arangodb/aql.js
View File

@ -412,7 +412,7 @@ function WARN (func, error, data) {
/// @brief throw a runtime exception /// @brief throw a runtime exception
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function THROW (func, error, data) { function THROW (func, error, data, moreMessage) {
'use strict'; 'use strict';
var prefix = ""; var prefix = "";
@ -429,6 +429,9 @@ function THROW (func, error, data) {
else { else {
err.errorMessage = prefix + error.message; err.errorMessage = prefix + error.message;
} }
if (moreMessage !== undefined) {
err.errorMessage += "; " + moreMessage;
}
throw err; throw err;
} }
@ -7422,6 +7425,15 @@ function AQL_NEIGHBORS (vertexCollection,
'use strict'; 'use strict';
vertex = TO_ID(vertex, vertexCollection); vertex = TO_ID(vertex, vertexCollection);
var collectionFromVertex = vertex.slice(0, vertexCollection.length);
if (collectionFromVertex !== vertexCollection) {
THROW("AQL_NEIGBORS",
INTERNAL.errors.ERROR_ARANGO_DOCUMENT_KEY_BAD,
"",
"You specified vertex collection `" + collectionFromVertex +
"...` for start vertext from the collection`" + vertexCollection + "`");
}
options = CLONE(options) || {}; options = CLONE(options) || {};
// Fallback to JS if we are in the cluster // Fallback to JS if we are in the cluster
// Improve the examples. LocalServer can match String -> _id // Improve the examples. LocalServer can match String -> _id