Fixed bug with DB.createCollection

graemerocher · Jul 3, 2010 · e9ff5db · e9ff5db
1 parent 6b8f018
commit e9ff5db
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/main/groovy/com/gmongo/internal/DBPatcher.groovy b/src/main/groovy/com/gmongo/internal/DBPatcher.groovy
@@ -17,7 +17,13 @@ package com.gmongo.internal
 
 class DBPatcher {
 
-	static final PATCHED_METHODS = [ 'command' ]
+	static final PATCHED_METHODS = [ 'command', 'createCollection' ]
+
+	static final AFTER_RETURN = [
+		createCollection: { defaultArgs, result ->
+			DBCollectionPatcher.patch result
+		}
+	]
 
 	static patch(db) {
 		if (db.hasProperty(Patcher.PATCH_MARK)) return
@@ -41,7 +47,7 @@ class DBPatcher {
 				delegate.requestDone()
 			}
 		}
-		Patcher._patchInternal db, PATCHED_METHODS
+		Patcher._patchInternal db, PATCHED_METHODS, [:], [:], AFTER_RETURN
 	}
 
 	private static _patchedCollection(c) {

diff --git a/src/test/groovy/com/gmongo/DBTest.groovy b/src/test/groovy/com/gmongo/DBTest.groovy
@@ -13,6 +13,7 @@ class DBTest extends IntegrationTestCase {
 	void setUp() {
 		super.setUp()
 		db = mongo.getDB(DB_NAME)
+		db.dropDatabase()
 	}
 
 	void testGetCollection() {
@@ -67,6 +68,17 @@ class DBTest extends IntegrationTestCase {
 		assertTrue started && ended
 	}
 
+	void testCollectionExists() {
+		assertFalse db.collectionExists('baz')
+		db.baz.insert(foo: 10)
+		assertTrue db.collectionExists('baz')
+	}
+
+	void testCreateCollection() {
+		def c = db.createCollection("foo", [capped: true, size: 100000])
+		assert c.hasProperty(Patcher.PATCH_MARK)
+	}
+
 	void testInRequest() {
 		db.inRequest {->
 			db.foo.insert(bar: 10)