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

Browse Source
This commit is contained in:
zYne 2007-05-12 23:03:39 +00:00
parent 0f4c09d869
commit 899024b5f3
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
draft/new-core/Query.php
View File

@ -52,8 +52,6 @@ class Doctrine_Query2 extends Doctrine_Hydrate2 implements Countable {
*/ */
private $isSubquery; private $isSubquery;
private $relationStack = array();
private $isDistinct = false; private $isDistinct = false;
private $neededTables = array(); private $neededTables = array();
@ -129,19 +127,30 @@ class Doctrine_Query2 extends Doctrine_Hydrate2 implements Countable {
return $this->isDistinct; return $this->isDistinct;
} }
/**
* processPendingFields
* the fields in SELECT clause cannot be parsed until the components
* in FROM clause are parsed, hence this method is called everytime a
* specific component is being parsed.
*
* @throws Doctrine_Query_Exception if unknown component alias has been given
* @param string $componentAlias the alias of the component
* @return void
*/
public function processPendingFields($componentAlias) public function processPendingFields($componentAlias)
{ {
$tableAlias = $this->getTableAlias($componentAlias); $tableAlias = $this->getTableAlias($componentAlias);
if ( ! isset($this->tables[$tableAlias])) if ( ! isset($this->tables[$tableAlias])) {
throw new Doctrine_Query_Exception('Unknown component path ' . $componentAlias); throw new Doctrine_Query_Exception('Unknown component alias ' . $componentAlias);
}
$table = $this->tables[$tableAlias]; $table = $this->tables[$tableAlias];
if (isset($this->pendingFields[$componentAlias])) { if (isset($this->pendingFields[$componentAlias])) {
$fields = $this->pendingFields[$componentAlias]; $fields = $this->pendingFields[$componentAlias];
// check for wildcards
if (in_array('*', $fields)) { if (in_array('*', $fields)) {
$fields = $table->getColumnNames(); $fields = $table->getColumnNames();
} else { } else {