RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 23:26:04 +03:00
Code Issues Projects Releases Wiki Activity

fixed ticket #571

Browse Source
This commit is contained in:
phuson 2007-11-08 21:02:56 +00:00
parent ee9e79d09e
commit 175d3307c2
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Doctrine/Query.php
View File

@ -969,8 +969,12 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
$q .= $part; $q .= $part;
continue; continue;
} }
// preserve LEFT JOINs only if needed
// preserve LEFT JOINs only if needed
// Check if it's JOIN, if not add a comma separator instead of space
if (!preg_match('/\bJOIN\b/i', $part) && !isset($this->_pendingJoinConditions[$k])) {
$q .= ', ' . $part;
} else {
if (substr($part, 0, 9) === 'LEFT JOIN') { if (substr($part, 0, 9) === 'LEFT JOIN') {
$e = explode(' ', $part); $e = explode(' ', $part);
@ -1000,6 +1004,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
} }
$q .= ' ' . $part; $q .= ' ' . $part;
}
$this->parts['from'][$k] = $part; $this->parts['from'][$k] = $part;
} }