Merge branch 'DBAL-157' into 2.1.x

lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php

@@ -61,7 +61,7 @@ class MySqlSchemaManager extends AbstractSchemaManager
             }
             $tableIndexes[$k] = $v;
         }
-        
+
         return parent::_getPortableTableIndexesList($tableIndexes, $tableName);
     }
 
@@ -74,12 +74,12 @@ class MySqlSchemaManager extends AbstractSchemaManager
     {
         return $database['Database'];
     }
-    
+
     /**
      * Gets a portable column definition.
-     * 
+     *
      * The database type is mapped to a corresponding Doctrine mapping type.
-     * 
+     *
      * @param $tableColumn
      * @return array
      */
@@ -102,10 +102,10 @@ class MySqlSchemaManager extends AbstractSchemaManager
         if ( ! isset($tableColumn['name'])) {
             $tableColumn['name'] = '';
         }
-        
+
         $scale = null;
         $precision = null;
-        
+
         $type = $this->_platform->getDoctrineTypeMapping($dbType);
         $type = $this->extractDoctrineTypeFromComment($tableColumn['comment'], $type);
         $tableColumn['comment'] = $this->removeDoctrineTypeFromComment($tableColumn['comment'], $type);
@@ -154,7 +154,7 @@ class MySqlSchemaManager extends AbstractSchemaManager
             'length'        => $length,
             'unsigned'      => (bool)$unsigned,
             'fixed'         => (bool)$fixed,
-            'default'       => $tableColumn['default'],
+            'default'       => isset($tableColumn['default']) ? $tableColumn['default'] : null,
             'notnull'       => (bool) ($tableColumn['null'] != 'YES'),
             'scale'         => null,
             'precision'     => null,
@@ -180,7 +180,7 @@ class MySqlSchemaManager extends AbstractSchemaManager
         if (!isset($tableForeignKey['update_rule']) || $tableForeignKey['update_rule'] == "RESTRICT") {
             $tableForeignKey['update_rule'] = null;
         }
-        
+
         return new ForeignKeyConstraint(
             (array)$tableForeignKey['column_name'],
             $tableForeignKey['referenced_table_name'],