Spider Monkey: framework mostly done now

3 files changed, 4 insertions, 10 deletions

diff --git a/shell/collection.js b/shell/collection.js
index 85f000cfb60..95d645c4e09 100644
--- a/shell/collection.js
+++ b/shell/collection.js
@@ -13,12 +13,13 @@ if ( ( typeof  DBCollection ) == "undefined" ){
 }
 
 DBCollection.prototype.verify = function(){
-    assert( this._mongo , "no mongo" );
-    assert( this._db , "no db" );
-    assert( this._shortName , "no shortName" );
     assert( this._fullName , "no fullName" );
+    assert( this._shortName , "no shortName" );
+    assert( this._db , "no db" );
     
     assert.eq( this._fullName , this._db._name + "." + this._shortName , "name mismatch" );
+
+    assert( this._mongo , "no mongo in DBCollection" );
 }
 
 DBCollection.prototype.getName = function(){
diff --git a/shell/db.js b/shell/db.js
index 25df37be0d8..11401f83d69 100644
--- a/shell/db.js
+++ b/shell/db.js
@@ -2,7 +2,6 @@
 
 if ( typeof DB == "undefined" ){                     
     DB = function( mongo , name ){
-        assert( typeof createDB != "function" , "createDB defined, so shouldn't do this" );
         this._mongo = mongo;
         this._name = name;
     }
diff --git a/shell/mongo.js b/shell/mongo.js
index 48a987dff49..5fbba134965 100644
--- a/shell/mongo.js
+++ b/shell/mongo.js
@@ -30,12 +30,6 @@ Mongo.prototype.setSlaveOk = function() {
 }
 
 Mongo.prototype.getDB = function( name ){
-    if ( typeof createDB == "function" ){
-        var newdb =  createDB( this , name );
-        assert( this == newdb.getMongo() , "createDB sanity check 1" );
-        assert( this == newdb._mongo , "createDB sanity check 2" );
-        return newdb;
-    }
     return new DB( this , name );
 }