RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-06 00:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix for new tests.

Browse Source
This commit is contained in:
romanb 2008-05-24 19:56:35 +00:00
parent 21e0bd3ded
commit 7407fefee2
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ClassMetadata/Factory.php
View File

@ -57,7 +57,7 @@ class Doctrine_ClassMetadata_Factory
* @return Doctrine_Metadata * @return Doctrine_Metadata
*/ */
public function getMetadataFor($className) public function getMetadataFor($className)
{ {
if (isset($this->_loadedMetadata[$className])) { if (isset($this->_loadedMetadata[$className])) {
return $this->_loadedMetadata[$className]; return $this->_loadedMetadata[$className];
} }

6
lib/Doctrine/Formatter.php
View File

@ -236,8 +236,10 @@ class Doctrine_Formatter extends Doctrine_Connection_Module
* @return string formatted table name * @return string formatted table name
*/ */
public function getTableName($table) public function getTableName($table)
{ {
return $table;
/*
return sprintf($this->conn->getAttribute(Doctrine::ATTR_TBLNAME_FORMAT), return sprintf($this->conn->getAttribute(Doctrine::ATTR_TBLNAME_FORMAT),
$table); $table);*/
} }
} }

8
lib/Doctrine/Query/Production/VariableDeclaration.php
View File

@ -125,12 +125,8 @@ class Doctrine_Query_Production_VariableDeclaration extends Doctrine_Query_Produ
$queryComponent = $parserResult->getQueryComponent($this->_componentAlias); $queryComponent = $parserResult->getQueryComponent($this->_componentAlias);
// Retrieving connection // Retrieving connection
$conn = $this->_parser->getSqlBuilder()->getConnection(); $manager = Doctrine_EntityManager::getManager();
$manager = Doctrine_Manager::getInstance(); $conn = $manager->getConnection();
if ($manager->hasConnectionForComponent($this->_componentName)) {
$conn = $manager->getConnectionForComponent($this->_componentName);
}
echo "Query Component Table Name: " . var_export($queryComponent['metadata']->getTableName(), true) . "\n"; echo "Query Component Table Name: " . var_export($queryComponent['metadata']->getTableName(), true) . "\n";