Merge remote-tracking branch 'origin/MC-24268' into 2.4-develop-pr1

Author: zakdma

app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php

@@ -79,6 +79,7 @@ protected function populateFlatTables(array $stores)
                     }
                     $category['store_id'] = $store->getId();
                     $data[] = $this->prepareValuesToInsert(
+                        // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                         array_merge($category, $attributesData[$category[$linkField]])
                     );
                 }
@@ -183,7 +184,7 @@ private function getActualStoreTablesForCategoryFlat(): array
         foreach ($this->storeManager->getStores() as $store) {
             $actualStoreTables[] = sprintf(
                 '%s_store_%s',
-                $this->connection->getTableName('catalog_category_flat'),
+                $this->connection->getTableName($this->getTableName('catalog_category_flat')),
                 $store->getId()
             );
         }
@@ -199,7 +200,7 @@ private function getActualStoreTablesForCategoryFlat(): array
     private function deleteAbandonedStoreCategoryFlatTables(): void
     {
         $existentTables = $this->connection->getTables(
-            $this->connection->getTableName('catalog_category_flat_store_%')
+            $this->connection->getTableName($this->getTableName('catalog_category_flat_store_%'))
         );
         $actualStoreTables = $this->getActualStoreTablesForCategoryFlat();
 

app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php

@@ -222,7 +222,7 @@ protected function _updateRelationProducts($storeId, $productIds = null)
                     ['t' => $this->_productIndexerHelper->getTable($relation->getTable())],
                     ['entity_table.entity_id', $relation->getChildFieldName(), new \Zend_Db_Expr('1')]
                 )->join(
-                    ['entity_table' => $this->_connection->getTableName('catalog_product_entity')],
+                    ['entity_table' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
                     "entity_table.{$metadata->getLinkField()} = t.{$relation->getParentFieldName()}",
                     []
                 )->join(

app/code/Magento/DownloadableGraphQl/Model/ResourceModel/GetPurchasedDownloadableProducts.php

@@ -39,13 +39,13 @@ public function execute(int $customerId): array
     {
         $connection = $this->resourceConnection->getConnection();
         $allowedItemsStatuses = [Item::LINK_STATUS_PENDING_PAYMENT, Item::LINK_STATUS_PAYMENT_REVIEW];
-        $downloadablePurchasedTable = $connection->getTableName('downloadable_link_purchased');
+        $downloadablePurchasedTable = $this->resourceConnection->getTableName('downloadable_link_purchased');
 
         /* The fields names are hardcoded since there's no existing name reference in the code */
         $selectQuery = $connection->select()
             ->from($downloadablePurchasedTable)
             ->joinLeft(
-                ['item' => $connection->getTableName('downloadable_link_purchased_item')],
+                ['item' => $this->resourceConnection->getTableName('downloadable_link_purchased_item')],
                 "$downloadablePurchasedTable.purchased_id = item.purchased_id"
             )
             ->where("$downloadablePurchasedTable.customer_id = ?", $customerId)

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php

@@ -351,7 +351,7 @@ private function getCountOfRewrites($productId, $categoryId): string
         $model = $this->objectManager->get(Product::class);
         $connection = $model->getConnection();
         $select = $connection->select();
-        $select->from(Product::TABLE_NAME, 'COUNT(*)');
+        $select->from($model->getTable(Product::TABLE_NAME), 'COUNT(*)');
         $select->where('category_id = ?', $categoryId);
         $select->where('product_id = ?', $productId);
         return $connection->fetchOne($select);

dev/tests/integration/testsuite/Magento/Webapi/_files/webapi_user.php

@@ -15,7 +15,7 @@
     ->create(Magento\Framework\App\ResourceConnection::class);
 $adapter = $connection->getConnection();
 $select = $adapter->select()
-    ->from('authorization_role', ['role_id'])
+    ->from($connection->getTableName('authorization_role'), ['role_id'])
     ->where('role_name = ?', 'Administrators')
     ->where('parent_id = ?', 0)
     ->limit(1);