[2.0] Couple of fixes to new Console implementation

lib/Doctrine/Common/Version.php

@@ -38,7 +38,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.0 ALPHA 4';
+    const VERSION = '2.0-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php

@@ -76,8 +76,7 @@ EOT
         }
         
         if (preg_match('/^select/i', $sql)) {
-            $stmt = $conn->execute($sql);
-            $resultSet = $stmt->fetchAll(\Doctrine\DBAL\Connection::FETCH_ASSOC);
+           $resultSet = $conn->fetchAll($sql);
         } else {
             $resultSet = $em->getConnection()->executeUpdate($sql);
         }

lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php

@@ -117,7 +117,7 @@ EOT
             $query->setMaxResult((int) $maxResult);
         }
 
-        $resultSet = $query->execute(array(), $hydrationMode);
+        $resultSet = $query->execute(array(), constant($hydrationMode));
 
         \Doctrine\Common\Util\Debug::dump($resultSet, $input->getOption('depth'));
     }

lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php

@@ -76,7 +76,7 @@ EOT
     {
         $em = $this->getHelper('em')->getEntityManager();
 
-        $reader = new ClassMetadataReader();
+        $reader = new \Doctrine\ORM\Tools\ClassMetadataReader();
         $reader->setEntityManager($em);
 
         // Process source directories

lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/DropCommand.php

@@ -77,7 +77,7 @@ EOT
     {
         $em = $this->getHelper('em')->getEntityManager();
 
-        $reader = new ClassMetadataReader();
+        $reader = new \Doctrine\ORM\Tools\ClassMetadataReader();
         $reader->setEntityManager($em);
 
         // Process source directories

lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php

@@ -82,7 +82,7 @@ EOT
     {
         $em = $this->getHelper('em')->getEntityManager();
 
-        $reader = new ClassMetadataReader();
+        $reader = new \Doctrine\ORM\Tools\ClassMetadataReader();
         $reader->setEntityManager($em);
 
         // Process source directories

tools/sandbox/cli-config.php

 <?php
-#
-# This configuration file is loaded by the Doctrine CLI whenever you execute
-# a task. A CLI configuration file usually initializes two local variables:
-#
-# $em - An EntityManager instance that the CLI tasks should use.
-# $globalArguments - An array of default command line arguments that are passed to all
-#                    CLI tasks automatically when an argument is not specifically set on
-#                    the command line.
-#
-# You can create several CLI configuration files with different names, for different databases.
-# Every CLI task recognizes the --config=<path> option where you can specify the configuration
-# file to use for a particular task. If this option is not given, the CLI looks for a file
-# named "cli-config.php" (this one) in the same directory and uses that by default.
-#
 
 require_once __DIR__ . '/../../lib/Doctrine/Common/ClassLoader.php';