// Fix order of identification variables.
// They have to appear in the select clause in the same order as the
// declarations (from ... x join ... y join ... z ...) appear in the query
// as the hydration process relies on that order for proper operation.
if ( count($this->_identVariableExpressions) > 1) {
  foreach ($this->_queryComponents as $dqlAlias => $qComp) {
    if (isset($this->_identVariableExpressions[$dqlAlias])) {
      $expr = $this->_identVariableExpressions[$dqlAlias];
      $key = array_search($expr, $AST->selectClause->selectExpressions);
      unset($AST->selectClause->selectExpressions[$key]);
      $AST->selectClause->selectExpressions[] = $expr;
    }
  }
}

$key = array_search($expr, $AST->selectClause->selectExpressions);
unset($AST->selectClause->selectExpressions[$key]);
      

       <id name="id" type="integer" column="id">
           <generator strategy="AUTO" />
       </id>

Soitgoes:foo lsmith$ app/main/console_dev doctrine:schema:drop --dump-sql
DROP SEQUENCE doctrine_user_user_id_seq;
DROP SEQUENCE doctrine_user_user_id_seq;
DROP SEQUENCE doctrine_user_user_id_seq;
DROP SEQUENCE doctrine_user_user_id_seq;
ALTER TABLE user_user_like DROP CONSTRAINT user_user_like_user_id_fkey;
ALTER TABLE user_user_like DROP CONSTRAINT user_user_like_user_like_id_fkey;
ALTER TABLE user_user_interest DROP CONSTRAINT user_user_interest_user_id_fkey;
ALTER TABLE user_user_interest DROP CONSTRAINT user_user_interest_user_interest_id_fkey;
DROP TABLE user_user_like;
DROP TABLE user_user_interest;
DROP TABLE doctrine_user_user;
DROP TABLE user_like;
DROP TABLE user_interest

CREATE TABLE doctrine_user_user (id INT NOT NULL, username VARCHAR(255) NOT NULL, username_lower VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, is_active BOOLEAN NOT NULL, is_super_admin BOOLEAN NOT NULL, password VARCHAR(255) NOT NULL, algorithm VARCHAR(127) NOT NULL, salt VARCHAR(127) NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, last_login TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, confirmation_token VARCHAR(127) DEFAULT NULL, remember_me_token VARCHAR(127) DEFAULT NULL, firstname VARCHAR(255) NOT NULL, lastname VARCHAR(255) NOT NULL, profile_token VARCHAR(10) NOT NULL, has_accepted_terms BOOLEAN NOT NULL, facebookID VARCHAR(50) DEFAULT NULL, city VARCHAR(255) DEFAULT NULL, gender VARCHAR(1) DEFAULT NULL, age INT DEFAULT NULL, phone_number VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX doctrine_user_user_username_uniq ON doctrine_user_user (username);
CREATE UNIQUE INDEX doctrine_user_user_username_lower_uniq ON doctrine_user_user (username_lower);
CREATE UNIQUE INDEX doctrine_user_user_email_uniq ON doctrine_user_user (email);
CREATE UNIQUE INDEX doctrine_user_user_facebookID_uniq ON doctrine_user_user (facebookID);
CREATE TABLE user_user_like (user_id INT NOT NULL, user_like_id INT NULL, PRIMARY KEY(user_id, user_like_id));
CREATE INDEX user_user_like_user_like_id_idx ON user_user_like (user_like_id);
CREATE UNIQUE INDEX user_user_like_user_id_uniq ON user_user_like (user_id);
CREATE TABLE user_user_interest (user_id INT NOT NULL, user_interest_id INT NULL, PRIMARY KEY(user_id, user_interest_id));
CREATE INDEX user_user_interest_user_interest_id_idx ON user_user_interest (user_interest_id);
CREATE UNIQUE INDEX user_user_interest_user_id_uniq ON user_user_interest (user_id);
CREATE TABLE user_interest (id SERIAL NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id));
CREATE TABLE user_like (id SERIAL NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id));
CREATE SEQUENCE doctrine_user_user_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
ALTER TABLE user_user_like ADD FOREIGN KEY (user_id) REFERENCES doctrine_user_user(id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE user_user_like ADD FOREIGN KEY (user_like_id) REFERENCES user_like(id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE user_user_interest ADD FOREIGN KEY (user_id) REFERENCES doctrine_user_user(id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE user_user_interest ADD FOREIGN KEY (user_interest_id) REFERENCES user_interest(id) NOT DEFERRABLE INITIALLY IMMEDIATE

SELECT count(DISTINCT z0_.) AS sclr0 FROM ...

...
$pathExpression = new PathExpression(
    PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $parentName, array(
    $parent['metadata']->getSingleIdentifierFieldName())
);
...

...
$pathExpression = new PathExpression(
    PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $parentName, 
    $parent['metadata']->getSingleIdentifierFieldName()
);
...

SELECT count(DISTINCT z0_.id) AS sclr0 FROM ...

diff --git a/manual/en/annotations-reference.txt b/manual/en/annotations-reference.txt
index fa15468..fb331d3 100644
--- a/manual/en/annotations-reference.txt
+++ b/manual/en/annotations-reference.txt
@@ -81,7 +81,7 @@ strategy, which means upon flush UnitOfWork compares all the properties of an en
 snapshot. This works out of the box, however you might want to tweak the flush performance where using
 another change tracking policy is an interesting option.
 
-The [details on all the available change tracking policies](/../configuration#change-tracking-policies)
+The [details on all the available change tracking policies](/change-tracking-policies)
 can be found in the configuration section.
 
 Example:
@@ -608,4 +608,4 @@ Example:
      * @column(type="integer")
      * @version
      */
-    protected $version;
\ No newline at end of file
+    protected $version;