fix applying column options on foreign key columns by Tobion · Pull Request #6830 · doctrine/orm

Tobion · 2017-11-19T00:13:05Z

Since the collation is not a standard option, see doctrine/dbal#2919, it must explicitly be set as platform option on a join column when the referenced column also has a collation set.

mrxotey · 2017-11-20T15:32:20Z

Hallo @Tobion,
I have the same issue with join column datatypes. I have my own solving PR: #6833. Could you review it?

lcobucci

Can you please rebase this branch to get the latest changes of master and add tests covering the issue?

lcobucci · 2017-11-27T22:41:53Z

As mentioned on #6833, @mrxotey's work can be helpful here

Tobion · 2017-12-26T01:43:19Z

@lcobucci I rebased and incorporated the changes of #6833

lib/Doctrine/ORM/Tools/SchemaTool.php

tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php

lib/Doctrine/ORM/Tools/SchemaTool.php

tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php

Tobion · 2018-01-01T23:29:05Z

@Majkl578 I did your proposed changes

Tobion · 2018-01-05T13:36:28Z

This now conflicts with master. @Majkl578 can you merge it into 2.x or rebase it?

Tobion · 2018-02-11T17:13:12Z

@Majkl578 @Ocramius ping

yoshz · 2018-03-01T12:09:22Z

Still anyone working on this PR?

BTW travis failed because getcomposer.org wasn't reachable temporary.

lcobucci · 2018-03-01T16:06:02Z

Still anyone working on this PR?

We do need to rebase to sync stuff

Tobion · 2018-03-30T16:40:15Z

Rebased and changed base branch. Please merge.

Ocramius

This looks good! @Tobion I suppose we'll need to forward-port it, right?

Tobion · 2018-03-30T17:06:29Z

Yes I don't think it has been fixed in master yet.

morozov · 2018-03-30T23:30:52Z

@Ocramius you really wanted to assign this to me?

Ocramius · 2018-03-31T00:22:21Z

@morozov yeah, up to you to decide to apply to stable or just 2.7. I can't do backporting at the moment (no computer)

morozov · 2018-03-31T01:29:34Z

@Ocramius I have no idea what the implications of back-porting this to 2.6 are. I don't use ORM. I can merge the ticket though.

Ocramius · 2018-03-31T02:45:23Z

@morozov I mistook it for a DBAL issue, sorry! 😱

Tobion · 2018-04-27T01:27:14Z

@Ocramius do you need anything here?

Tobion · 2018-05-17T10:52:04Z

@Ocramius ping

Tobion · 2018-10-28T22:50:34Z

@Ocramius can you merge this?

To ensure we don't have any unintended side-effect.

lcobucci

@Tobion I've rebased and applied some minor fixes, LGTM

Changes applied

@seferov

