Merge remote-tracking branch 'south/MAGETWO-45602' into bugfixes

Author: Michael Logvin

app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php

@@ -63,13 +63,13 @@ protected function getCustomerIdsForReindex()
         $gridTableName = $this->flatScopeResolver->resolve(Customer::CUSTOMER_GRID_INDEXER_ID, []);
 
         $select = $connection->select()
-            ->from($connection->getTableName($gridTableName), 'last_visit_at')
+            ->from($this->resource->getTableName($gridTableName), 'last_visit_at')
             ->order('last_visit_at DESC')
             ->limit(1);
         $lastVisitAt = $connection->query($select)->fetchColumn();
 
         $select = $connection->select()
-            ->from($connection->getTableName('customer_log'), 'customer_id')
+            ->from($this->resource->getTableName('customer_log'), 'customer_id')
             ->where('last_login_at > ?', $lastVisitAt);
 
         $customerIds = [];

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Customer/GridTest.php

@@ -90,7 +90,7 @@ public function testSyncCustomerGrid()
             ->with(\Magento\Customer\Model\Customer::CUSTOMER_GRID_INDEXER_ID, [])
             ->willReturn($gridTable);
 
-        $this->connection->expects($this->exactly(2))
+        $this->resource->expects($this->exactly(2))
             ->method('getTableName')
             ->willReturnMap([
                 [$gridTable],