RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] - DDC-169 - Fix for breaking the building of Single-Table Inheritence in SchemaTool

Browse source
This commit is contained in:
beberlei 2009-11-28 08:59:29 +00:00
parent 44cc6465be
commit ba01175700
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/Doctrine/ORM/Tools/SchemaTool.php
View file

@ -246,12 +246,12 @@ class SchemaTool
} }
} }
try { /*try {
$newSql = $schema->toSql($this->_platform); $newSql = $schema->toSql($this->_platform);
#return $newSql; #return $newSql;
} catch(\Exception $e) { } catch(\Exception $e) {
} }*/
// Append the sequence SQL // Append the sequence SQL
$sql = array_merge($sql, $sequences); $sql = array_merge($sql, $sequences);
@ -301,6 +301,7 @@ class SchemaTool
* @param ClassMetadata $class * @param ClassMetadata $class
* @param array $options The table options/constraints where any additional options/constraints * @param array $options The table options/constraints where any additional options/constraints
* that are required by columns should be appended. * that are required by columns should be appended.
* @param Table $table
* @return array The list of portable column definitions as required by the DBAL. * @return array The list of portable column definitions as required by the DBAL.
*/ */
private function _gatherColumns($class, array &$options, $table) private function _gatherColumns($class, array &$options, $table)
@ -316,7 +317,12 @@ class SchemaTool
$pkColumns[] = $column['name']; $pkColumns[] = $column['name'];
} }
} }
$table->setPrimaryKey($pkColumns); // For now, this is a hack required for single table inheritence, since this method is called
// twice by single table inheritence relations
if(!$table->hasIndex('primary')) {
$table->setPrimaryKey($pkColumns);
}
return $columns; return $columns;
} }
@ -328,6 +334,7 @@ class SchemaTool
* @param array $mapping The field mapping. * @param array $mapping The field mapping.
* @param array $options The table options/constraints where any additional options/constraints * @param array $options The table options/constraints where any additional options/constraints
* required by the column should be appended. * required by the column should be appended.
* @param Table $table
* @return array The portable column definition as required by the DBAL. * @return array The portable column definition as required by the DBAL.
*/ */
private function _gatherColumn($class, array $mapping, array &$options, $table) private function _gatherColumn($class, array $mapping, array &$options, $table)
@ -358,7 +365,11 @@ class SchemaTool
$column['platformOptions']['unique'] = $column['unique']; $column['platformOptions']['unique'] = $column['unique'];
$column['platformOptions']['version'] = $column['version']; $column['platformOptions']['version'] = $column['version'];
$table->createColumn($column['name'], $mapping['type'], $column); if ($table->hasColumn($column['name'])) {
$table->changeColumn($column['name'], $column);
} else {
$table->createColumn($column['name'], $mapping['type'], $column);
}
if ($class->isIdentifier($mapping['fieldName'])) { if ($class->isIdentifier($mapping['fieldName'])) {
$column['primary'] = true; $column['primary'] = true;