-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Fix invalid sql generated for CTI JOINs when INNER JOIN'ing with a WITH
clause
#6475
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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,78 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\ORM\Functional\Ticket; | ||
|
||
use Doctrine\Tests\OrmFunctionalTestCase; | ||
|
||
/** | ||
* @group GH-6464 | ||
*/ | ||
class GH6464Test extends OrmFunctionalTestCase | ||
{ | ||
/** | ||
* {@inheritDoc} | ||
*/ | ||
protected function setUp() | ||
{ | ||
parent::setUp(); | ||
|
||
$this->_schemaTool->createSchema( | ||
[ | ||
$this->_em->getClassMetadata(GH6464Post::class), | ||
$this->_em->getClassMetadata(GH6464User::class), | ||
$this->_em->getClassMetadata(GH6464Author::class), | ||
] | ||
); | ||
} | ||
|
||
/** | ||
* Verifies that SqlWalker generates valid SQL for an INNER JOIN to CTI table | ||
* | ||
* SqlWalker needs to generate nested INNER JOIN statements, otherwise there would be INNER JOIN | ||
* statements without an ON clause, which are valid on e.g. MySQL but rejected by PostgreSQL. | ||
*/ | ||
public function testIssue() | ||
{ | ||
$query = $this->_em->createQueryBuilder() | ||
->select('p', 'a') | ||
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. This sort of |
||
->from(GH6464Post::class, 'p') | ||
->innerJoin(GH6464Author::class, 'a', 'WITH', 'p.authorId = a.id') | ||
->getQuery(); | ||
|
||
$this->assertNotRegExp( | ||
'/INNER JOIN \w+ \w+ INNER JOIN/', | ||
$query->getSQL(), | ||
'As of GH-6464, every INNER JOIN should have an ON clause, which is missing here' | ||
); | ||
|
||
// Query shouldn't yield a result, yet it shouldn't crash (anymore) | ||
$this->assertEquals([], $query->getResult()); | ||
} | ||
} | ||
|
||
/** @Entity */ | ||
class GH6464Post | ||
{ | ||
/** @Id @Column(type="integer") @GeneratedValue */ | ||
public $id; | ||
|
||
/** @Column(type="integer") */ | ||
public $authorId; | ||
} | ||
|
||
/** | ||
* @Entity | ||
* @InheritanceType("JOINED") | ||
* @DiscriminatorColumn(name="discr", type="string") | ||
* @DiscriminatorMap({"author" = "GH6464Author"}) | ||
*/ | ||
abstract class GH6464User | ||
{ | ||
/** @Id @Column(type="integer") @GeneratedValue */ | ||
public $id; | ||
} | ||
|
||
/** @Entity */ | ||
class GH6464Author extends GH6464User | ||
{ | ||
} |
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
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.
Can this block be moved to a private method too?
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.
I doubt that aids readability since the decision is made by the caller (actually even that one's caller) and not the extracted function itself ... and it just modifies local state (i.e.
$sql
).