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

fix graph error message (#10042) 

* fix error message

* updated CHANGELOG, fixed test
This commit is contained in:
Jan 2019-09-27 14:10:19 +02:00 committed by KVS85
parent b8502f8fa7
commit cf65562527
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,6 +1,9 @@
v3.5.1 (XXXX-XX-XX)
-------------------
* Fixed error message for error 1928 ("not in orphan") to "collection is
not in list of orphan collections".
* Fix strange shutdown hanger which came from the fact that currently
libgcc/libmusl wrongly detect multi-threadedness in statically linked
executables.

4
js/common/bootstrap/errors.js
View File

@ -259,8 +259,8 @@
"ERROR_GRAPH_NOT_FOUND" : { "code" : 1924, "message" : "graph '%s' not found" },
"ERROR_GRAPH_DUPLICATE" : { "code" : 1925, "message" : "graph already exists" },
"ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST" : { "code" : 1926, "message" : "vertex collection does not exist or is not part of the graph" },
"ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX" : { "code" : 1927, "message" : "not a vertex collection" },
"ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION" : { "code" : 1928, "message" : "not in orphan collection" },
"ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX" : { "code" : 1927, "message" : "collection not a vertex collection" },
"ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION" : { "code" : 1928, "message" : "collection is not in list of orphan collections" },
"ERROR_GRAPH_COLLECTION_USED_IN_EDGE_DEF" : { "code" : 1929, "message" : "collection already used in edge def" },
"ERROR_GRAPH_EDGE_COLLECTION_NOT_USED" : { "code" : 1930, "message" : "edge collection not used in graph" },
"ERROR_GRAPH_NO_GRAPH_COLLECTION" : { "code" : 1932, "message" : "collection _graphs does not exist" },

4
lib/Basics/errors.dat
View File

@ -349,8 +349,8 @@ ERROR_GRAPH_CREATE_MALFORMED_EDGE_DEFINITION,1923,"malformed edge definition","t
ERROR_GRAPH_NOT_FOUND,1924,"graph '%s' not found","a graph with this name could not be found.",
ERROR_GRAPH_DUPLICATE,1925,"graph already exists","a graph with this name already exists.",
ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST,1926,"vertex collection does not exist or is not part of the graph","the specified vertex collection does not exist or is not part of the graph.",
ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX,1927,"not a vertex collection","the collection is not a vertex collection.",
ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION,1928,"not in orphan collection","Vertex collection not in orphan collection of the graph.",
ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX,1927,"collection not a vertex collection","the collection is not a vertex collection.",
ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION,1928,"collection is not in list of orphan collections","Vertex collection not in list of orphan collections of the graph.",
ERROR_GRAPH_COLLECTION_USED_IN_EDGE_DEF,1929,"collection already used in edge def","The collection is already used in an edge definition of the graph.",
ERROR_GRAPH_EDGE_COLLECTION_NOT_USED,1930,"edge collection not used in graph","The edge collection is not used in any edge definition of the graph.",
ERROR_GRAPH_NO_GRAPH_COLLECTION,1932,"collection _graphs does not exist","collection _graphs does not exist.",

4
lib/Basics/voc-errors.cpp
View File

@ -258,8 +258,8 @@ void TRI_InitializeErrorMessages() {
REG_ERROR(ERROR_GRAPH_NOT_FOUND, "graph '%s' not found");
REG_ERROR(ERROR_GRAPH_DUPLICATE, "graph already exists");
REG_ERROR(ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST, "vertex collection does not exist or is not part of the graph");
REG_ERROR(ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX, "not a vertex collection");
REG_ERROR(ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION, "not in orphan collection");
REG_ERROR(ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX, "collection not a vertex collection");
REG_ERROR(ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION, "collection is not in list of orphan collections");
REG_ERROR(ERROR_GRAPH_COLLECTION_USED_IN_EDGE_DEF, "collection already used in edge def");
REG_ERROR(ERROR_GRAPH_EDGE_COLLECTION_NOT_USED, "edge collection not used in graph");
REG_ERROR(ERROR_GRAPH_NO_GRAPH_COLLECTION, "collection _graphs does not exist");

6
lib/Basics/voc-errors.h
View File

@ -1369,13 +1369,13 @@ constexpr int TRI_ERROR_GRAPH_DUPLICATE
constexpr int TRI_ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST = 1926;
/// 1927: ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX
/// "not a vertex collection"
/// "collection not a vertex collection"
/// the collection is not a vertex collection.
constexpr int TRI_ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX = 1927;
/// 1928: ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION
/// "not in orphan collection"
/// Vertex collection not in orphan collection of the graph.
/// "collection is not in list of orphan collections"
/// Vertex collection not in list of orphan collections of the graph.
constexpr int TRI_ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION = 1928;
/// 1929: ERROR_GRAPH_COLLECTION_USED_IN_EDGE_DEF

1
tests/rb/HttpInterface/api-general-graph-spec.rb
View File

@ -1205,7 +1205,6 @@ describe ArangoDB do
doc.parsed_response['error'].should eq(true)
doc.parsed_response['code'].should eq(400)
puts doc.parsed_response['errorMessage']
doc.parsed_response['errorMessage'].should include("not in orphan collection")
end
def check404CRUD (doc)