Skip to content
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.

Sign up for GitHub

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

Revert "Use charset/collation from column or table default when creatng relations (#9636)" #9654

Merged
merged 1 commit into from
Apr 12, 2022
Merged

Revert "Use charset/collation from column or table default when creatng relations (#9636)" #9654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions lib/Doctrine/ORM/Tools/SchemaTool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,27 +728,6 @@ private function gatherRelationJoinColumns(
$columnOptions['precision'] = $fieldMapping['precision'];
}

// Only do this for DBAL v3 or higher.
if (! method_exists(AbstractPlatform::class, 'getGuidExpression')) {
$theJoinTableCharset = $theJoinTable->hasOption('charset') ? $theJoinTable->getOption('charset') : null;
if (
! isset($columnOptions['customSchemaOptions']['charset'])
&& isset($class->table['options']['charset'])
&& $theJoinTableCharset !== $class->table['options']['charset']
) {
$columnOptions['customSchemaOptions']['charset'] = $class->table['options']['charset'];
}

$theJoinTableCollation = $theJoinTable->hasOption('collation') ? $theJoinTable->getOption('collation') : null;
if (
! isset($columnOptions['customSchemaOptions']['collation'])
&& isset($class->table['options']['collation'])
&& $theJoinTableCollation !== $class->table['options']['collation']
) {
$columnOptions['customSchemaOptions']['collation'] = $class->table['options']['collation'];
}
}

$theJoinTable->addColumn($quotedColumnName, $fieldMapping['type'], $columnOptions);
}

Expand Down
105 changes: 0 additions & 105 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/GH6823Test.php
View file
Open in desktop

This file was deleted.