Merge branch 'master' of github.com:doctrine/dbal

lib/Doctrine/DBAL/Connection.php

@@ -33,7 +33,6 @@ use PDO, Closure, Exception,
  * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link    www.doctrine-project.org
  * @since   2.0
- * @version $Revision: 3938 $
  * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author  Jonathan Wage <jonwage@gmail.com>
  * @author  Roman Borschel <roman@code-factory.org>
@@ -1093,4 +1092,14 @@ class Connection implements DriverConnection
             }
         }
     }
+    
+    /**
+     * Create a new instance of a SQL query builder.
+     * 
+     * @return Query\QueryBuilder 
+     */
+    public function createQueryBuilder()
+    {
+        return new Query\QueryBuilder($this);
+    }
 }
\ No newline at end of file

lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php

@@ -24,7 +24,7 @@ namespace Doctrine\DBAL\Query\Expression;
  *
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.org
- * @since       2.0
+ * @since       2.1
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author      Benjamin Eberlei <kontakt@beberlei.de>
  */
@@ -111,10 +111,20 @@ class CompositeExpression implements \Countable
      */
     public function __toString()
     {
-        if ($this->count() === 1) {
+        if (count($this->parts) === 1) {
             return (string) $this->parts[0];
         }
         
         return '(' . implode(') ' . $this->type . ' (', $this->parts) . ')';
     }
+    
+    /**
+     * Return type of this composite expression (AND/OR)
+     * 
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
 }
\ No newline at end of file

lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php

@@ -26,8 +26,7 @@ use Doctrine\DBAL\Connection;
  *
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.com
- * @since       1.0
- * @version     $Revision$
+ * @since       2.1
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author      Benjamin Eberlei <kontakt@beberlei.de>
  */

tests/Doctrine/Tests/DBAL/Query/Expression/CompositeExpressionTest.php

@@ -6,6 +6,9 @@ use Doctrine\DBAL\Query\Expression\CompositeExpression;
 
 require_once __DIR__ . '/../../../TestInit.php';
 
+/**
+ * @group DBAL-12
+ */
 class CompositeExpressionTest extends \Doctrine\Tests\DbalTestCase
 {
     public function testCount()

tests/Doctrine/Tests/DBAL/Query/Expression/ExpressionBuilderTest.php

@@ -7,6 +7,9 @@ use Doctrine\DBAL\Query\Expression\ExpressionBuilder,
 
 require_once __DIR__ . '/../../../TestInit.php';
 
+/**
+ * @group DBAL-12
+ */
 class ExpressionBuilderTest extends \Doctrine\Tests\DbalTestCase
 {
     protected $expr;