Exclude primary key columns when creating belongsto

Merge branch 'issue-394' into master.

Author: markstory

src/Shell/Task/ModelTask.php

@@ -323,7 +323,7 @@ public function findBelongsTo($model, array $associations)
     {
         $schema = $model->getSchema();
         foreach ($schema->columns() as $fieldName) {
-            if (!preg_match('/^.+_id$/', $fieldName)) {
+            if (!preg_match('/^.+_id$/', $fieldName) || ([$fieldName] === $schema->primaryKey())) {
                 continue;
             }
 

tests/TestCase/Shell/Task/ModelTaskTest.php

@@ -512,6 +512,25 @@ public function testBelongsToGenerationIdMidColumn()
         $this->assertEquals([], $result);
     }
 
+    /**
+     * Test that belongsTo generation ignores primary key fields
+     *
+     * @return void
+     */
+    public function testBelongsToGenerationPrimaryKey()
+    {
+        $model = TableRegistry::get('Articles');
+        $model->schema([
+            'usr_id' => ['type' => 'integer'],
+            'name' => ['type' => 'string'],
+            '_constraints' => [
+                'primary' => ['type' => 'primary', 'columns' => ['usr_id']]
+            ]
+        ]);
+        $result = $this->Task->findBelongsTo($model, []);
+        $this->assertEquals([], $result);
+    }
+
     /**
      * test that hasOne and/or hasMany relations are generated properly.
      *