fix pull with primitives and $ops SERVER-1697

2 files changed, 15 insertions, 2 deletions

diff --git a/db/update.cpp b/db/update.cpp
index 7891b329048..a59387d860e 100644
--- a/db/update.cpp
+++ b/db/update.cpp
@@ -40,6 +40,9 @@ namespace mongo {
             // if elt isn't an object, then comparison will work
             return toMatch.woCompare( elt , false ) == 0;
         }
+        
+        if ( matcherOnPrimitive )
+            return matcher->matches( toMatch.wrap( "" ) );
 
         if ( toMatch.type() != Object ){
             // looking for an object, so this can't match
diff --git a/db/update.h b/db/update.h
index b7950de7306..eeec3d2460d 100644
--- a/db/update.h
+++ b/db/update.h
@@ -43,12 +43,22 @@ namespace mongo {
         
         BSONElement elt; // x:5 note: this is the actual element from the updateobj
         boost::shared_ptr<Matcher> matcher;
+        bool matcherOnPrimitive;
 
         void init( Op o , BSONElement& e ){
             op = o;
             elt = e;
-            if ( op == PULL && e.type() == Object )
-                matcher.reset( new Matcher( e.embeddedObject() ) );
+            if ( op == PULL && e.type() == Object ){
+                BSONObj t = e.embeddedObject();
+                if ( t.firstElement().getGtLtOp() == 0 ){
+                    matcher.reset( new Matcher( t ) );
+                    matcherOnPrimitive = false;
+                }
+                else {
+                    matcher.reset( new Matcher( BSON( "" << t ) ) );
+                    matcherOnPrimitive = true;
+                }
+            }
         }
 
         void setFieldName( const char * s ){