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

fix https://github.com/arangodb/planning/issues/388 (#2714) 

also fix jslint issues
This commit is contained in:
Jan 2017-07-03 18:41:54 +02:00 committed by Frank Celler
parent 61a80ed697
commit 1d944b97a4
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/RestHandler/RestDatabaseHandler.cpp
View File

@ -45,7 +45,7 @@ RestStatus RestDatabaseHandler::execute() {
return getDatabases(); return getDatabases();
} else if (type == rest::RequestType::POST) { } else if (type == rest::RequestType::POST) {
if (!_vocbase->isSystem()) { if (!_vocbase->isSystem()) {
generateError(rest::ResponseCode::BAD, generateError(GeneralResponse::responseCode(TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE),
TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE); TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE);
return RestStatus::DONE; return RestStatus::DONE;
} }
@ -141,7 +141,7 @@ RestStatus RestDatabaseHandler::createDatabase() {
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////
RestStatus RestDatabaseHandler::deleteDatabase() { RestStatus RestDatabaseHandler::deleteDatabase() {
if (!_vocbase->isSystem()) { if (!_vocbase->isSystem()) {
generateError(rest::ResponseCode::BAD, generateError(GeneralResponse::responseCode(TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE),
TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE); TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE);
return RestStatus::DONE; return RestStatus::DONE;
} }

4
arangod/VocBase/AuthInfo.cpp
View File

@ -107,9 +107,7 @@ bool AuthInfo::parseUsers(VPackSlice const& slice) {
} }
AuthUserEntry auth = AuthUserEntry::fromDocument(s); AuthUserEntry auth = AuthUserEntry::fromDocument(s);
if (auth.isActive()) { _authInfo.emplace(auth.username(), std::move(auth));
_authInfo.emplace(auth.username(), std::move(auth));
}
} }
return true; return true;

4
js/client/modules/@arangodb/testsuites/readOnly.js
View File

@ -160,7 +160,7 @@ const requests = [
} }
} }
return bodies; return bodies;
} };
let res = pu.run.arangoshCmd(options, adbInstance, {}, [ let res = pu.run.arangoshCmd(options, adbInstance, {}, [
'--javascript.execute-string', '--javascript.execute-string',
@ -184,7 +184,7 @@ const requests = [
]); ]);
let bodies = run(requests.splice(0,4)); let bodies = run(requests.splice(0,4));
requests[0][2] += bodies.pop().indexes.filter(idx => idx.type == 'hash')[0].id requests[0][2] += bodies.pop().indexes.filter(idx => idx.type === 'hash')[0].id;
run(requests); run(requests);
pu.shutdownInstance(adbInstance, options); pu.shutdownInstance(adbInstance, options);

2
lib/Rest/GeneralResponse.cpp
View File

@ -369,7 +369,6 @@ rest::ResponseCode GeneralResponse::responseCode(int code) {
case TRI_ERROR_REPLICATION_INVALID_APPLIER_CONFIGURATION: case TRI_ERROR_REPLICATION_INVALID_APPLIER_CONFIGURATION:
case TRI_ERROR_REPLICATION_RUNNING: case TRI_ERROR_REPLICATION_RUNNING:
case TRI_ERROR_REPLICATION_NO_START_TICK: case TRI_ERROR_REPLICATION_NO_START_TICK:
case TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE:
case TRI_ERROR_ARANGO_INVALID_KEY_GENERATOR: case TRI_ERROR_ARANGO_INVALID_KEY_GENERATOR:
case TRI_ERROR_ARANGO_INVALID_EDGE_ATTRIBUTE: case TRI_ERROR_ARANGO_INVALID_EDGE_ATTRIBUTE:
case TRI_ERROR_ARANGO_INDEX_DOCUMENT_ATTRIBUTE_MISSING: case TRI_ERROR_ARANGO_INDEX_DOCUMENT_ATTRIBUTE_MISSING:
@ -415,6 +414,7 @@ rest::ResponseCode GeneralResponse::responseCode(int code) {
case TRI_ERROR_GRAPH_EDGE_COL_DOES_NOT_EXIST: case TRI_ERROR_GRAPH_EDGE_COL_DOES_NOT_EXIST:
return ResponseCode::BAD; return ResponseCode::BAD;
case TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE:
case TRI_ERROR_ARANGO_READ_ONLY: case TRI_ERROR_ARANGO_READ_ONLY:
case TRI_ERROR_FORBIDDEN: case TRI_ERROR_FORBIDDEN:
return ResponseCode::FORBIDDEN; return ResponseCode::FORBIDDEN;