-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[GH-1204] Add full support for foreign key constraints for SQLite #3762
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
lib/Doctrine/DBAL/Internal/DependencyOrderCalculator.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
<?php | ||
|
||
namespace Doctrine\DBAL\Internal; | ||
|
||
use function array_reverse; | ||
|
||
/** | ||
* DependencyOrderCalculator implements topological sorting, which is an ordering | ||
* algorithm for directed graphs (DG) and/or directed acyclic graphs (DAG) by | ||
* using a depth-first searching (DFS) to traverse the graph built in memory. | ||
* This algorithm have a linear running time based on nodes (V) and dependency | ||
* between the nodes (E), resulting in a computational complexity of O(V + E). | ||
*/ | ||
final class DependencyOrderCalculator | ||
{ | ||
public const NOT_VISITED = 0; | ||
public const IN_PROGRESS = 1; | ||
public const VISITED = 2; | ||
|
||
/** | ||
* Matrix of nodes (aka. vertex). | ||
* Keys are provided hashes and values are the node definition objects. | ||
* | ||
* @var array<string,DependencyOrderNode> | ||
*/ | ||
private $nodeList = []; | ||
|
||
/** | ||
* Volatile variable holding calculated nodes during sorting process. | ||
* | ||
* @var array<object> | ||
*/ | ||
private $sortedNodeList = []; | ||
|
||
/** | ||
* Checks for node (vertex) existence in graph. | ||
*/ | ||
public function hasNode(string $hash) : bool | ||
{ | ||
return isset($this->nodeList[$hash]); | ||
} | ||
|
||
/** | ||
* Adds a new node (vertex) to the graph, assigning its hash and value. | ||
* | ||
* @param object $node | ||
*/ | ||
public function addNode(string $hash, $node) : void | ||
{ | ||
$vertex = new DependencyOrderNode(); | ||
|
||
$vertex->hash = $hash; | ||
$vertex->state = self::NOT_VISITED; | ||
$vertex->value = $node; | ||
|
||
$this->nodeList[$hash] = $vertex; | ||
} | ||
|
||
/** | ||
* Adds a new dependency (edge) to the graph using their hashes. | ||
*/ | ||
public function addDependency(string $fromHash, string $toHash) : void | ||
{ | ||
$vertex = $this->nodeList[$fromHash]; | ||
$edge = new DependencyOrderEdge(); | ||
|
||
$edge->from = $fromHash; | ||
$edge->to = $toHash; | ||
|
||
$vertex->dependencyList[$toHash] = $edge; | ||
} | ||
|
||
/** | ||
* Return a valid order list of all current nodes. | ||
* The desired topological sorting is the reverse post order of these searches. | ||
* | ||
* {@internal Highly performance-sensitive method.} | ||
* | ||
* @return array<object> | ||
*/ | ||
public function sort() : array | ||
{ | ||
foreach ($this->nodeList as $vertex) { | ||
if ($vertex->state !== self::NOT_VISITED) { | ||
continue; | ||
} | ||
|
||
$this->visit($vertex); | ||
} | ||
|
||
$sortedList = $this->sortedNodeList; | ||
|
||
$this->nodeList = []; | ||
$this->sortedNodeList = []; | ||
|
||
return array_reverse($sortedList); | ||
} | ||
|
||
/** | ||
* Visit a given node definition for reordering. | ||
* | ||
* {@internal Highly performance-sensitive method.} | ||
*/ | ||
private function visit(DependencyOrderNode $vertex) : void | ||
{ | ||
$vertex->state = self::IN_PROGRESS; | ||
|
||
foreach ($vertex->dependencyList as $edge) { | ||
$adjacentVertex = $this->nodeList[$edge->to]; | ||
|
||
switch ($adjacentVertex->state) { | ||
case self::VISITED: | ||
case self::IN_PROGRESS: | ||
// Do nothing, since node was already visited or is | ||
// currently visited | ||
break; | ||
|
||
case self::NOT_VISITED: | ||
$this->visit($adjacentVertex); | ||
} | ||
} | ||
|
||
if ($vertex->state === self::VISITED) { | ||
return; | ||
} | ||
|
||
$vertex->state = self::VISITED; | ||
|
||
$this->sortedNodeList[] = $vertex->value; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?php | ||
|
||
namespace Doctrine\DBAL\Internal; | ||
|
||
class DependencyOrderEdge | ||
{ | ||
/** @var string */ | ||
public $from; | ||
|
||
/** @var string */ | ||
public $to; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
|
||
namespace Doctrine\DBAL\Internal; | ||
|
||
class DependencyOrderNode | ||
{ | ||
/** @var string */ | ||
public $hash; | ||
|
||
/** @var int */ | ||
public $state; | ||
|
||
/** @var object */ | ||
public $value; | ||
|
||
/** @var DependencyOrderEdge[] */ | ||
public $dependencyList = []; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ | |
use Doctrine\DBAL\Schema\Comparator; | ||
use Doctrine\DBAL\Schema\ForeignKeyConstraint; | ||
use Doctrine\DBAL\Schema\Index; | ||
use Doctrine\DBAL\Schema\Schema; | ||
use Doctrine\DBAL\Schema\SchemaDiff; | ||
use Doctrine\DBAL\Schema\Sequence; | ||
use Doctrine\DBAL\Schema\Table; | ||
|
@@ -39,6 +40,7 @@ | |
use function current; | ||
use function end; | ||
use function explode; | ||
use function implode; | ||
use function in_array; | ||
use function sprintf; | ||
use function str_replace; | ||
|
@@ -1604,4 +1606,49 @@ public function testCommentInTable() : void | |
$table = $this->schemaManager->listTableDetails('table_with_comment'); | ||
self::assertSame('Foo with control characters \'\\', $table->getComment()); | ||
} | ||
|
||
public function testSchemaDiffForeignKeys() : void | ||
{ | ||
$schemaManager = $this->connection->getSchemaManager(); | ||
$platform = $this->connection->getDatabasePlatform(); | ||
|
||
$table1 = new Table('child'); | ||
$table1->addColumn('id', 'integer', ['autoincrement' => true]); | ||
$table1->addColumn('parent_id', 'integer'); | ||
$table1->setPrimaryKey(['id']); | ||
$table1->addForeignKeyConstraint('parent', ['parent_id'], ['id']); | ||
|
||
$table2 = new Table('parent'); | ||
$table2->addColumn('id', 'integer', ['autoincrement' => true]); | ||
$table2->setPrimaryKey(['id']); | ||
|
||
$diff = new SchemaDiff([$table1, $table2]); | ||
$sqls = $diff->toSql($platform); | ||
|
||
foreach ($sqls as $sql) { | ||
$this->connection->exec($sql); | ||
} | ||
|
||
$schema = new Schema([ | ||
$schemaManager->listTableDetails('child'), | ||
$schemaManager->listTableDetails('parent'), | ||
]); | ||
|
||
$this->assertCount(1, $schema->getTable('child')->getForeignKeys()); | ||
|
||
$offlineSchema = new Schema([$table1, $table2]); | ||
|
||
$diff = Comparator::compareSchemas($offlineSchema, $schema); | ||
|
||
foreach ($diff->changedTables as $table) { | ||
if (count($table->changedForeignKeys) <= 0 && count($table->addedForeignKeys) <= 0 && count($table->removedForeignKeys) <= 0) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not that it needs to be taken care of immediately but aren't these just three assertions like |
||
continue; | ||
} | ||
|
||
$this->fail( | ||
'No changes on foreigh keys should be detected, but we have: ' . | ||
implode(', ', $diff->toSql($platform)) | ||
); | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@beberlei how is this a false positive?
dbal/lib/Doctrine/DBAL/Internal/DependencyOrderCalculator.php
Lines 106 to 123 in 85a983c
It looks like a bug in the code. How is
$vertex->state
expected to change its value fromIN_PROGRESS
to anything else between the first and last lines of the block above?Technically, it's possible if the node is adjacent to (depends on) itself but this doesn't look like a valid case.