Skip to content

Commit 653be88

Browse files
committed
ACP2E-3709: [Cloud] Changing table column type from Int to Decimal using db_schema.xml file In Magento 2 Results In Errors
1 parent 7d69f6d commit 653be88

File tree

1 file changed

+3
-2
lines changed
  • lib/internal/Magento/Framework/Config

1 file changed

+3
-2
lines changed

lib/internal/Magento/Framework/Config/Dom.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,11 @@ protected function _mergeNode(\DOMElement $node, $parentPath)
171171
/* Update matched node attributes and value */
172172
if ($matchedNode) {
173173
//different node type
174-
if ($this->typeAttributeName &&
174+
if (($this->typeAttributeName &&
175175
$node->hasAttribute($this->typeAttributeName) &&
176176
$matchedNode->hasAttribute($this->typeAttributeName) &&
177-
$node->getAttribute($this->typeAttributeName) !== $matchedNode->getAttribute($this->typeAttributeName)
177+
$node->getAttribute($this->typeAttributeName) !== $matchedNode->getAttribute($this->typeAttributeName))
178+
|| ($node->tagName === 'column')
178179
) {
179180
$parentMatchedNode = $this->_getMatchedNode($parentPath);
180181
$newNode = $this->dom->importNode($node, true);

0 commit comments

Comments
 (0)