- Forward port from 1.0.8.1 bugfix branch

* Factory & Builder for MongoDBObject always return as DBObject * Unit test for reported issue
novus · Aug 29, 2010 · 68c52a4 · 68c52a4
1 parent 5bbce8c
commit 68c52a4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/casbah-commons/src/main/scala/MongoDBObject.scala b/casbah-commons/src/main/scala/MongoDBObject.scala
@@ -149,7 +149,7 @@ object MongoDBObject  {
 
 }
 
-sealed class MongoDBObjectBuilder extends scala.collection.mutable.Builder[(String, Any), MongoDBObject] {
+sealed class MongoDBObjectBuilder extends scala.collection.mutable.Builder[(String, Any), DBObject] {
   import com.mongodb.BasicDBObjectBuilder 
 
   protected val empty = BasicDBObjectBuilder.start
@@ -160,7 +160,7 @@ sealed class MongoDBObjectBuilder extends scala.collection.mutable.Builder[(Stri
   }
 
   def clear() { elems = empty }
-  def result: MongoDBObject = new MongoDBObject { val underlying = elems.get }
+  def result: DBObject = new MongoDBObject { val underlying = elems.get }
 }
 
 // vim: set ts=2 sw=2 sts=2 et:
diff --git a/casbah-commons/src/test/scala/MongoDBObjectSpec.scala b/casbah-commons/src/test/scala/MongoDBObjectSpec.scala
@@ -20,7 +20,7 @@
  */
 
 package com.novus.casbah
-package conversions
+package test 
 
 import com.novus.casbah.commons.Imports._
 
@@ -62,6 +62,19 @@ class MongoDBObjectSpec extends Specification with PendingUntilFixed {
       c must beSome(List(5, 4, 3, 2, 1))
     }
   }
+
+  "MongoDBObject issues reported by users" should {
+    "Not break like tommy chheng reported" in {
+      val q = MongoDBObject.empty
+
+      val fields = MongoDBObject("name" -> 1)
+
+      // Simple test of Is it a DBObject?
+      q must haveSuperClass[DBObject]
+      fields must haveSuperClass[DBObject]
+    }
+  }
+
 }