From 059cfd86df63d78f760aed8ab36ceaec3e67380d Mon Sep 17 00:00:00 2001 From: Guilherme Lopes Date: Thu, 21 Sep 2017 10:02:43 +0200 Subject: [PATCH 1/3] Remove unnecessary else --- lib/Doctrine/ORM/Query/SqlWalker.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index dc9a56ca0..6ded65fa0 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -751,7 +751,8 @@ class SqlWalker implements TreeWalker foreach ($class->associationMappings as $assoc) { if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) { continue; - } else if ( !$addMetaColumns && !isset($assoc['id'])) { + } + if ( !$addMetaColumns && !isset($assoc['id'])) { continue; } From 8ecddc4fc17522fabd90af585015cda83739acc7 Mon Sep 17 00:00:00 2001 From: Guilherme Lopes Date: Thu, 21 Sep 2017 10:13:19 +0200 Subject: [PATCH 2/3] Adding empty line between logic blocks --- lib/Doctrine/ORM/Query/SqlWalker.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 6ded65fa0..ef072f91b 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -752,6 +752,7 @@ class SqlWalker implements TreeWalker if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) { continue; } + if ( !$addMetaColumns && !isset($assoc['id'])) { continue; } From df1250ee4b29456202de17d12d49b3304f35c9e7 Mon Sep 17 00:00:00 2001 From: Guilherme Lopes Date: Thu, 21 Sep 2017 13:42:51 +0200 Subject: [PATCH 3/3] Fix negation clause and also adding both conditions in the same if --- lib/Doctrine/ORM/Query/SqlWalker.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index ef072f91b..53a5c7474 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -749,11 +749,8 @@ class SqlWalker implements TreeWalker // Add foreign key columns of class and also parent classes foreach ($class->associationMappings as $assoc) { - if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) { - continue; - } - - if ( !$addMetaColumns && !isset($assoc['id'])) { + if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) + || ( ! $addMetaColumns && !isset($assoc['id']))) { continue; }