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

Browse Source
This commit is contained in:
zYne 2007-04-16 17:59:45 +00:00
parent ff1886754d
commit 647542d5ee
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Doctrine/Expression.php
View File

@ -661,4 +661,15 @@ class Doctrine_Expression extends Doctrine_Connection_Module
{ {
throw new Doctrine_Expression_Exception('method not implemented'); throw new Doctrine_Expression_Exception('method not implemented');
} }
/**
* __call
*
* for all native RDBMS functions the function name itself is returned
*/
public function __call($m, $a)
{
if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_EXPR) {
throw new Doctrine_Expression_Exception('Unknown expression ' . $m);
}
}
} }

8
lib/Doctrine/Query.php
View File

@ -235,9 +235,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
$pos = strpos($func, '('); $pos = strpos($func, '(');
$name = substr($func, 0, $pos); $name = substr($func, 0, $pos);
try {
if(method_exists($this->conn->expression, $name)) {
$argStr = substr($func, ($pos + 1), -1); $argStr = substr($func, ($pos + 1), -1);
$args = explode(',', $argStr); $args = explode(',', $argStr);
@ -279,8 +277,8 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
} }
$this->pendingAggregates[$owner][] = array($name, $args, $distinct, $alias); $this->pendingAggregates[$owner][] = array($name, $args, $distinct, $alias);
} else { } catch(Doctrine_Expression_Exception $e) {
throw new Doctrine_Query_Exception('Unknown function '.$name); throw new Doctrine_Query_Exception('Unknown function ' . $func . '.');
} }
} }
public function processPendingSubqueries() public function processPendingSubqueries()