Commit 8c9f2203 authored by Eric Schultz's avatar Eric Schultz
Browse files

Fixes to Mongo Mapper's select function for group operations: 

1) Corrected mongo group parameters (finalize)
2) Store just the 'retval' value from mongo group in temp collection
3) Drop temp table after reading results instead of before
parent fd9ac55a

db/mongo/mapper.php

+5 −7
Original line number Diff line number Diff line
@@ -124,12 +124,10 @@ class Mapper extends \DB\Cursor { 
						$options['group']['initial'],

						$options['group']['reduce'],

						array(

							'condition'=>array(

								$filter,

								$options['group']['finalize']

							'condition'=>$filter,

							'finalize'=>$options['group']['finalize']

						)

						)

					),

					)['retval'],

					array('safe'=>TRUE)

				);

				$filter=array();
@@ -146,11 +144,11 @@ class Mapper extends \DB\Cursor { 
				$cursor=$cursor->limit($options['limit']);

			if ($options['offset'])

				$cursor=$cursor->skip($options['offset']);

			if ($options['group'])

				$tmp->drop();

			$result=array();

			while ($cursor->hasnext())

				$result[]=$cursor->getnext();

			if ($options['group'])

				$tmp->drop();

			if ($fw->get('CACHE') && $ttl)

				// Save to cache backend

				$cache->set($hash,$result,$ttl);