Skip to content

Commit 10f401e

Browse files
committed
Merge remote-tracking branch 'origin/MC-22828' into 2.3-develop-pr89
2 parents 2e35eb3 + a83ed1b commit 10f401e

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

app/code/Magento/Eav/etc/db_schema.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,6 @@
458458
<constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID"
459459
table="eav_attribute_option_value" column="store_id" referenceTable="store"
460460
referenceColumn="store_id" onDelete="CASCADE"/>
461-
<constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_OPTION_ID">
462-
<column name="store_id"/>
463-
<column name="option_id"/>
464-
</constraint>
465461
<index referenceId="EAV_ATTRIBUTE_OPTION_VALUE_OPTION_ID" indexType="btree">
466462
<column name="option_id"/>
467463
</index>

app/code/Magento/Eav/etc/db_schema_whitelist.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,7 @@
287287
"constraint": {
288288
"PRIMARY": true,
289289
"EAV_ATTR_OPT_VAL_OPT_ID_EAV_ATTR_OPT_OPT_ID": true,
290-
"EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID": true,
291-
"EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_OPTION_ID": true
290+
"EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID": true
292291
}
293292
},
294293
"eav_attribute_label": {
@@ -389,4 +388,4 @@
389388
"EAV_FORM_ELEMENT_TYPE_ID_ATTRIBUTE_ID": true
390389
}
391390
}
392-
}
391+
}

0 commit comments

Comments
 (0)