Commit 54239c7f authored by zYne's avatar zYne

better listColumns handling

parent 94711451
...@@ -160,12 +160,19 @@ class Doctrine_Import_Pgsql extends Doctrine_Import ...@@ -160,12 +160,19 @@ class Doctrine_Import_Pgsql extends Doctrine_Import
$length = preg_replace('~.*\(([0-9]*)\).*~', '$1', $val['complete_type']); $length = preg_replace('~.*\(([0-9]*)\).*~', '$1', $val['complete_type']);
$val['type'] .= '(' . $length . ')'; $val['type'] .= '(' . $length . ')';
} }
$decl = $this->conn->dataDict->getPortableDeclaration($val);
$description = array( $description = array(
'name' => $val['field'], 'name' => $val['field'],
'type' => $val['type'], 'type' => $val['type'],
'notnull' => ($val['isnotnull'] == ''), 'ptype' => $decl['type'],
'default' => $val['default'], 'length' => $decl['length'],
'primary' => ($val['pri'] == 't'), 'fixed' => $decl['fixed'],
'unsigned' => $decl['unsigned'],
'notnull' => ($val['isnotnull'] == ''),
'default' => $val['default'],
'primary' => ($val['pri'] == 't'),
); );
$columns[$val['field']] = $description; $columns[$val['field']] = $description;
} }
......
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