Skip to content

Commit d292c51

Browse files
authored
Force describeTable() to use read DB adapter (#2371)
1 parent aa909db commit d292c51

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ protected function _getStaticColumns()
665665
$helper = Mage::getResourceHelper('catalog');
666666
$columns = array();
667667
$columnsToSkip = array('entity_type_id', 'attribute_set_id');
668-
$describe = $this->_getWriteAdapter()->describeTable($this->getTable('catalog/category'));
668+
$describe = $this->_getReadAdapter()->describeTable($this->getTable('catalog/category'));
669669

670670
foreach ($describe as $column) {
671671
if (in_array($column['COLUMN_NAME'], $columnsToSkip)) {
@@ -1161,7 +1161,7 @@ protected function _prepareDataForAllFields($category, $replaceFields = array())
11611161
{
11621162
$table = $this->getMainStoreTable($category->getStoreId());
11631163
$this->_getWriteAdapter()->resetDdlCache($table);
1164-
$table = $this->_getWriteAdapter()->describeTable($table);
1164+
$table = $this->_getReadAdapter()->describeTable($table);
11651165
$data = array();
11661166
$idFieldName = Mage::getSingleton('catalog/category')->getIdFieldName();
11671167
foreach ($table as $column => $columnData) {

app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function getTypeId()
118118
*/
119119
public function getAttributeForSelect($attributeCode)
120120
{
121-
$describe = $this->_getWriteAdapter()->describeTable($this->getFlatTableName());
121+
$describe = $this->_getReadAdapter()->describeTable($this->getFlatTableName());
122122
if (!isset($describe[$attributeCode])) {
123123
return null;
124124
}
@@ -140,7 +140,7 @@ public function getAttributeForSelect($attributeCode)
140140
*/
141141
public function getAttributeSortColumn($attributeCode)
142142
{
143-
$describe = $this->_getWriteAdapter()->describeTable($this->getFlatTableName());
143+
$describe = $this->_getReadAdapter()->describeTable($this->getFlatTableName());
144144
if (!isset($describe[$attributeCode])) {
145145
return null;
146146
}
@@ -158,7 +158,7 @@ public function getAttributeSortColumn($attributeCode)
158158
*/
159159
public function getAllTableColumns()
160160
{
161-
$describe = $this->_getWriteAdapter()->describeTable($this->getFlatTableName());
161+
$describe = $this->_getReadAdapter()->describeTable($this->getFlatTableName());
162162
return array_keys($describe);
163163
}
164164

app/code/core/Mage/Core/Model/Resource/Abstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ protected function _unserializeField(Varien_Object $object, $field, $defaultValu
211211
protected function _prepareDataForTable(Varien_Object $object, $table)
212212
{
213213
$data = array();
214-
$fields = $this->_getWriteAdapter()->describeTable($table);
214+
$fields = $this->_getReadAdapter()->describeTable($table);
215215
foreach (array_keys($fields) as $field) {
216216
if ($object->hasData($field)) {
217217
$fieldValue = $object->getData($field);

app/code/core/Mage/Core/Model/Resource/Db/Abstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ public function hasDataChanged($object)
618618
return true;
619619
}
620620

621-
$fields = $this->_getWriteAdapter()->describeTable($this->getMainTable());
621+
$fields = $this->_getReadAdapter()->describeTable($this->getMainTable());
622622
foreach (array_keys($fields) as $field) {
623623
if ($object->getOrigData($field) != $object->getData($field)) {
624624
return true;

app/code/core/Mage/Eav/Model/Entity/Abstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ protected function _collectSaveData($newObject)
11671167
$origData = array();
11681168
}
11691169

1170-
$staticFields = $this->_getWriteAdapter()->describeTable($this->getEntityTable());
1170+
$staticFields = $this->_getReadAdapter()->describeTable($this->getEntityTable());
11711171
$staticFields = array_keys($staticFields);
11721172
$attributeCodes = array_keys($this->_attributesByCode);
11731173

app/code/core/Mage/Index/Model/Resource/Abstract.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ public function cloneIndexTable($asOriginal = false)
142142
public function insertFromTable($sourceTable, $destTable, $readToIndex = true)
143143
{
144144
if ($readToIndex) {
145-
$sourceColumns = array_keys($this->_getWriteAdapter()->describeTable($sourceTable));
146-
$targetColumns = array_keys($this->_getWriteAdapter()->describeTable($destTable));
145+
$sourceColumns = array_keys($this->_getReadAdapter()->describeTable($sourceTable));
146+
$targetColumns = array_keys($this->_getReadAdapter()->describeTable($destTable));
147147
} else {
148148
$sourceColumns = array_keys($this->_getIndexAdapter()->describeTable($sourceTable));
149-
$targetColumns = array_keys($this->_getWriteAdapter()->describeTable($destTable));
149+
$targetColumns = array_keys($this->_getReadAdapter()->describeTable($destTable));
150150
}
151151
$select = $this->_getIndexAdapter()->select()->from($sourceTable, $sourceColumns);
152152

0 commit comments

Comments
 (0)