Merge

docs/en/reference/basic-mapping.rst

@@ -297,7 +297,7 @@ list:
 
 -  ``type``: (optional, defaults to 'string') The mapping type to
    use for the column.
--  ``column``: (optional, defaults to field name) The name of the
+-  ``name``: (optional, defaults to field name) The name of the
    column in the database.
 -  ``length``: (optional, default 255) The length of the column in
    the database. (Applies only if a string-valued column is used).

lib/Doctrine/ORM/AbstractQuery.php

@@ -701,6 +701,18 @@ abstract class AbstractQuery
         return isset($this->_hints[$name]) ? $this->_hints[$name] : false;
     }
 
+    /**
+     * Check if the query has a hint
+     *
+     * @param  string $name The name of the hint
+     *
+     * @return bool False if the query does not have any hint
+     */
+    public function hasHint($name)
+    {
+        return isset($this->_hints[$name]);
+    }
+
     /**
      * Return the key value map of query hints that are currently set.
      *

lib/Doctrine/ORM/Tools/Pagination/Paginator.php

@@ -121,7 +121,7 @@ class Paginator implements \Countable, \IteratorAggregate
             /* @var $countQuery Query */
             $countQuery = $this->cloneQuery($this->query);
 
-            if ( ! $countQuery->getHint(CountWalker::HINT_DISTINCT)) {
+            if ( ! $countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
                 $countQuery->setHint(CountWalker::HINT_DISTINCT, true);
             }
 

tests/Doctrine/Tests/ORM/Query/QueryTest.php

@@ -105,6 +105,8 @@ class QueryTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('bar', $q->getHint('foo'));
         $this->assertEquals('baz', $q->getHint('bar'));
         $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz'), $q->getHints());
+        $this->assertTrue($q->hasHint('foo'));
+        $this->assertFalse($q->hasHint('barFooBaz'));
     }
 
     /**