RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-05 04:13:20 +03:00
Code Issues Projects Releases Wiki Activity

removed parseAggregateFunction

Browse Source
This commit is contained in:
zYne 2007-12-10 19:19:29 +00:00
parent 7a78c39e81
commit efa434800c
1 changed files with 6 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lib/Doctrine/Query.php
View File

@ -709,7 +709,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
if ($pos !== false) { if ($pos !== false) {
$name = substr($term[0], 0, $pos); $name = substr($term[0], 0, $pos);
$term[0] = $this->parseFunctionExpression($term[0]); $term[0] = $this->parseFunctionExpression($term[0]);
} else { } else {
if (substr($term[0], 0, 1) !== "'" && substr($term[0], -1) !== "'") { if (substr($term[0], 0, 1) !== "'" && substr($term[0], -1) !== "'") {
@ -792,8 +791,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
$tableAlias = $this->getTableAlias($componentAlias); $tableAlias = $this->getTableAlias($componentAlias);
$tableAlias = $this->getTableAlias($componentAlias);
if ($this->getType() === Doctrine_Query::SELECT) { if ($this->getType() === Doctrine_Query::SELECT) {
// build sql expression // build sql expression
$term[0] = $this->_conn->quoteIdentifier($tableAlias) $term[0] = $this->_conn->quoteIdentifier($tableAlias)
@ -820,6 +817,12 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
} }
return $str; return $str;
} }
public function parseIdentifierReference($expr)
{
}
public function parseFunctionExpression($expr) public function parseFunctionExpression($expr)
{ {
$pos = strpos($expr, '('); $pos = strpos($expr, '(');
@ -863,65 +866,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
return '(' . $trimmed . ')'; return '(' . $trimmed . ')';
} }
/**
* parseAggregateFunction
* parses an aggregate function and returns the parsed form
*
* @see Doctrine_Expression
* @param string $expr DQL aggregate function
* @throws Doctrine_Query_Exception if unknown aggregate function given
* @return array parsed form of given function
*/
public function parseAggregateFunction($expr, $nestedCall = false)
{
$e = $this->_tokenizer->bracketExplode($expr, ' ');
$func = $e[0];
$pos = strpos($func, '(');
if ($pos === false) {
return $expr;
}
// get the name of the function
$name = substr($func, 0, $pos);
$argStr = substr($func, ($pos + 1), -1);
$args = array();
// parse args
foreach ($this->_tokenizer->bracketExplode($argStr, ',') as $expr) {
$args[] = $this->parseAggregateFunction($expr, true);
}
// convert DQL function to its RDBMS specific equivalent
try {
$expr = call_user_func_array(array($this->_conn->expression, $name), $args);
} catch (Doctrine_Expression_Exception $e) {
throw new Doctrine_Query_Exception('Unknown function ' . $func . '.');
}
if ( ! $nestedCall) {
// try to find all component references
preg_match_all("/[a-z0-9_]+\.[a-z0-9_]+[\.[a-z0-9]+]*/i", $argStr, $m);
if (isset($e[1])) {
if (strtoupper($e[1]) === 'AS') {
if ( ! isset($e[2])) {
throw new Doctrine_Query_Exception('Missing aggregate function alias.');
}
$alias = $e[2];
} else {
$alias = $e[1];
}
} else {
$alias = substr($expr, 0, strpos($expr, '('));
}
$this->_pendingAggregates[] = array($expr, $m[0], $alias);
}
return $expr;
}
/** /**
* processPendingSubqueries * processPendingSubqueries
* processes pending subqueries * processes pending subqueries