Merge branch 'master-tabledot-fk' into master

Refs #6616

src/Core/ConventionsTrait.php

@@ -49,11 +49,14 @@ protected function _entityName($name)
     /**
      * Creates the proper underscored model key for associations
      *
+     * If the input contains a dot, assume that the right side is the real table name.
+     *
      * @param string $name Model class name
      * @return string Singular model key
      */
     protected function _modelKey($name)
     {
+        list(, $name) = pluginSplit($name);
         return Inflector::underscore(Inflector::singularize($name)) . '_id';
     }
 

tests/TestCase/ORM/Association/BelongsToTest.php

@@ -91,6 +91,22 @@ public function tearDown()
         TableRegistry::clear();
     }
 
+    /**
+     * Test that foreignKey generation ignores database names in target table.
+     *
+     * @return void
+     */
+    public function testForeignKey()
+    {
+        $this->company->table('schema.companies');
+        $this->client->table('schema.clients');
+        $assoc = new BelongsTo('Companies', [
+            'sourceTable' => $this->client,
+            'targetTable' => $this->company,
+        ]);
+        $this->assertEquals('company_id', $assoc->foreignKey());
+    }
+
     /**
      * Tests that the association reports it can be joined
      *

tests/TestCase/ORM/Association/HasManyTest.php

@@ -83,6 +83,20 @@ public function tearDown()
         TableRegistry::clear();
     }
 
+    /**
+     * Test that foreignKey generation ignores database names in target table.
+     *
+     * @return void
+     */
+    public function testForeignKey()
+    {
+        $this->author->table('schema.authors');
+        $assoc = new HasMany('Articles', [
+            'sourceTable' => $this->author
+        ]);
+        $this->assertEquals('author_id', $assoc->foreignKey());
+    }
+
     /**
      * Tests that the association reports it can be joined
      *

tests/TestCase/ORM/TableTest.php

@@ -136,6 +136,9 @@ public function testTableMethod()
 
         $table->table('other');
         $this->assertEquals('other', $table->table());
+
+        $table->table('database.other');
+        $this->assertEquals('database.other', $table->table());
     }
 
     /**