Merge 9d27eb8 into 88aa7d0

cakephp · Feb 5, 2016 · b870d6b · b870d6b
2 parents 88aa7d0 + 9d27eb8
commit b870d6b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Shell/Task/MigrationSnapshotTask.php b/src/Shell/Task/MigrationSnapshotTask.php
@@ -246,7 +246,15 @@ public function fetchTableName($className, $pluginName = null)
                 $tables[] = $table->associations()->get($key)->_junctionTableName();
             }
         }
-        $tables[] = $table->table();
+        $t = $table->table();
+        $splitted = array_reverse(explode('.', $t));
+        if (isset($splitted[1])) {
+            $config = ConnectionManager::config($this->connection);
+            if ($config['database'] === $splitted[1]) {
+                $t = $splitted[0];
+            }
+        }
+        $tables[] = $t;
 
         return $tables;
     }