Commit e381fdde authored by RQuadling's avatar RQuadling

parent fcfff27a
...@@ -159,8 +159,11 @@ class Doctrine_DataDict_Mssql extends Doctrine_DataDict ...@@ -159,8 +159,11 @@ class Doctrine_DataDict_Mssql extends Doctrine_DataDict
break; break;
case 'text': case 'text':
case 'varchar': case 'varchar':
case 'ntext':
case 'nvarchar':
$fixed = false; $fixed = false;
case 'char': case 'char':
case 'nchar':
$type[0] = 'string'; $type[0] = 'string';
if ($length == '1') { if ($length == '1') {
$type[] = 'boolean'; $type[] = 'boolean';
......
...@@ -85,7 +85,7 @@ class Doctrine_Import_Mssql extends Doctrine_Import ...@@ -85,7 +85,7 @@ class Doctrine_Import_Mssql extends Doctrine_Import
'length' => $decl['length'], 'length' => $decl['length'],
'fixed' => $decl['fixed'], 'fixed' => $decl['fixed'],
'unsigned' => $decl['unsigned'], 'unsigned' => $decl['unsigned'],
'notnull' => (bool) ($val['is_nullable'] === 'NO'), 'notnull' => (bool) (trim($val['is_nullable']) === 'NO'),
'default' => $val['column_def'], 'default' => $val['column_def'],
'primary' => (strtolower($identity) == 'identity'), 'primary' => (strtolower($identity) == 'identity'),
); );
......
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