8000 validation: AQL functions by ObiWahn · Pull Request #11327 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

validation: AQL functions #11327

New issue
8000

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 20 commits into from
Apr 1, 2020
Merged

validation: AQL functions #11327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
991c0ec
Add AQL functions for schema validation.
ObiWahn Mar 19, 2020
da9c1fa
Changes requested by Ingo.
ObiWahn Mar 20, 2020
4739daa
Merge remote-tracking branch 'origin/devel' into feature/validation-a…
ObiWahn Mar 24, 2020
61fa7a8
Make validation in-flexible.
ObiWahn Mar 27, 2020
a233b7e
Merge remote-tracking branch 'origin/devel' into feature/validation-a…
ObiWahn Mar 27, 2020
f70025b
Fix function signature.
ObiWahn Mar 27, 2020
ad887a5
Improve error messages.
ObiWahn Mar 27, 2020
99d9b01
Rename Functions and clang-format-6.0 file manually.
ObiWahn Mar 27, 2020
b31a7ef
add tests
ObiWahn Mar 27, 2020
c3223c2
add more tests
ObiWahn Mar 30, 2020
956cca4
Merge remote-tracking branch 'origin/devel' into feature/validation-a…
ObiWahn Mar 30, 2020
cafef4a
Fix collection lookup.
ObiWahn Mar 30, 2020
a3cc406
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
ObiWahn Mar 30, 2020
474ee7b
Apply suggestions from code review
ObiWahn Mar 31, 2020
d62f8ee
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
ObiWahn Mar 31, 2020
2b6d11a
Improve tests.
ObiWahn Mar 31, 2020
1de0e6b
Remove more useless test code.
ObiWahn Mar 31, 2020
28c9f52
Rename Function to SCHEMA_GET
ObiWahn Apr 1, 2020
f9fab9b
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
ObiWahn Apr 1, 2020
02a29ee
Merge branch 'devel' of github.com:arangodb/arangodb into feature/val…
jsteemann Apr 1, 2020
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
Prev Previous commit
Next Next commit
add more tests
  • Loading branch information
@ObiWahn
ObiWahn committed Mar 30, 2020
commit c3223c28fe92df44fedc41f922706a045e1e7768
17 changes: 14 additions & 3 deletions arangod/Aql/Functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7514,7 +7514,8 @@ AqlValue Functions::NotImplemented(ExpressionContext* expressionContext,
AqlValue Functions::GetSchema(ExpressionContext* expressionContext,
transaction::Methods* trx,
VPackFunctionParameters const& parameters) {
static char const* AFN = "GET_SCHEMA"; // GET_VALIDATON("collectionName")
// GET_VALIDATON("collectionName")
static char const* AFN = "GET_SCHEMA";

if (parameters.size() != 1) {
THROW_ARANGO_EXCEPTION_PARAMS(TRI_ERROR_QUERY_FUNCTION_ARGUMENT_NUMBER_MISMATCH, AFN);
Expand Down Expand Up @@ -7556,7 +7557,8 @@ AqlValue Functions::GetSchema(ExpressionContext* expressionContext,
AqlValue Functions::SchemaValidate(ExpressionContext* expressionContext,
transaction::Methods* trx,
VPackFunctionParameters const& parameters) {
static char const* AFN = "SCHEMA_VALIDATE"; // SCHEMA_VALIDATE(doc, schema )
// SCHEMA_VALIDATE(doc, schema )
static char const* AFN = "SCHEMA_VALIDATE";
auto const* vpackOptions = trx->transactionContext()->getVPackOptions();

if (parameters.size() != 2) {
Expand All @@ -7566,9 +7568,18 @@ AqlValue Functions::SchemaValidate(ExpressionContext* expressionContext,
AqlValue const& docValue = extractFunctionParameterValue(parameters, 0);
AqlValue const& schemaValue = extractFunctionParameterValue(parameters, 1);

if (schemaValue.isNull(false)) {
transaction::BuilderLeaser resultBuilder(trx);
{
VPackObjectBuilder guard(resultBuilder.builder());
resultBuilder->add("valid", VPackValue(true));
}
return AqlValue(resultBuilder->slice());
}

if (!schemaValue.isObject()) {
THROW_ARANGO_EXCEPTION_MESSAGE(
TRI_ERROR_BAD_PARAMETER, "second pararmeter is not a schema object: " +
TRI_ERROR_BAD_PARAMETER, "second parameter is not a schema object: " +
schemaValue.slice().toJson());
}

Expand Down
40 changes: 38 additions & 2 deletions tests/js/common/shell/shell-validation-rocksdb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,20 +367,56 @@ function ValidationBasicsSuite () {
testCollection.properties({"validation" : v });
sleepInCluster();

let res = db._query(`RETURN GET_SCHEMA("${testCollectionName}")`).toArray();
let res;

// get regular schema
res = db._query(`RETURN GET_SCHEMA("${testCollectionName}")`).toArray();
assertEqual(res[0], v.rule);

// schema on non existing collection
try {
res = db._query(`RETURN GET_SCHEMA("nonExistingTestCollection")`).toArray();
assertEqual(res[0], null);
fail();
} catch (err) {
assertEqual(ERRORS.ERROR_ARANGO_DATA_SOURCE_NOT_FOUND.code, err.errorNum);
}

// no validation available must return `null`
testCollection.drop();
db._create(testCollectionName);
res = db._query(`RETURN GET_SCHEMA("${testCollectionName}")`).toArray();
assertEqual(res[0], null);
},

testSCHEMA_VALIDATE: () => {
const v = validatorJson;
// unset validation
// FIXME - just pass empty object (PR 11346)
testCollection.properties({"validation" : { rule:{} } });
sleepInCluster();

let res = db._query(`RETURN SCHEMA_VALIDATE({"foo" : 24}, { "properties" : { "foo" : { "type" : "string" } } } )`).toArray();
let res;
// doc does not match schema
res = db._query(`RETURN SCHEMA_VALIDATE({"foo" : 24}, { "properties" : { "foo" : { "type" : "string" } } } )`).toArray();
assertEqual(res[0].valid, false);

// doc matches schema
res = db._query(`RETURN SCHEMA_VALIDATE({"foo" : "bar"}, { "properties" : { "foo" : { "type" : "string" } } } )`).toArray();
assertEqual(res[0].valid, true);

//invalid schema
res = db._query(`RETURN SCHEMA_VALIDATE({"foo" : "bar"}, null)`).toArray();
assertEqual(res[0].valid, true);

// invalid schema
try {
res = db._query(`RETURN SCHEMA_VALIDATE({"foo" : "bar"}, [])`).toArray();
assertEqual(res[0].valid, true);
fail();
} catch (err) {
assertEqual(ERRORS.ERROR_BAD_PARAMETER.code, err.errorNum);
}
},

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