Merge pull request #53 from alcaeus/fix-map-reduce-queries

Ensure mapReduce queries with empty map work
alcaeus · Feb 10, 2016 · 489af35 · 489af35
2 parents 662a8c0 + 7356283
commit 489af35
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 2 deletions.
diff --git a/lib/Alcaeus/MongoDbAdapter/TypeConverter.php b/lib/Alcaeus/MongoDbAdapter/TypeConverter.php
@@ -49,7 +49,7 @@ public static function fromLegacy($value)
                     $result[$key] = self::fromLegacy($item);
                 }
 
-                return self::ensureCorrectType($result);
+                return self::ensureCorrectType($result, is_object($value));
             default:
                 return $value;
         }
@@ -143,10 +143,15 @@ private static function convertBSONObjectToLegacy(BSON\Type $value)
      * Converts all arrays with non-numeric keys to stdClass
      *
      * @param array $array
+     * @param bool $wasObject
      * @return array|Model\BSONArray|Model\BSONDocument
      */
-    private static function ensureCorrectType(array $array)
+    private static function ensureCorrectType(array $array, $wasObject = false)
     {
+        if ($array === [] && $wasObject) {
+            return (object) $array;
+        }
+
         if (static::isNumericArray($array)) {
             return $array;
         }

diff --git a/tests/Alcaeus/MongoDbAdapter/MongoCollectionTest.php b/tests/Alcaeus/MongoDbAdapter/MongoCollectionTest.php
@@ -997,6 +997,80 @@ public function testGroup()
         );
     }
 
+    public function testMapReduce()
+    {
+        $data = array(
+            array(
+                'username' => 'jones',
+                'likes' => 20.0,
+                'text' => 'Hello world!'
+            ),
+            array(
+                'username' => 'bob',
+                'likes' => 100.0,
+                'text' => 'Hello world!'
+            ),
+            array(
+                'username' => 'bob',
+                'likes' => 100.0,
+                'text' => 'Hello world!'
+            ),
+        );
+
+        $collection = $this->getCollection();
+        $collection->batchInsert($data);
+
+        $map = 'function() {
+            emit(this.username, { count: 1, likes: this.likes });
+        }';
+
+        $reduce = 'function(key, values) {
+            var result = {count: 0, likes: 0};
+
+            values.forEach(function(value) {
+              result.count += value.count;
+              result.likes += value.likes;
+            });
+
+            return result;
+        }';
+
+        $finalize = 'function (key, value) { value.test = "test"; return value; }';
+
+        $command = [
+            'mapreduce' => $this->getCollection()->getName(),
+            'map' => new \MongoCode($map),
+            'reduce' => new \MongoCode($reduce),
+            'query' => (object) [],
+            'out' => ['inline' => true],
+            'finalize' => new \MongoCode($finalize),
+        ];
+
+        $result = $this->getDatabase()->command($command);
+
+        $expected = [
+            [
+                '_id' => 'bob',
+                'value' => [
+                    'count' => 2.0,
+                    'likes' => 200.0,
+                    'test' => 'test',
+                ],
+            ],
+            [
+                '_id' => 'jones',
+                'value' => [
+                    'count' => 1.0,
+                    'likes' => 20.0,
+                    'test' => 'test',
+                ],
+            ],
+        ];
+
+        $this->assertSame(1.0, $result['ok']);
+        $this->assertSame($expected, $result['results']);
+    }
+
     public function testFindAndModifyResultException()
     {
         $this->markTestSkipped('Test fails on travis-ci - skipped while investigating this');