Merge branch 'DBAL-461' into 2.3

lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php

@@ -59,10 +59,10 @@ abstract class AbstractSchemaManager
      *
      * @param \Doctrine\DBAL\Connection $conn
      */
-    public function __construct(\Doctrine\DBAL\Connection $conn)
+    public function __construct(\Doctrine\DBAL\Connection $conn, AbstractPlatform $platform = null)
     {
-        $this->_conn = $conn;
-        $this->_platform = $this->_conn->getDatabasePlatform();
+        $this->_conn     = $conn;
+        $this->_platform = $platform ?: $this->_conn->getDatabasePlatform();
     }
 
     /**

lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php

@@ -40,6 +40,7 @@ class SQLServerSchemaManager extends AbstractSchemaManager
     protected function _getPortableTableColumnDefinition($tableColumn)
     {
         $dbType = strtolower($tableColumn['TYPE_NAME']);
+        $dbType = strtok($dbType, '(), ');
 
         $autoincrement = false;
         if (stripos($dbType, 'identity')) {