Skip to content

D
doctrine-dbal
Commit 4a3830fb authored by Alexander's avatar Alexander
Browse files
Options

Merge branch 'fix-mysql-unsigned' into 2.3

parents 86b10e7e c65c269e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
View file @ 4a3830fb
...@@ -100,7 +100,7 @@ class MySqlSchemaManager extends AbstractSchemaManager ...@@ -100,7 +100,7 @@ class MySqlSchemaManager extends AbstractSchemaManager
$decimal = strtok('(), ') ? strtok('(), '):null; $decimal = strtok('(), ') ? strtok('(), '):null;
} }
$type = array(); $type = array();
$unsigned = $fixed = null; $fixed = null;
if ( ! isset($tableColumn['name'])) { if ( ! isset($tableColumn['name'])) {
$tableColumn['name'] = ''; $tableColumn['name'] = '';
...@@ -147,7 +147,7 @@ class MySqlSchemaManager extends AbstractSchemaManager ...@@ -147,7 +147,7 @@ class MySqlSchemaManager extends AbstractSchemaManager
$options = array( $options = array(
'length' => $length, 'length' => $length,
'unsigned' => (bool) $unsigned, 'unsigned' => (bool) (strpos($tableColumn['type'], 'unsigned') !== false),
'fixed' => (bool) $fixed, 'fixed' => (bool) $fixed,
'default' => isset($tableColumn['default']) ? $tableColumn['default'] : null, 'default' => isset($tableColumn['default']) ? $tableColumn['default'] : null,
'notnull' => (bool) ($tableColumn['null'] != 'YES'), 'notnull' => (bool) ($tableColumn['null'] != 'YES'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment