Commit 8703d6e9 authored by zYne's avatar zYne

--no commit message

--no commit message
parent c2591171
...@@ -122,12 +122,17 @@ class Doctrine_Import_Oracle extends Doctrine_Import ...@@ -122,12 +122,17 @@ class Doctrine_Import_Oracle extends Doctrine_Import
$result = $this->conn->fetchAssoc($sql); $result = $this->conn->fetchAssoc($sql);
foreach($result as $val) { foreach($result as $val) {
$decl = $this->conn->dataDict->getPortableDeclaration($val);
$descr[$val['column_name']] = array( $descr[$val['column_name']] = array(
'name' => $val['column_name'], 'name' => $val['column_name'],
'notnull' => (bool) ($val['nullable'] === 'N'), // nullable is N when mandatory 'notnull' => (bool) ($val['nullable'] === 'N'), // nullable is N when mandatory
'type' => $val['data_type'], 'type' => $val['data_type'],
'default' => $val['data_default'], 'ptype' => $decl['type'],
'length' => $val['data_length'] 'fixed' => $decl['fixed'],
'unsigned' => $decl['unsigned'],
'default' => $val['data_default'],
'length' => $val['data_length']
); );
} }
return $result; return $result;
......
...@@ -149,7 +149,7 @@ class Doctrine_Import_Sqlite extends Doctrine_Import ...@@ -149,7 +149,7 @@ class Doctrine_Import_Sqlite extends Doctrine_Import
*/ */
public function listTableIndexes($table) public function listTableIndexes($table)
{ {
$sql = 'PRAGMA index_list(' . $table . ')'; $sql = 'PRAGMA index_list(' . $table . ')';
return $this->conn->fetchColumn($sql); return $this->conn->fetchColumn($sql);
} }
/** /**
......
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