Fixes #2880: filterByModels() should prefix key columns in a join query.

framework/db/ActiveRelationTrait.php

@@ -356,12 +356,39 @@ trait ActiveRelationTrait
         return $buckets;
     }
 
+    private function prefixKeyColumns($attributes)
+    {
+        if ($this instanceof ActiveQuery && (!empty($this->join) || !empty($this->joinWith))) {
+            if (empty($this->from)) {
+                /** @var ActiveRecord $modelClass */
+                $modelClass = $this->modelClass;
+                $alias = $modelClass::tableName();
+            } else {
+                foreach ($this->from as $alias => $table) {
+                    if (!is_string($alias)) {
+                        $alias = $table;
+                    }
+                    break;
+                }
+            }
+            if (isset($alias)) {
+                foreach ($attributes as $i => $attribute) {
+                	$attributes[$i] = "$alias.$attribute";
+                }
+            }
+        }
+        return $attributes;
+    }
+
     /**
      * @param array $models
      */
     private function filterByModels($models)
     {
         $attributes = array_keys($this->link);
+
+        $attributes = $this->prefixKeyColumns($attributes);
+
         $values = [];
         if (count($attributes) === 1) {
             // single key

tests/unit/framework/db/ActiveRecordTest.php

@@ -402,6 +402,11 @@ class ActiveRecordTest extends DatabaseTestCase
         $this->assertEquals(3, $count);
         $orders = $query->all();
         $this->assertEquals(3, count($orders));
+
+        // https://github.com/yiisoft/yii2/issues/2880
+        $query = Order::find(1);
+        $customer = $query->getCustomer()->joinWith('orders')->one();
+        $this->assertEquals(1, $customer->id);
     }
 
     public function testJoinWithAndScope()