ne applies to all multikey values, adjust 'size' and 'all' behavior for objects within arrays

1 files changed, 15 insertions, 1 deletions

diff --git a/dbtests/querytests.cpp b/dbtests/querytests.cpp
index be3925014df..6702e5595cb 100644
--- a/dbtests/querytests.cpp
+++ b/dbtests/querytests.cpp
@@ -372,11 +372,24 @@ namespace QueryTests {
         void run() {
             const char *ns = "querytests.Ne";
             client().insert( ns, fromjson( "{a:[1,2]}" ) );
+            ASSERT( client().findOne( ns, fromjson( "{a:{$ne:1}}" ) ).isEmpty() );
             BSONObj spec = fromjson( "{a:{$ne:1,$ne:2}}" );
-            ASSERT( !client().findOne( ns, spec ).isEmpty() );
+            ASSERT( client().findOne( ns, spec ).isEmpty() );
         }                
     };
     
+    class EmbeddedNe : public ClientBase {
+    public:
+        ~EmbeddedNe() {
+            client().dropCollection( "querytests.NestedNe" );            
+        }
+        void run() {
+            const char *ns = "querytests.NestedNe";
+            client().insert( ns, fromjson( "{a:[{b:1},{b:2}]}" ) );
+            ASSERT( client().findOne( ns, fromjson( "{'a.b':{$ne:1}}" ) ).isEmpty() );
+        }                        
+    };
+    
     class All : public UnitTest::Suite {
     public:
         All() {
@@ -397,6 +410,7 @@ namespace QueryTests {
             add< UnderscoreNs >();
             add< EmptyFieldSpec >();
             add< MultiNe >();
+            add< EmbeddedNe >();
         }
     };