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

Quick fix for bug found with many-to-many relation fetching and limit

Browse Source
This commit is contained in:
zYne 2006-11-20 20:22:53 +00:00
parent 8ca0e1a52f
commit fb8498e0bd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Doctrine/Query.php
View File

@ -464,11 +464,12 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
return $q; return $q;
} }
/** /**
* returns the built sql query * builds the sql query from the given parameters and applies things such as
* column aggregation inheritance and limit subqueries if needed
* *
* @param array $params an array of prepared statement params (needed only in mysql driver * @param array $params an array of prepared statement params (needed only in mysql driver
* when limit subquery algorithm is used) * when limit subquery algorithm is used)
* @return string * @return string the built sql query
*/ */
public function getQuery($params = array()) { public function getQuery($params = array()) {
if(empty($this->parts["select"]) || empty($this->parts["from"])) if(empty($this->parts["select"]) || empty($this->parts["from"]))
@ -560,6 +561,8 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
* @return string the limit subquery * @return string the limit subquery
*/ */
public function getLimitSubquery() { public function getLimitSubquery() {
$k = array_keys($this->tables); $k = array_keys($this->tables);
$table = $this->tables[$k[0]]; $table = $this->tables[$k[0]];
@ -583,15 +586,15 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
$subquery .= ' FROM ' . $table->getTableName() . ' ' . $alias; $subquery .= ' FROM ' . $table->getTableName() . ' ' . $alias;
foreach($this->parts['join'] as $parts) { foreach($this->parts['join'] as $parts) {
foreach($parts as $part) { foreach($parts as $part) {
// preserve LEFT JOINs only if needed // preserve LEFT JOINs only if needed
if(substr($part,0,9) === 'LEFT JOIN') { if(substr($part,0,9) === 'LEFT JOIN') {
$e = explode(' ', $part); $e = explode(' ', $part);
if( ! in_array($e[3], $this->subqueryAliases)) if( ! in_array($e[3], $this->subqueryAliases) && ! in_array($e[2], $this->subqueryAliases))
continue; continue;
} }
$subquery .= ' '.$part; $subquery .= ' '.$part;
@ -1126,7 +1129,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
$assocTableName = $asf->getTableName(); $assocTableName = $asf->getTableName();
if( ! $loadFields || $table->usesInheritanceMap()) { if( ! $loadFields) {
$this->subqueryAliases[] = $assocTableName; $this->subqueryAliases[] = $assocTableName;
} }
$this->parts["join"][$tname][$assocTableName] = $join.$assocTableName . ' ON ' .$tname . '.' $this->parts["join"][$tname][$assocTableName] = $join.$assocTableName . ' ON ' .$tname . '.'