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

added test cases for multi-modify

This commit is contained in:
Jan Steemann 2015-12-03 12:18:03 +01:00
parent 6c1717ec90
commit cb0d98cb6c
3 changed files with 43 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UnitTests/Makefile.unittests
View File

@ -622,6 +622,7 @@ SHELL_SERVER_AQL = @top_srcdir@/js/server/tests/aql-arithmetic.js \
@top_srcdir@/js/server/tests/aql-logical.js \ @top_srcdir@/js/server/tests/aql-logical.js \
@top_srcdir@/js/server/tests/aql-modify-noncluster.js \ @top_srcdir@/js/server/tests/aql-modify-noncluster.js \
@top_srcdir@/js/server/tests/aql-modify-noncluster-serializetest.js \ @top_srcdir@/js/server/tests/aql-modify-noncluster-serializetest.js \
@top_srcdir@/js/server/tests/aql-multi-modify.js \
@top_srcdir@/js/server/tests/aql-operators.js \ @top_srcdir@/js/server/tests/aql-operators.js \
@top_srcdir@/js/server/tests/aql-optimizer-collect-count.js \ @top_srcdir@/js/server/tests/aql-optimizer-collect-count.js \
@top_srcdir@/js/server/tests/aql-optimizer-collect-into.js \ @top_srcdir@/js/server/tests/aql-optimizer-collect-into.js \

74
js/server/tests/aql-modify-noncluster.js
View File

