[DBAL-482] autoincrement + identity columns on SQLServer

597da8c3 · Benjamin Eberlei · 1053e625 · 597da8c3 · 15b04ec5
Commit 597da8c3 authored May 01, 2013 by Benjamin Eberlei
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

SQLServerSchemaManager.php lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php +2 -1

doctrine-common lib/vendor/doctrine-common +1 -1

No files found.
--- a/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php
+++ b/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php
@@ -40,7 +40,6 @@ class SQLServerSchemaManager extends AbstractSchemaManager
    protected function _getPortableTableColumnDefinition($tableColumn)
    {
        $dbType = strtolower($tableColumn['TYPE_NAME']);
-        $dbType = strtok($dbType, '(), ');

        $autoincrement = false;
        if (stripos($dbType, 'identity')) {
@@ -48,6 +47,8 @@ class SQLServerSchemaManager extends AbstractSchemaManager
            $autoincrement = true;
        }

+        $dbType = strtok($dbType, '(), ');
+
        $type = array();
        $unsigned = $fixed = null;


--- a/doctrine-common @ 15b04ec5
+++ b/doctrine-common @ 15b04ec5
-Subproject commit d1c7d4334e38cad603a5c863d4c7b91bb04ec6b2
+Subproject commit 15b04ec520ccded3dc0eba65b12a69ff1931360f