fix ? case with SERVER-239

2 files changed, 10 insertions, 5 deletions

diff --git a/db/jsobj.cpp b/db/jsobj.cpp
index b872239310e..d344c19a427 100644
--- a/db/jsobj.cpp
+++ b/db/jsobj.cpp
@@ -559,7 +559,7 @@ namespace mongo {
         stringstream ss;
         for( ; *i; ++i ){
             char c = *i;
-            if ( c == '*' ){
+            if ( c == '*' || c == '?' ){
                 r = ss.str();
                 r = r.substr( 0 , r.size() - 1 );
                 break;
@@ -1193,6 +1193,12 @@ namespace mongo {
 				BSONObjBuilder b;
 				b.appendRegex("r", "^f?oo");
 				BSONObj o = b.done();
+				assert( o.firstElement().simpleRegex() == "" );
+			}
+			{
+				BSONObjBuilder b;
+				b.appendRegex("r", "^fz?oo");
+				BSONObj o = b.done();
 				assert( o.firstElement().simpleRegex() == "f" );
 			}
         }
diff --git a/jstests/regex3.js b/jstests/regex3.js
index 91ab3c5c03c..ee8d9cf5b27 100644
--- a/jstests/regex3.js
+++ b/jstests/regex3.js
@@ -31,7 +31,6 @@ assert.eq( 2 , t.find( { name : /^a[bc]/ } ).count() , "B i 3" );
 t.drop();
 
 t.save( { name: "" } );
-assert.eq( 1, t.count( { name: /^a?/ } ) );
-// fix
-// t.ensureIndex( { name: 1 } );
-// assert.eq( 1, t.count( { name: /^a?/ } ) );
+assert.eq( 1, t.count( { name: /^a?/ } ) , "C 1" );
+t.ensureIndex( { name: 1 } );
+assert.eq( 1, t.count( { name: /^a?/ } ) , "C 2");