adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing issue where habtm tables would not have the connection prefix removed when generating schema. Fixes #1180

Browse source
This commit is contained in:
mark_story 2011-02-05 11:19:05 -05:00
parent cf50cbdd9d
commit 8d5e68d582
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cake/libs/model/cake_schema.php
View file

@ -274,11 +274,16 @@ class CakeSchema extends Object {
} }
if (is_object($Object->$class)) { if (is_object($Object->$class)) {
$withTable = $db->fullTableName($Object->$class, false); $withTable = $db->fullTableName($Object->$class, false);
if ($prefix && strpos($withTable, $prefix) !== 0) {
continue;
}
if (in_array($withTable, $currentTables)) { if (in_array($withTable, $currentTables)) {
$key = array_search($withTable, $currentTables); $key = array_search($withTable, $currentTables);
$tables[$withTable] = $this->__columns($Object->$class); $noPrefixWith = str_replace($prefix, '', $withTable);
$tables[$withTable]['indexes'] = $db->index($Object->$class);
$tables[$withTable]['tableParameters'] = $db->readTableParameters($withTable); $tables[$noPrefixWith] = $this->__columns($Object->$class);
$tables[$noPrefixWith]['indexes'] = $db->index($Object->$class);
$tables[$noPrefixWith]['tableParameters'] = $db->readTableParameters($withTable);
unset($currentTables[$key]); unset($currentTables[$key]);
} }
} }