8000 aql current_user in cpp, test by dothebart · Pull Request #5302 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

aql current_user in cpp, test #5302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 19, 2018
Merged

aql current_user in cpp, test #5302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45c4045
aql current_user in cpp, test
mpoeter Oct 24, 2017
b2eae75
adjust to devel
dothebart May 8, 2018
72aabaa
Merge branch 'devel' of github.com:arangodb/ArangoDB into feature/dev…
dothebart May 18, 2018
e199109
Add tests for the aql CURRENT_USER() function:
dothebart May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
aql current_user in cpp, test
  • Loading branch information
@mpoeter @dothebart
mpoeter authored and dothebart committed May 8, 2018
commit 45c4045967ddb7e6332022e67447f0e1ed6724cd
2 changes: 1 addition & 1 deletion arangod/Aql/AqlFunctionFeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ void AqlFunctionFeature::addMiscFunctions() {
add({"FIRST_DOCUMENT", ".|+", true, false, true, &Functions::FirstDocument});
add({"PARSE_IDENTIFIER", ".", true, false, true, &Functions::ParseIdentifier});
add({"IS_SAME_COLLECTION", ".h,.h", true, false, true, &Functions::IsSameCollection});
add({"CURRENT_USER", "", false, false, false });
add({"CURRENT_USER", "", false, false, false, true, &Functions::CurrentUser});
add({"CURRENT_DATABASE", "", false, false, false, &Functions::CurrentDatabase});
add({"COLLECTION_COUNT", ".h", false, true, false, &Functions::CollectionCount});
add({"ASSERT", ".,.", false, true, true, &Functions::Assert});
Expand Down
18 changes: 18 additions & 0 deletions arangod/Aql/Functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5891,6 +5891,24 @@ AqlValue Functions::CurrentDatabase(arangodb::aql::Query* query,
return AqlValue(query->vocbase()->name());
}

/// @brief function CURRENT_USER
AqlValue Functions::CurrentUser(
arangodb::aql::Query* query, transaction::Methods* trx,
VPackFunctionParameters const& parameters) {

if (ExecContext::CURRENT == nullptr) {
return AqlValue(AqlValueHintNull());
}

std::string const& username = ExecContext::CURRENT->user();

if (username.size() == 0) {
return AqlValue(AqlValueHintNull());
}

return AqlValue(username);
}

/// @brief function COLLECTION_COUNT
AqlValue Functions::CollectionCount(arangodb::aql::Query* query,
transaction::Methods* trx,
Expand Down
42 changes: 3 additions & 39 deletions arangod/Aql/Functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,45 +462,9 @@ struct Functions {
static AqlValue CollectionCount(arangodb::aql::Query*,
transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue VarianceSample(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue PregelResult(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue VariancePopulation(arangodb::aql::Query*,
transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue StdDevSample(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue StdDevPopulation(arangodb::aql::Query*,
transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Median(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Percentile(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Range(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Position(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue CallApplyBackend(arangodb::aql::Query* query,
transaction::Methods* trx,
VPackFunctionParameters const& parameters,
char const* AFN,
AqlValue const& invokeFN,
VPackFunctionParameters const& invokeParams);
static AqlValue Call(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Apply(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue IsSameCollection(arangodb::aql::Query*,
transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Assert(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Warn(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Fail(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue CurrentUser(arangodb::aql::Query*,
transaction::Methods*,
VPackFunctionParameters const&);
};

}
Expand Down
6 changes: 3 additions & 3 deletions js/server/tests/aql/aql-functions-misc.js
View file
Open in desktop
4518
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,9 @@ function ahuacatlMiscFunctionsTestSuite () { return {
}
}

var actual = getQueryResults("RETURN CURRENT_USER()");
// there is no current user in the non-request context
assertEqual([ expected ], actual);
// there is no current user in the non-request context
assertEqual([ expected ], getQueryResults("RETURN NOOPT(CURRENT_USER())"));
assertEqual([ expected ], getQueryResults("RETURN NOOPT(V8(CURRENT_USER()))"));
},

////////////////////////////////////////////////////////////////////////////////
Expand Down
0