Merge pull request #845

Author: jmikola

collection.c

@@ -2733,11 +2733,12 @@ PHP_METHOD(MongoCollection, distinct)
 {
 	char *key;
 	int key_len;
-	zval *cmd, **values, *tmp, *query = NULL;
+	HashTable *query = NULL;
+	zval *cmd, **values, *tmp, *zquery = NULL;
 	mongo_collection *c;
 	mongo_db *db;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a!", &key, &key_len, &query) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|H!", &key, &key_len, &query) == FAILURE) {
 		return;
 	}
 
@@ -2752,9 +2753,11 @@ PHP_METHOD(MongoCollection, distinct)
 	zval_add_ref(&c->name);
 	add_assoc_stringl(cmd, "key", key, key_len, 1);
 
-	if (query) {
-		add_assoc_zval(cmd, "query", query);
-		zval_add_ref(&query);
+	if (query && zend_hash_num_elements(query) > 0) {
+		MAKE_STD_ZVAL(zquery);
+		array_init(zquery);
+		zend_hash_copy(HASH_P(zquery), query, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+		add_assoc_zval(cmd, "query", zquery);
 	}
 
 	tmp = php_mongo_runcommand(c->link, &c->read_pref, Z_STRVAL_P(db->name), Z_STRLEN_P(db->name), cmd, NULL, 0, NULL TSRMLS_CC);

tests/generic/mongocollection-distinct-001.phpt

@@ -0,0 +1,27 @@
+--TEST--
+MongoCollection::distinct()
+--SKIPIF--
+<?php require_once "tests/utils/standalone.inc"; ?>
+--FILE--
+<?php require_once "tests/utils/server.inc"; ?>
+<?php
+
+$host = MongoShellServer::getStandaloneInfo();
+$m = new MongoClient($host);
+$c = $m->selectCollection(dbname(), collname(__FILE__));
+$c->drop();
+
+$c->insert(array('x' => 1));
+$c->insert(array('x' => 2));
+$c->insert(array('x' => 2));
+$c->insert(array('x' => 3));
+
+printf("Distinct x values: %s\n", json_encode($c->distinct('x')));
+printf("Distinct x values where x >= 2: %s\n", json_encode($c->distinct('x', array('x' => array('$gte' => 2)))));
+
+?>
+===DONE===
+--EXPECT--
+Distinct x values: [1,2,3]
+Distinct x values where x >= 2: [2,3]
+===DONE===

tests/generic/mongocollection-distinct_error-001.phpt

@@ -0,0 +1,31 @@
+--TEST--
+MongoCollection::distinct() requires query to be a hash
+--SKIPIF--
+<?php require_once "tests/utils/standalone.inc"; ?>
+--FILE--
+<?php require_once "tests/utils/server.inc"; ?>
+<?php
+
+$host = MongoShellServer::getStandaloneInfo();
+$m = new MongoClient($host);
+$c = $m->selectCollection(dbname(), collname(__FILE__));
+$c->drop();
+
+$c->insert(array('x' => 1));
+$c->insert(array('x' => 2));
+$c->insert(array('x' => 2));
+$c->insert(array('x' => 3));
+
+echo json_encode($c->distinct('x', array())), "\n";
+echo json_encode($c->distinct('x', new stdClass)), "\n";
+echo json_encode($c->distinct('x', 1)), "\n";
+
+?>
+===DONE===
+--EXPECTF--
+[1,2,3]
+[1,2,3]
+
+Warning: MongoCollection::distinct() expects parameter 2 to be array, integer given in %s on line %d
+null
+===DONE===