Unverified Commit 8d359773 authored by Jonathan H. Wage's avatar Jonathan H. Wage Committed by Sergei Morozov

Merge pull request #3520 from doctrine/drop-misspelling-in-foreign-key-constraints

Drop support for feferred misspelling in PostgreSqlPlatform::getAdvancedForeignKeyOptionsSQL()
parents d4d94013 e6a20726
# Upgrade to 3.0 # Upgrade to 3.0
## BC BREAK PostgreSqlPlatform ForeignKeyConstraint support for `feferred` misspelling removed
`PostgreSqlPlatform::getAdvancedForeignKeyOptionsSQL()` had a typo in it in 2.x. Both the option name
`feferred` and `deferred` were supported in `2.x` but the misspelling was removed in 3.x.
## BC BREAK `AbstractSchemaManager::extractDoctrineTypeFromComment()` changed, `::removeDoctrineTypeFromComment()` removed ## BC BREAK `AbstractSchemaManager::extractDoctrineTypeFromComment()` changed, `::removeDoctrineTypeFromComment()` removed
`AbstractSchemaManager::extractDoctrineTypeFromComment()` made `protected`. It takes the comment by reference, removes the type annotation from it and returns the extracted Doctrine type. `AbstractSchemaManager::extractDoctrineTypeFromComment()` made `protected`. It takes the comment by reference, removes the type annotation from it and returns the extracted Doctrine type.
......
...@@ -466,9 +466,7 @@ SQL ...@@ -466,9 +466,7 @@ SQL
$query .= ' NOT DEFERRABLE'; $query .= ' NOT DEFERRABLE';
} }
if (($foreignKey->hasOption('feferred') && $foreignKey->getOption('feferred') !== false) if ($foreignKey->hasOption('deferred') && $foreignKey->getOption('deferred') !== false) {
|| ($foreignKey->hasOption('deferred') && $foreignKey->getOption('deferred') !== false)
) {
$query .= ' INITIALLY DEFERRED'; $query .= ' INITIALLY DEFERRED';
} else { } else {
$query .= ' INITIALLY IMMEDIATE'; $query .= ' INITIALLY IMMEDIATE';
......
...@@ -117,7 +117,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa ...@@ -117,7 +117,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
'my_table', 'my_table',
['id'], ['id'],
'my_fk', 'my_fk',
['feferred' => true] ['deferred' => true]
); );
self::assertEquals( self::assertEquals(
'CONSTRAINT my_fk FOREIGN KEY (foreign_id) REFERENCES my_table (id) NOT DEFERRABLE INITIALLY DEFERRED', 'CONSTRAINT my_fk FOREIGN KEY (foreign_id) REFERENCES my_table (id) NOT DEFERRABLE INITIALLY DEFERRED',
......
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