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

DDC-787 - Fix table name casing in DatabaseDriver

Browse Source
This commit is contained in:
Benjamin Eberlei 2010-10-30 12:35:22 +02:00
parent 338476805d
commit aa2a80f3ff
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
View File

@ -48,7 +48,7 @@ class DatabaseDriver implements Driver
*/ */
private $tables = null; private $tables = null;
private $classes = array(); private $classToTableNames = array();
/** /**
* @var array * @var array
@ -73,11 +73,11 @@ class DatabaseDriver implements Driver
} }
foreach ($this->_sm->listTableNames() as $tableName) { foreach ($this->_sm->listTableNames() as $tableName) {
$tables[strtolower($tableName)] = $this->_sm->listTableDetails($tableName); $tables[$tableName] = $this->_sm->listTableDetails($tableName);
} }
$this->tables = array(); $this->tables = array();
foreach ($tables AS $name => $table) { foreach ($tables AS $tableName => $table) {
/* @var $table Table */ /* @var $table Table */
if ($this->_sm->getDatabasePlatform()->supportsForeignKeyConstraints()) { if ($this->_sm->getDatabasePlatform()->supportsForeignKeyConstraints()) {
$foreignKeys = $table->getForeignKeys(); $foreignKeys = $table->getForeignKeys();
@ -96,14 +96,16 @@ class DatabaseDriver implements Driver
if ($pkColumns == $allForeignKeyColumns) { if ($pkColumns == $allForeignKeyColumns) {
if (count($table->getForeignKeys()) > 2) { if (count($table->getForeignKeys()) > 2) {
throw new \InvalidArgumentException("ManyToMany table '" . $name . "' with more or less than two foreign keys are not supported by the Database Reverese Engineering Driver."); throw new \InvalidArgumentException("ManyToMany table '" . $tableName . "' with more or less than two foreign keys are not supported by the Database Reverese Engineering Driver.");
} }
$this->manyToManyTables[$name] = $table; $this->manyToManyTables[$tableName] = $table;
} else { } else {
$className = Inflector::classify($name); // lower-casing is necessary because of Oracle Uppercase Tablenames,
$this->tables[$name] = $table; // assumption is lower-case + underscore separated.
$this->classes[$className] = $name; $className = Inflector::classify(strtolower($tableName));
$this->tables[$tableName] = $table;
$this->classToTableNames[$className] = $tableName;
} }
} }
} }
@ -115,11 +117,11 @@ class DatabaseDriver implements Driver
{ {
$this->reverseEngineerMappingFromDatabase(); $this->reverseEngineerMappingFromDatabase();
if (!isset($this->classes[$className])) { if (!isset($this->classToTableNames[$className])) {
throw new \InvalidArgumentException("Unknown class " . $className); throw new \InvalidArgumentException("Unknown class " . $className);
} }
$tableName = Inflector::tableize($className); $tableName = $this->classToTableNames[$className];
$metadata->name = $className; $metadata->name = $className;
$metadata->table['name'] = $tableName; $metadata->table['name'] = $tableName;
@ -183,7 +185,7 @@ class DatabaseDriver implements Driver
foreach ($this->manyToManyTables AS $manyTable) { foreach ($this->manyToManyTables AS $manyTable) {
foreach ($manyTable->getForeignKeys() AS $foreignKey) { foreach ($manyTable->getForeignKeys() AS $foreignKey) {
if ($tableName == strtolower($foreignKey->getForeignTableName())) { if (strtolower($tableName) == strtolower($foreignKey->getForeignTableName())) {
$myFk = $foreignKey; $myFk = $foreignKey;
foreach ($manyTable->getForeignKeys() AS $foreignKey) { foreach ($manyTable->getForeignKeys() AS $foreignKey) {
if ($foreignKey != $myFk) { if ($foreignKey != $myFk) {
@ -269,6 +271,6 @@ class DatabaseDriver implements Driver
{ {
$this->reverseEngineerMappingFromDatabase(); $this->reverseEngineerMappingFromDatabase();
return array_keys($this->classes); return array_keys($this->classToTableNames);
} }
} }