Fix missing database prefix when get Table names (#17)

outeredge · Jun 8, 2023 · 29ec429 · 29ec429
1 parent 03d5ed3
commit 29ec429
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/Block/Adminhtml/Element/Grid.php b/Block/Adminhtml/Element/Grid.php
@@ -127,11 +127,11 @@ protected function getCustomCollection()
         $collection = $this->elementFactory->create()->getCollection();
         $collection->getSelect()
             ->joinLeft(
-                    ['leet' => 'layout_element_entity_text'],
+                    ['leet' => $collection->getTable('layout_element_entity_text')],
                     'e.entity_id = leet.entity_id AND show_in_grid = leet.attribute_id',
                     ['leet.attribute_id', 'leet.value AS value'])
             ->joinLeft(
-                ['eav' => 'eav_attribute'],
+                ['eav' => $collection->getTable('eav_attribute')],
                 'leet.attribute_id = eav.attribute_id',
                 ['eav.attribute_code']
             )
@@ -149,11 +149,11 @@ protected function getCustomCollection()
             $collection = $this->elementFactory->create()->getCollection();
             $collection->getSelect()
                 ->joinLeft(
-                    ['leev' => 'layout_element_entity_varchar'],
+                    ['leev' => $collection->getTable('layout_element_entity_varchar')],
                     'e.entity_id = leev.entity_id AND show_in_grid = leev.attribute_id',
                     ['leev.attribute_id', 'leev.value'])
                 ->joinLeft(
-                    ['eav' => 'eav_attribute'],
+                    ['eav' => $collection->getTable('eav_attribute')],
                     'leev.attribute_id = eav.attribute_id',
                     ['eav.attribute_code']
                 )

diff --git a/Block/Adminhtml/Group/Edit/Tab/Main.php b/Block/Adminhtml/Group/Edit/Tab/Main.php
@@ -222,7 +222,7 @@ protected function getAllFieldsOptions($id)
         ->addFieldToFilter('template_id', ['eq' => $id]);
         $allFieldsCollection->getSelect()
             ->join(
-                ['eav' => 'eav_attribute'],
+                ['eav' => $allFieldsCollection->getTable('eav_attribute')],
                 'main_table.eav_attribute_id = eav.attribute_id',
                 ['eav.attribute_code', 'eav.frontend_label', 'eav.frontend_input']
             );

diff --git a/Block/Adminhtml/Group/Grid.php b/Block/Adminhtml/Group/Grid.php
@@ -49,7 +49,11 @@ protected function _prepareCollection()
     {
         $collection = $this->groupFactory->create()->getCollection();
         $collection->getSelect()
-            ->join('layout_template as ly', 'main_table.template_id = ly.entity_id', 'ly.code as template_name');
+            ->join(
+                ['ly' => $collection->getTable('layout_template')], 
+                'main_table.template_id = ly.entity_id', 
+                'ly.code as template_name'
+            );
 
         $this->setCollection($collection);
         return parent::_prepareCollection();

diff --git a/Block/Adminhtml/TemplateFields/Grid.php b/Block/Adminhtml/TemplateFields/Grid.php
@@ -52,7 +52,7 @@ protected function _prepareCollection()
         $collection
             ->getSelect()
             ->join(
-                ['eav' => 'eav_attribute'],
+                ['eav' => $collection->getTable('eav_attribute')],
                 'main_table.eav_attribute_id = eav.attribute_id',
                 ['eav.attribute_code', 'eav.frontend_label', 'eav.frontend_input']
             );

diff --git a/Controller/Adminhtml/Group/Edit.php b/Controller/Adminhtml/Group/Edit.php
@@ -19,7 +19,7 @@ public function execute()
             $model = $this->groupFactory->create()->getCollection();
             $model->getSelect()
                 ->joinLeft(
-                    ['lgs' => 'layout_group_store'],
+                    ['lgs' => $model->getTable('layout_group_store')],
                     'main_table.entity_id = lgs.group_id',
                     ['GROUP_CONCAT(`lgs`.`store_id`) as store_ids']
                 )

diff --git a/Controller/Adminhtml/TemplateFields/Edit.php b/Controller/Adminhtml/TemplateFields/Edit.php
@@ -19,7 +19,7 @@ public function execute()
         $model = $this->templateFieldsFactory->create()->getCollection();
         $model->getSelect()
             ->join(
-                ['eav' => 'eav_attribute'],
+                ['eav' => $model->getTable('eav_attribute')],
                 'main_table.eav_attribute_id = eav.attribute_id',
                 ['eav.attribute_code', 'eav.frontend_label', 'eav.frontend_input']
             );

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -139,7 +139,7 @@ public function getGroup($id = false, $field = 'group_code')
 
             $group->getSelect()
                 ->joinLeft(
-                    ['lgs' => 'layout_group_store'],
+                    ['lgs' => $group->getTable('layout_group_store')],
                     'main_table.entity_id = lgs.group_id',
                     ['lgs.store_id']
                 )
@@ -247,7 +247,7 @@ public function getFieldsTemplate($idGroup)
         $templateFields
             ->getSelect()
             ->join(
-                ['eav' => 'eav_attribute'],
+                ['eav' => $templateFields->getTable('eav_attribute')],
                 'main_table.eav_attribute_id = eav.attribute_id',
                 ['eav.attribute_code', 'eav.frontend_label', 'eav.frontend_input']
             );
@@ -306,7 +306,7 @@ public function getAttributeOptions($templateId)
         $templateFields
             ->getSelect()
             ->join(
-                ['eav' => 'eav_attribute'],
+                ['eav' => $templateFields->getTable('eav_attribute')],
                 'main_table.eav_attribute_id = eav.attribute_id',
                 ['eav.attribute_code', 'eav.frontend_label', 'eav.frontend_input']
             );