RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 15:16:04 +03:00
Code Issues Projects Releases Wiki Activity

DDC-723 - Update ORM to depend on latest DBAL Beta3 release, fixed Schema-Tool errors - Use git submodule update to get the latest code

Browse Source
This commit is contained in:
Benjamin Eberlei 2010-07-28 20:20:47 +02:00
parent d2740f0e77
commit 86e24d373b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Doctrine/ORM/Tools/SchemaTool.php
View File

@ -117,11 +117,12 @@ class SchemaTool
$table = $schema->createTable($class->getQuotedTableName($this->_platform)); $table = $schema->createTable($class->getQuotedTableName($this->_platform));
if ($class->isIdGeneratorIdentity()) { // TODO: Remove
/**if ($class->isIdGeneratorIdentity()) {
$table->setIdGeneratorType(\Doctrine\DBAL\Schema\Table::ID_IDENTITY); $table->setIdGeneratorType(\Doctrine\DBAL\Schema\Table::ID_IDENTITY);
} else if ($class->isIdGeneratorSequence()) { } else if ($class->isIdGeneratorSequence()) {
$table->setIdGeneratorType(\Doctrine\DBAL\Schema\Table::ID_SEQUENCE); $table->setIdGeneratorType(\Doctrine\DBAL\Schema\Table::ID_SEQUENCE);
} }*/
$columns = array(); // table columns $columns = array(); // table columns
@ -171,9 +172,10 @@ class SchemaTool
$columnName = $class->getQuotedColumnName($class->identifier[0], $this->_platform); $columnName = $class->getQuotedColumnName($class->identifier[0], $this->_platform);
$pkColumns[] = $columnName; $pkColumns[] = $columnName;
if ($table->isIdGeneratorIdentity()) { // TODO: REMOVE
/*if ($table->isIdGeneratorIdentity()) {
$table->setIdGeneratorType(\Doctrine\DBAL\Schema\Table::ID_NONE); $table->setIdGeneratorType(\Doctrine\DBAL\Schema\Table::ID_NONE);
} }*/
// Add a FK constraint on the ID column // Add a FK constraint on the ID column
$table->addUnnamedForeignKeyConstraint( $table->addUnnamedForeignKeyConstraint(
@ -322,6 +324,10 @@ class SchemaTool
$options['columnDefinition'] = $mapping['columnDefinition']; $options['columnDefinition'] = $mapping['columnDefinition'];
} }
if ($class->isIdGeneratorIdentity() && $class->getIdentifierFieldNames() == array($mapping['fieldName'])) {
$options['autoincrement'] = true;
}
if ($table->hasColumn($columnName)) { if ($table->hasColumn($columnName)) {
// required in some inheritance scenarios // required in some inheritance scenarios
$table->changeColumn($columnName, $options); $table->changeColumn($columnName, $options);

2
lib/vendor/doctrine-dbal vendored

@ -1 +1 @@
Subproject commit 1142739e17f495adc7563c1bb18eab7f3465a231 Subproject commit ce1e5f0f9c4f2e8894e1d2036ab11cc0597dd0a4