Merge remote-tracking branch 'origin/master'

lib/Doctrine/DBAL/Configuration.php

@@ -46,7 +46,7 @@ class Configuration
      *
      * @param SQLLogger $logger
      */
-    public function setSQLLogger(SQLLogger $logger)
+    public function setSQLLogger(SQLLogger $logger = null)
     {
         $this->_attributes['sqlLogger'] = $logger;
     }

lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

@@ -948,6 +948,7 @@ abstract class AbstractPlatform
             if(strtolower($columnData['type']) == "string" && $columnData['length'] === null) {
                 $columnData['length'] = 255;
             }
+            $columnData['unsigned'] = $column->getUnsigned();
             $columnData['precision'] = $column->getPrecision();
             $columnData['scale'] = $column->getScale();
             $columnData['default'] = $column->getDefault();

lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php

@@ -629,12 +629,12 @@ class MsSqlPlatform extends AbstractPlatform
         if (is_array($item)) {
             foreach ($item as $key => $value) {
                 if (is_bool($value) || is_numeric($item)) {
-                    $item[$key] = ($value) ? 'TRUE' : 'FALSE';
+                    $item[$key] = ($value) ? 1 : 0;
                 }
             }
         } else {
             if (is_bool($item) || is_numeric($item)) {
-                $item = ($item) ? 'TRUE' : 'FALSE';
+                $item = ($item) ? 1 : 0;
             }
         }
         return $item;

lib/Doctrine/DBAL/Platforms/MySqlPlatform.php

@@ -369,7 +369,13 @@ class MySqlPlatform extends AbstractPlatform
      *                              'comment' => 'Foo',
      *                              'charset' => 'utf8',
      *                              'collate' => 'utf8_unicode_ci',
-     *                              'type'    => 'innodb',
+     *                              'engine' => 'innodb',
+     *                              'foreignKeys' => array(
+     *                                  new ForeignKeyConstraint(),
+     *                                  new ForeignKeyConstraint(),
+     *                                  new ForeignKeyConstraint(),
+     *                                  // etc
+     *                              )
      *                          );
      *
      * @return void

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -686,7 +686,7 @@ class PostgreSqlPlatform extends AbstractPlatform
      */
     public function getTruncateTableSQL($tableName, $cascade = false)
     {
-        return 'TRUNCATE '.$tableName.' '.($cascade)?'CASCADE':'';
+        return 'TRUNCATE '.$tableName.' '.(($cascade)?'CASCADE':'');
     }
 
     public function getReadLockSQL()

lib/Doctrine/DBAL/Version.php

@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.1.0-DEV';
+    const VERSION = '2.1.0BETA2-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

doctrine-common @ 3103408a

-Subproject commit a46c6180f96647fdd66e2c8f2771d61ecebe6a3f
+Subproject commit 3103408ac394e8f9948431c0302a09faf352764e