RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-17 21:43:55 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixed custom functions support that was failing to be processed. Also fixed syntax error of Function support.

Browse Source
This commit is contained in:
guilhermeblanco 2010-03-16 14:01:54 +00:00
parent 90103bc604
commit 0fde94ddcf
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Doctrine/ORM/Mapping/AssociationMapping.php
View File

@ -302,10 +302,10 @@ abstract class AssociationMapping
public function hasCascades()
{
return $this->isCascadePersist ||
$this->isCascadeRemove ||
$this->isCascadeRefresh ||
$this->isCascadeMerge ||
$this->isCascadeDetach;
$this->isCascadeRemove ||
$this->isCascadeRefresh ||
$this->isCascadeMerge ||
$this->isCascadeDetach;
}
/**
@ -328,9 +328,9 @@ abstract class AssociationMapping
*/
public function getQuotedJoinTableName($platform)
{
return isset($this->joinTable['quoted']) ?
$platform->quoteIdentifier($this->joinTable['name']) :
$this->joinTable['name'];
return isset($this->joinTable['quoted'])
? $platform->quoteIdentifier($this->joinTable['name'])
: $this->joinTable['name'];
}
}

19
lib/Doctrine/ORM/Query/Parser.php
View File

@ -2558,7 +2558,8 @@ class Parser
*/
public function FunctionDeclaration()
{
$funcName = strtolower($this->_lexer->lookahead['value']);
$token = $this->_lexer->lookahead;
$funcName = strtolower($token['value']);
// Check for built-in functions first!
if (isset(self::$_STRING_FUNCTIONS[$funcName])) {
@ -2568,17 +2569,25 @@ class Parser
} else if (isset(self::$_DATETIME_FUNCTIONS[$funcName])) {
return $this->FunctionsReturningDatetime();
}
// Check for custom functions afterwards
$config = $this->_em->getConfiguration();
if ($config->getCustomStringFunction($funcName) !== null) {
if (($func = $config->getCustomStringFunction($funcName)) !== null) {
self::$_STRING_FUNCTIONS[$funcName] = $func;
return $this->FunctionsReturningStrings();
} else if ($config->getCustomNumericFunction($funcName) !== null) {
} else if (($func = $config->getCustomNumericFunction($funcName)) !== null) {
self::$_NUMERIC_FUNCTIONS[$funcName] = $func;
return $this->FunctionsReturningNumerics();
} else if ($config->getCustomDatetimeFunction($funcName) !== null) {
} else if (($func = $config->getCustomDatetimeFunction($funcName)) !== null) {
self::$_DATETIME_FUNCTIONS[$funcName] = $func;
return $this->FunctionsReturningDatetime();
}
$this->syntaxError('Known function.', $funcName);
$this->syntaxError('known function', $token);
}
/**