Merge pull request #8 from fredden/db-prefix

Respect db_prefix

Author: peterjaap

Console/Command/CleanUpAttributesAndValuesWithoutParentCommand.php

@@ -73,8 +73,8 @@ public function execute(InputInterface $input, OutputInterface $output)
                 ->getFirstItem();
             $output->writeln("<info>Cleaning values for $code</info>");
             foreach ($types as $type) {
-                $eavTable         = $db->getTableName('eav_attribute');
-                $entityValueTable = $db->getTableName($code . '_entity_' . $type);
+                $eavTable         = $this->resourceConnection->getTableName('eav_attribute');
+                $entityValueTable = $this->resourceConnection->getTableName($code . '_entity_' . $type);
                 $query            = "SELECT * FROM $entityValueTable WHERE `attribute_id` NOT IN(SELECT attribute_id"
                     . " FROM `$eavTable` WHERE entity_type_id = " . $entityType->getEntityTypeId() . ")";
                 $results          = $db->fetchAll($query);

Console/Command/RemoveUnusedAttributesCommand.php

@@ -68,10 +68,10 @@ public function execute(InputInterface $input, OutputInterface $output)
         $attributes              = $this->attributeRepository
             ->getList(ProductAttributeInterface::ENTITY_TYPE_CODE, $searchCriteria)
             ->getItems();
-        $eavAttributeTable       = $db->getTableName('eav_attribute');
-        $eavEntityAttributeTable = $db->getTableName('eav_entity_attribute');
+        $eavAttributeTable       = $this->resourceConnection->getTableName('eav_attribute');
+        $eavEntityAttributeTable = $this->resourceConnection->getTableName('eav_entity_attribute');
         foreach ($attributes as $attribute) {
-            $table = $db->getTableName('catalog_product_entity_' . $attribute->getBackendType());
+            $table = $this->resourceConnection->getTableName('catalog_product_entity_' . $attribute->getBackendType());
             /* Look for attributes that have no values set in products */
             $attributeValues = (int)$db->fetchOne('SELECT COUNT(*) FROM ' . $table . ' WHERE attribute_id = ?',
                 [$attribute->getAttributeId()]);

Console/Command/RemoveUnusedMediaCommand.php

@@ -60,7 +60,7 @@ public function execute(InputInterface $input, OutputInterface $output): void
 
         $imageDir          = $this->getImageDir();
         $connection        = $this->resourceConnection->getConnection('core_read');
-        $mediaGalleryTable = $connection->getTableName('catalog_product_entity_media_gallery');
+        $mediaGalleryTable = $this->resourceConnection->getTableName('catalog_product_entity_media_gallery');
 
         $directoryIterator = new RecursiveDirectoryIterator($imageDir);
 

Console/Command/RestoreUseDefaultConfigValueCommand.php

@@ -46,18 +46,20 @@ public function execute(InputInterface $input, OutputInterface $output)
         $removedConfigValues = 0;
 
         $db         = $this->resourceConnection->getConnection();
-        $configData = $db->fetchAll('SELECT DISTINCT path, value FROM ' . $db->getTableName('core_config_data')
+        $tableName = $this->resourceConnection->getTableName('core_config_data');
+        $configData = $db->fetchAll('SELECT DISTINCT path, value FROM ' . $tableName
             . ' WHERE scope_id = 0');
         foreach ($configData as $config) {
-            $count = $db->fetchOne('SELECT COUNT(*) FROM ' . $db->getTableName('core_config_data')
+            $count = $db->fetchOne('SELECT COUNT(*) FROM ' . $tableName
                 . ' WHERE path = ? AND BINARY value = ?', [$config['path'], $config['value']]);
             if ($count > 1) {
                 $output->writeln('Config path ' . $config['path'] . ' with value ' . $config['value'] . ' has ' . $count
                     . ' values; deleting non-default values');
                 if (!$isDryRun) {
-                    $db->query('DELETE FROM ' . $db->getTableName('core_config_data')
-                        . ' WHERE path = ? AND BINARY value = ? AND scope_id != ?',
-                        [$config['path'], $config['value'], 0]);
+                    $db->query(
+                        'DELETE FROM ' . $tableName . ' WHERE path = ? AND BINARY value = ? AND scope_id != ?',
+                        [$config['path'], $config['value'], 0]
+                    );
                 }
                 $removedConfigValues += ($count - 1);
             }

Console/Command/RestoreUseDefaultValueCommand.php

@@ -75,7 +75,7 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         foreach ($tables as $table) {
             // Select all non-global values
-            $fullTableName = $db->getTableName('catalog_' . $entity . '_entity_' . $table);
+            $fullTableName = $this->resourceConnection->getTableName('catalog_' . $entity . '_entity_' . $table);
             $rows          = $db->fetchAll('SELECT * FROM ' . $fullTableName . ' WHERE store_id != 0');
 
             foreach ($rows as $row) {