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

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

This commit is contained in:
Michael Hackstein 2013-11-12 14:01:19 +01:00
parent 41ea74dca5 d0335bb9a7
commit ae7fdd5277
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/apps/system/aardvark/frontend/js/modules/org/arangodb/arango-database.js
View File

@ -407,18 +407,10 @@ ArangoDatabase.prototype._truncate = function (id) {
////////////////////////////////////////////////////////////////////////////////
ArangoDatabase.prototype._drop = function (id) {
var name;
var collection = this._collection(id);
for (name in this) {
if (this.hasOwnProperty(name)) {
var collection = this[name];
if (collection instanceof this._collectionConstructor) {
if (collection._id === id || collection._name === id) {
return collection.drop();
}
}
}
if (collection instanceof this._collectionConstructor) {
return collection.drop();
}
return undefined;

14
js/client/modules/org/arangodb/arango-database.js
View File

@ -406,18 +406,10 @@ ArangoDatabase.prototype._truncate = function (id) {
////////////////////////////////////////////////////////////////////////////////
ArangoDatabase.prototype._drop = function (id) {
var name;
var collection = this._collection(id);
for (name in this) {
if (this.hasOwnProperty(name)) {
var collection = this[name];
if (collection instanceof this._collectionConstructor) {
if (collection._id === id || collection._name === id) {
return collection.drop();
}
}
}
if (collection instanceof this._collectionConstructor) {
return collection.drop();
}
return undefined;