Comparing version 2.4.0 to 2.4.1
@@ -43,3 +43,7 @@ var Collection = require('./collection') | ||
} else { // try mongodb-native | ||
this._dbname = parse(connString.options.url).dbName | ||
if (connString.options.url) { | ||
this._dbname = parse(connString.options.url).dbName | ||
} else { | ||
this._dbname = connString.databaseName // Try fallback for some mongodb native versions | ||
} | ||
@@ -46,0 +50,0 @@ this._getConnection = thunky(function (cb) { |
@@ -9,3 +9,3 @@ { | ||
], | ||
"version": "2.4.0", | ||
"version": "2.4.1", | ||
"repository": "git://github.com/mafintosh/mongojs.git", | ||
@@ -36,3 +36,3 @@ "author": "Mathias Buus Madsen <mathiasbuus@gmail.com>", | ||
"readable-stream": "^2.0.2", | ||
"thunky": "^0.1.0", | ||
"thunky": "^1.0.2", | ||
"to-mongodb-core": "^2.0.0", | ||
@@ -56,5 +56,5 @@ "xtend": "^4.0.0" | ||
"coordinates": [ | ||
48.2317966, | ||
16.3996661 | ||
48.2091041, | ||
16.415049 | ||
] | ||
} |
118
README.md
@@ -256,22 +256,22 @@ # mongojs | ||
#####`db.collection.aggregate([pipeline], [options], [callback])` | ||
##### `db.collection.aggregate([pipeline], [options], [callback])` | ||
https://docs.mongodb.org/manual/reference/method/db.collection.aggregate/ | ||
#####`db.collection.aggregate([pipelineStep], [pipelineStep], [pipelineStep], ..., [callback])` | ||
##### `db.collection.aggregate([pipelineStep], [pipelineStep], [pipelineStep], ..., [callback])` | ||
#####`db.collection.count([query], callback)` | ||
##### `db.collection.count([query], callback)` | ||
#####`db.collection.createIndex(keys, options, [callback])` | ||
##### `db.collection.createIndex(keys, options, [callback])` | ||
#####`db.collection.distinct(field, query, callback)` | ||
##### `db.collection.distinct(field, query, callback)` | ||
#####`db.collection.drop([callback])` | ||
##### `db.collection.drop([callback])` | ||
#####`db.collection.dropIndex(index, [callback])` | ||
##### `db.collection.dropIndex(index, [callback])` | ||
#####`db.collection.dropIndexes([callback])` | ||
##### `db.collection.dropIndexes([callback])` | ||
#####`db.collection.ensureIndex(keys, options, [callback])` | ||
##### `db.collection.ensureIndex(keys, options, [callback])` | ||
#####`db.collection.find([criteria], [projection], [callback])` | ||
##### `db.collection.find([criteria], [projection], [callback])` | ||
@@ -281,32 +281,32 @@ This function applies a query to a collection. You can get the return value, which is a cursor, or pass a callback | ||
#####`db.collection.findOne([criteria], [projection], callback)` | ||
##### `db.collection.findOne([criteria], [projection], callback)` | ||
Apply a query and get one single document passed as a callback. The callback receives `(err, document)` | ||
#####`db.collection.findAndModify(document, callback)` | ||
##### `db.collection.findAndModify(document, callback)` | ||
#####`db.collection.getIndexes(callback)` | ||
##### `db.collection.getIndexes(callback)` | ||
#####`db.collection.group(document, callback)` | ||
##### `db.collection.group(document, callback)` | ||
#####`db.collection.insert(docOrDocs, [callback])` | ||
##### `db.collection.insert(docOrDocs, [callback])` | ||
#####`db.collection.isCapped(callback)` | ||
##### `db.collection.isCapped(callback)` | ||
#####`db.collection.mapReduce(map, reduce, options, [callback])` | ||
##### `db.collection.mapReduce(map, reduce, options, [callback])` | ||
#####`db.collection.reIndex([callback])` | ||
##### `db.collection.reIndex([callback])` | ||
#####`db.collection.remove(query, [justOne], [callback])` | ||
#####`db.collection.remove(query, [options], [callback])` | ||
##### `db.collection.remove(query, [justOne], [callback])` | ||
##### `db.collection.remove(query, [options], [callback])` | ||
#####`db.collection.runCommand(command, [callback])` | ||
##### `db.collection.runCommand(command, [callback])` | ||
#####`db.collection.save(doc, [options], [callback])` | ||
##### `db.collection.save(doc, [options], [callback])` | ||
#####`db.collection.stats(callback)` | ||
##### `db.collection.stats(callback)` | ||
#####`db.collection.update(query, update, [options], [callback])` | ||
##### `db.collection.update(query, update, [options], [callback])` | ||
#####`db.collection.toString()` | ||
##### `db.collection.toString()` | ||
@@ -317,72 +317,72 @@ Get the name of the collection. | ||
#####`cursor.batchSize(size, [callback])` | ||
##### `cursor.batchSize(size, [callback])` | ||
#####`cursor.count(callback)` | ||
##### `cursor.count(callback)` | ||
#####`cursor.explain(callback)` | ||
##### `cursor.explain(callback)` | ||
#####`cursor.forEach(function)` | ||
##### `cursor.forEach(function)` | ||
#####`cursor.limit(n, [callback])` | ||
##### `cursor.limit(n, [callback])` | ||
#####`cursor.map(function, [callback])` | ||
##### `cursor.map(function, [callback])` | ||
#####`cursor.next(callback)` | ||
##### `cursor.next(callback)` | ||
#####`cursor.skip(n, [callback])` | ||
##### `cursor.skip(n, [callback])` | ||
#####`cursor.sort(sortOptions, [callback])` | ||
##### `cursor.sort(sortOptions, [callback])` | ||
#####`cursor.toArray(callback)` | ||
##### `cursor.toArray(callback)` | ||
#####`cursor.rewind()` | ||
##### `cursor.rewind()` | ||
#####`cursor.destroy()` | ||
##### `cursor.destroy()` | ||
#### Database | ||
#####`db.addUser(document)` | ||
##### `db.addUser(document)` | ||
#####`db.createCollection(name, options, [callback])` | ||
##### `db.createCollection(name, options, [callback])` | ||
#####`db.dropDatabase([callback])` | ||
##### `db.dropDatabase([callback])` | ||
#####`db.eval(code, [params], [options], [callback])` | ||
##### `db.eval(code, [params], [options], [callback])` | ||
#####`db.getCollectionNames(callback)` | ||
##### `db.getCollectionNames(callback)` | ||
#####`db.getLastError(callback)` | ||
##### `db.getLastError(callback)` | ||
#####`db.getLastErrorObj(callback)` | ||
##### `db.getLastErrorObj(callback)` | ||
#####`db.removeUser(username, [callback])` | ||
##### `db.removeUser(username, [callback])` | ||
#####`db.runCommand(command, [callback])` | ||
##### `db.runCommand(command, [callback])` | ||
#####`db.stats([callback])` | ||
##### `db.stats([callback])` | ||
#####`db.close()` | ||
##### `db.close()` | ||
#### Bulk | ||
#####`bulk.execute()` | ||
##### `bulk.execute()` | ||
#####`bulk.find(query)` | ||
##### `bulk.find(query)` | ||
#####`bulk.find.remove()` | ||
##### `bulk.find.remove()` | ||
#####`bulk.find.removeOne()` | ||
##### `bulk.find.removeOne()` | ||
#####`bulk.find.replaceOne(document)` | ||
##### `bulk.find.replaceOne(document)` | ||
#####`bulk.find.update(updaterParam)` | ||
##### `bulk.find.update(updaterParam)` | ||
#####`bulk.find.updateOne(updaterParam)` | ||
##### `bulk.find.updateOne(updaterParam)` | ||
#####`bulk.find.upsert(upsertParam)` | ||
##### `bulk.find.upsert(upsertParam)` | ||
#####`bulk.insert(document)` | ||
##### `bulk.insert(document)` | ||
#####`bulk.toString()` | ||
##### `bulk.toString()` | ||
#####`bulk.tojson()` | ||
##### `bulk.tojson()` |
2157
160392
85
+ Addedthunky@1.1.0(transitive)
- Removedthunky@0.1.0(transitive)
Updatedthunky@^1.0.2