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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Heiko Kernbach 2013-07-18 13:24:57 +02:00
parent 309e66d2f4 2df87f01bb
commit 0426adb246
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/server/modules/org/arangodb/aql-helper.js
View File

@ -120,10 +120,12 @@ function getRawQueryResults (query, bindVars) {
}
var rows = [ ];
var func = function (row) {
rows.push(row);
};
while (queryResult.hasNext()) {
queryResult.toArray().forEach(function(row) {
rows.push(row);
});
queryResult.toArray().forEach(func);
}
return rows;
}

2
js/server/version-check.js
View File

@ -458,7 +458,7 @@
if (oldKey !== newKey) {
try {
doc = {
var doc = {
_key: newKey.toUpperCase(),
name: newKey,
code: f.code,