Updates mongodb driver to support DBRef and change primary key settings

dresende · dresende · commit 35cf9a667e48 · 2013-07-19T14:45:46.000+01:00
diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
@@ -6,7 +6,9 @@ function Driver(config, connection, opts) {
 	this.client = new mongodb.MongoClient();
 	this.db     = null;
 	this.config = config || {};
-	this.opts   = opts || {};
+	this.opts   = opts;
+
+	this.opts.settings.set("properties.primary_key", "_id");
 }
 
 Driver.prototype.sync = function (opts, cb) {
@@ -57,6 +59,9 @@ Driver.prototype.close = function (cb) {
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	var collection = this.db.collection(table);
+
+	convertToDB(conditions);
+
 	var cursor     = collection.find(conditions, fields);
 
 	if (opts.order) {
@@ -76,7 +81,8 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 	return cursor.toArray(function (err, docs) {
 		for (var i = 0; i < docs.length; i++) {
-			docs[i]._id = docs[i]._id.toString();
+			convertFromDB(docs[i]);
+			// docs[i]._id = docs[i]._id.toString();
 		}
 		return cb(err, docs);
 	});
@@ -163,7 +169,11 @@ Driver.prototype.clear = function (table, cb) {
 function convertToDB(obj) {
 	for (var k in obj) {
 		if (k == "_id") {
-			obj[k] = new mongodb.ObjectID(obj[k]);
+			if (obj[k] instanceof mongodb.DBRef) {
+				obj[k] = new mongodb.ObjectID(obj[k].oid.toString());
+			} else if (!(obj[k] instanceof mongodb.ObjectID)) {
+				obj[k] = new mongodb.ObjectID(obj[k]);
+			}
 		}
 	}
 }