@ -153,78 +153,6 @@ function ahuacatlModifySuite () {
c2 = null; c2 = null;
}, },
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testRemoveInSubquery : function () {
assertQueryError(errors.ERROR_QUERY_MODIFY_IN_SUBQUERY.code, "FOR d IN @@cn LET x = (REMOVE d.foobar IN @@cn) RETURN d", { "@cn": cn1 });
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testInsertInSubquery : function () {
assertQueryError(errors.ERROR_QUERY_MODIFY_IN_SUBQUERY.code, "FOR d IN @@cn LET x = (INSERT { _key: 'test' } IN @@cn) RETURN d", { "@cn": cn1 });
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testUpdateInSubquery : function () {
assertQueryError(errors.ERROR_QUERY_MODIFY_IN_SUBQUERY.code, "FOR d IN @@cn LET x = (UPDATE { _key: 'test' } IN @@cn) RETURN d", { "@cn": cn1 });
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testReplaceInSubquery : function () {
assertQueryError(errors.ERROR_QUERY_MODIFY_IN_SUBQUERY.code, "FOR d IN @@cn LET x = (REPLACE { _key: 'test' } IN @@cn) RETURN d", { "@cn": cn1 });
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testReplaceInSubquery2 : function () {
assertQueryError(errors.ERROR_QUERY_MODIFY_IN_SUBQUERY.code, "FOR d IN @@cn LET x = (FOR i IN 1..2 REPLACE { _key: 'test' } IN @@cn) RETURN d", { "@cn": cn1 });
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testUpsertInSubquery1 : function () {
assertQueryError(errors.ERROR_QUERY_MODIFY_IN_SUBQUERY.code, "FOR d IN @@cn LET x = (UPSERT { _key: 'test' } INSERT { foo: 1 } UPDATE { bar: 2 } IN @@cn) RETURN d", { "@cn": cn1 });
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testUpsertInSubquery2 : function () {
assertQueryError(errors.ERROR_QUERY_MODIFY_IN_SUBQUERY.code, "FOR d IN @@cn LET x = (FOR i IN 1..2 UPSERT { _key: 'test' } INSERT { } UPDATE { } IN @@cn) RETURN d", { "@cn": cn1 });
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testMultiModify : function () {
assertQueryError(errors.ERROR_QUERY_PARSE.code, "FOR d IN @@cn1 REMOVE d IN @@cn1 FOR e IN @@cn2 REMOVE e IN @@cn2", { "@cn1": cn1, "@cn2": cn2 });
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery
////////////////////////////////////////////////////////////////////////////////
testMultiModify2 : function () {
assertQueryError(errors.ERROR_QUERY_PARSE.code, "FOR d IN @@cn1 FOR e IN @@cn2 REMOVE d IN @@cn1 REMOVE e IN @@cn2", { "@cn1": cn1, "@cn2": cn2 });
},
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief test subquery /// @brief test subquery
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -813,7 +741,7 @@ function ahuacatlModifySuite () {
]; ];
queries.forEach(function(query) { queries.forEach(function(query) {
assertQueryError(errors.ERROR_QUERY_PARSE.code, query, { "@cn": cn1 }, query); assertQueryError(errors.ERROR_QUERY_ACCESS_AFTER_MODIFICATION.code, query, { "@cn": cn1 }, query);
}); });
} }

43
js/server/tests/aql-multi-modify.js
View File

@ -118,14 +118,53 @@ function ahuacatlMultiModifySuite () {
assertEqual(10, c2.count()); assertEqual(10, c2.count());
}, },
testMultiInsertLoopSubquery : function () { testMultiInsertLoopSubquerySingle : function () {
var q = "FOR i IN 1..1 LET sub = (FOR j IN 1..i INSERT { value: j } INTO @@cn) RETURN 1";
var actual = AQL_EXECUTE(q, { "@cn": cn1 });
assertEqual(1, actual.json.length);
assertEqual([ 1 ], actual.json);
assertEqual(1, c1.count());
},
testMultiInsertLoopSubquerySingleReturned : function () {
var q = "FOR i IN 1..1 LET sub = (FOR j IN 1..i INSERT { value: j } INTO @@cn) RETURN sub";
var actual = AQL_EXECUTE(q, { "@cn": cn1 });
assertEqual(1, actual.json.length);
assertEqual([ [ ] ], actual.json);
assertEqual(1, c1.count());
},
testMultiInsertLoopSubqueryTwo : function () {
var q = "FOR i IN 1..2 LET sub = (FOR j IN 1..i INSERT { value: j } INTO @@cn) RETURN 1";
var actual = AQL_EXECUTE(q, { "@cn": cn1 });
assertEqual(2, actual.json.length);
assertEqual([ 1, 1 ], actual.json);
assertEqual(3, c1.count());
},
testMultiInsertLoopSubqueryTwoReturned : function () {
var q = "FOR i IN 1..2 LET sub = (FOR j IN 1..i INSERT { value: j } INTO @@cn) RETURN sub";
var actual = AQL_EXECUTE(q, { "@cn": cn1 });
assertEqual(2, actual.json.length);
assertEqual([ [ ], [ ] ], actual.json);
assertEqual(3, c1.count());
},
testMultiInsertLoopSubqueryMore : function () {
var q = "FOR i IN 1..10 LET sub = (FOR j IN 1..i INSERT { value: j } INTO @@cn) RETURN 1"; var q = "FOR i IN 1..10 LET sub = (FOR j IN 1..i INSERT { value: j } INTO @@cn) RETURN 1";
var actual = AQL_EXECUTE(q, { "@cn": cn1 }); var actual = AQL_EXECUTE(q, { "@cn": cn1 });
assertEqual(10, actual.json.length); assertEqual(10, actual.json.length);
assertEqual(55, actual.stats.writesExecuted);
assertEqual(55, c1.count()); assertEqual(55, c1.count());
}, },
testMultiInsertLoopSubqueryReturned : function () {
var q = "FOR i IN 1..2 LET sub = (FOR j IN 1..i INSERT { value: j } INTO @@cn) RETURN sub";
var actual = AQL_EXECUTE(q, { "@cn": cn1 });
assertEqual(2, actual.json.length);
assertEqual([ [ ], [ ] ], actual.json);
assertEqual(3, c1.count());
},
testMultiInsertLoopSubquerySameCollection : function () { testMultiInsertLoopSubquerySameCollection : function () {
AQL_EXECUTE("FOR i IN 1..10 INSERT { value: i } INTO @@cn", { "@cn" : cn1 }); AQL_EXECUTE("FOR i IN 1..10 INSERT { value: i } INTO @@cn", { "@cn" : cn1 });
var q = "FOR i IN @@cn LET sub = (FOR j IN 1..2 INSERT { value: j } INTO @@cn) RETURN 1"; var q = "FOR i IN @@cn LET sub = (FOR j IN 1..2 INSERT { value: j } INTO @@cn) RETURN 1";