Fixing issue where habtm tables would not have the connection prefix …

…removed when generating schema. Fixes #1180
cakephp · Feb 5, 2011 · 8d5e68d · 8d5e68d
1 parent cf50cbd
commit 8d5e68d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php
@@ -274,11 +274,16 @@ function read($options = array()) {
 								}
 								if (is_object($Object->$class)) {
 									$withTable = $db->fullTableName($Object->$class, false);
+									if ($prefix && strpos($withTable, $prefix) !== 0) {
+										continue;
+									}
 									if (in_array($withTable, $currentTables)) {
 										$key = array_search($withTable, $currentTables);
-										$tables[$withTable] = $this->__columns($Object->$class);
-										$tables[$withTable]['indexes'] = $db->index($Object->$class);
-										$tables[$withTable]['tableParameters'] = $db->readTableParameters($withTable);
+										$noPrefixWith = str_replace($prefix, '', $withTable);
+
+										$tables[$noPrefixWith] = $this->__columns($Object->$class);
+										$tables[$noPrefixWith]['indexes'] = $db->index($Object->$class);
+										$tables[$noPrefixWith]['tableParameters'] = $db->readTableParameters($withTable);
 										unset($currentTables[$key]);
 									}
 								}