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

Merge branch 'vpack' of github.com:arangodb/arangodb into vpack

This commit is contained in:
Michael Hackstein 2015-12-17 13:24:52 +01:00
parent 46b9ac5c53 677bec7fc3
commit c99582bf95
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/common/bootstrap/modules.js
View File

@ -91,7 +91,7 @@ function hasOwnProperty(obj, prop) {
function createRequire(module) {
function require(path) {
return module.require(path.replace(/^org\/arangodb/, '@arangodb'));
return module.require(path);
}
require.resolve = function(request) {
@ -406,6 +406,7 @@ function isGlobalModule(filename) {
// Then have it load the file contents before returning its exports
// object.
Module._load = function(request, parent, isMain) {
request = request.replace(/^org\/arangodb/, '@arangodb');
var filename = request;
var dbModule = false;

8
js/common/tests/shell-attributes.js
View File

@ -571,16 +571,16 @@ function AttributesSuite () {
"@collection" : c.name()
}).toArray().sort();
assertEqual(3, result.length);
assertEqual([ "first", "second", "third" ], result);
assertEqual(2, result.length);
assertEqual([ "first", "third" ], result);
result = db._query("FOR doc IN @@collection FILTER V8(LIKE(doc.value, '\u0000%')) " +
"SORT doc._key RETURN doc._key", {
"@collection" : c.name()
}).toArray().sort();
assertEqual(3, result.length);
assertEqual([ "first", "second", "third" ], result);
assertEqual(2, result.length);
assertEqual([ "first", "third" ], result);
}
};