v2.6.3 [![Build Status](https://travis-ci.org/doctrine/doctrine2.svg?branch=v2.6.3)](https://travis-ci.org/doctrine/doctrine2) This release provides fixes for many things, specially: - Regression in commit order calculation - BC-break in `EntityManager#find()` using optimistic lock outside of transaction - PHP 7.3 compatibility issues -------------------------------------------- - Total issues resolved: **8** - Total pull requests resolved: **26** - Total contributors: **26** Documentation ------------- - [7472: fix incorrect phpdoc typehint](doctrine#7472) thanks to @seferov - [7465: Fixes tiny typo in the 'Working with DateTime instances' documentation](doctrine#7465) thanks to @unguul - [7444: Fixed URLs of doctrine-mapping.xsd in docs](doctrine#7444) thanks to @Naitsirch - [7441: $hydrationMode throughout can be a string as well as int (for custom modes)](doctrine#7441) thanks to @asgrim - [7435: Fix a typo on Documentation](doctrine#7435) thanks to @oguzdumanoglu - [7434: Removed FAQ paragraph stating public variables are disallowed](doctrine#7434) thanks to @Naitsirch and @flaushi - [7423: Update association-mapping.rst](doctrine#7423) thanks to @ThomasLandauer - [7421: JIRA to Github issues on Limitations and Known Issues](doctrine#7421) thanks to @seferov - [7412: Some formatting improvements](doctrine#7412) thanks to @ThomasLandauer - [7411: Autoload error when following the Getting Started Guide](doctrine#7411) thanks to @ThomasLandauer - [7401: &doctrine#91;docs&doctrine#93; Fix docblock in `inheritance-mapping.rst`](doctrine#7401) thanks to @bobdenotter - [7397: Update getting-started.rst](doctrine#7397) thanks to @eibt - [7394: Class 'Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver' not found](doctrine#7394) thanks to @ekosynth - [7378: Typo fix](doctrine#7378) thanks to @BenMorel - [7377: Fix query andX doctype](doctrine#7377) thanks to @sserbin - [7374: Deprecation message in documentation for YAML](doctrine#7374) thanks to @SenseException and @iltar - [7360: Document getPartialReference() properly](doctrine#7360) thanks to @lcobucci Bug --- - [7471: Fix parameter value processing for objects with unloaded metadata](doctrine#7471) thanks to @alcaeus - [7367: Fix for BC break in 2.6.2 when calling EM::find() with LockMode::OPTIMISTIC outside of a TX](doctrine#7367) thanks to @timdev - [7328: Handle removed parameters by tree walker in Paginator](doctrine#7328) thanks to @plfort - [7325: Make code php 7.3 lint-compatible](doctrine#7325) thanks to @paxal - [7317: &doctrine#91;XML&doctrine#93; Fix default value of many-to-many order-by to ASC](doctrine#7317) thanks to @alexdenvir - [7260: Fix the handling of circular references in the commit order calculator](doctrine#7260) thanks to @stof - [6830: fix applying column options on foreign key columns](doctrine#6830) thanks to @Tobion Improvement ----------- - [7428: CI: Test against PHP 7.3](doctrine#7428) thanks to @Majkl578 - [7363: Fix compatibility with phan](doctrine#7363) thanks to @philippe-unitiz - [7345: Correct DOMDocument constructor in test](doctrine#7345) thanks to @guilliamxavier - [7307: Fix remaining usages of deprecated ClassLoader and Inflector from doctrine/common](doctrine#7307) thanks to @Majkl578 and @simonwelsh

Tobion mentioned this pull request Nov 19, 2017

Column collation is missing on foreign keys doctrine/dbal#2811

Closed

mrxotey mentioned this pull request Nov 20, 2017

Fix applying target column options on foreign key columns #6833

Closed

lcobucci added Bug Missing Tests labels Nov 27, 2017

lcobucci assigned Tobion Nov 27, 2017

lcobucci suggested changes Nov 27, 2017

View reviewed changes

Tobion changed the title ~~fix applying collation on foreign key columns~~ fix applying column options on foreign key columns Dec 26, 2017

Majkl578 previously requested changes Dec 26, 2017

View reviewed changes

Majkl578 removed the Missing Tests label Dec 26, 2017

Tobion changed the base branch from master to 2.6 March 30, 2018 16:33

Ocramius previously approved these changes Mar 30, 2018

View reviewed changes

Ocramius assigned morozov and unassigned Tobion Mar 30, 2018

Ocramius assigned Ocramius and unassigned morozov Mar 31, 2018

lcobucci dismissed Ocramius’s stale review via 49342f1 November 20, 2018 22:57

Tobion and others added 2 commits November 21, 2018 00:20

Fix applying collation on foreign key columns

ee8dc49

Isolate entities used by the new test

0be52b0

To ensure we don't have any unintended side-effect.

lcobucci approved these changes Nov 20, 2018

View reviewed changes

lcobucci assigned lcobucci and unassigned Ocramius Nov 20, 2018

lcobucci added this to the 2.6.3 milestone Nov 20, 2018

lcobucci merged commit 41ff526 into doctrine:2.6 Nov 20, 2018

lcobucci added the Pick to master label Nov 21, 2018

Tobion deleted the fix-collation-foreign-key branch November 21, 2018 01:34

lcobucci removed the Pick to master label Aug 11, 2019

Conversation

Tobion commented Nov 19, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mrxotey commented Nov 20, 2017

Uh oh!

lcobucci left a comment

Choose a reason for hiding this comment

Uh oh!

lcobucci commented Nov 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Tobion commented Dec 26, 2017

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Tobion commented Jan 1, 2018

Uh oh!

Tobion commented Jan 5, 2018

Uh oh!

Tobion commented Feb 11, 2018

Uh oh!

yoshz commented Mar 1, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lcobucci commented Mar 1, 2018

Uh oh!

Tobion commented Mar 30, 2018

Uh oh!

Ocramius left a comment

Choose a reason for hiding this comment

Uh oh!

Tobion commented Mar 30, 2018

Uh oh!

morozov commented Mar 30, 2018

Uh oh!

Ocramius commented Mar 31, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

morozov commented Mar 31, 2018

Uh oh!

Ocramius commented Mar 31, 2018

Uh oh!

Tobion commented Apr 27, 2018

Uh oh!

Tobion commented May 17, 2018

Uh oh!

Tobion commented Oct 28, 2018

Uh oh!

lcobucci left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Tobion commented Nov 19, 2017 •

edited

Loading

lcobucci commented Nov 27, 2017 •

edited

Loading

yoshz commented Mar 1, 2018 •

edited

Loading

Ocramius commented Mar 31, 2018 •

edited

Loading