From dbf518eb6ccb1ed0881453714fbc6cf462b2a778 Mon Sep 17 00:00:00 2001
From: Kaushik Chavda <chavda@team23.de>
Date: Sat, 21 Sep 2019 12:16:24 +0200
Subject: [PATCH 1/3] #24581 Added unique key on eav_attribute_label table

---
 app/code/Magento/Eav/etc/db_schema.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
index b6c42d725e5e9..bce3c7be2aa3f 100644
--- a/app/code/Magento/Eav/etc/db_schema.xml
+++ b/app/code/Magento/Eav/etc/db_schema.xml
@@ -481,11 +481,11 @@
                     referenceColumn="attribute_id" onDelete="CASCADE"/>
         <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID" table="eav_attribute_label"
                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
-        <index referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_STORE_ID_UNIQUE">
             <column name="store_id"/>
-        </index>
-        <index referenceId="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_STORE_ID" indexType="btree">
             <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
             <column name="store_id"/>
         </index>
     </table>

From 4dbf01c8aaf6c13e24f9862ca801ec07ba3f08b5 Mon Sep 17 00:00:00 2001
From: Kaushik Chavda <chavda@team23.de>
Date: Sat, 21 Sep 2019 13:24:24 +0200
Subject: [PATCH 2/3] #24581 Added unique key on eav_attribute_label table  -
 Fixed pipeline issue.

---
 app/code/Magento/Eav/etc/db_schema.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
index bce3c7be2aa3f..ece2857aae61e 100644
--- a/app/code/Magento/Eav/etc/db_schema.xml
+++ b/app/code/Magento/Eav/etc/db_schema.xml
@@ -488,6 +488,10 @@
         <index referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
             <column name="store_id"/>
         </index>
+        <index referenceId="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_STORE_ID" indexType="btree">
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </index>
     </table>
     <table name="eav_form_type" resource="default" engine="innodb" comment="Eav Form Type">
         <column xsi:type="smallint" name="type_id" padding="5" unsigned="true" nullable="false" identity="true"

From f5638becdf77f28d2d8f21933d948a057ed5ced7 Mon Sep 17 00:00:00 2001
From: Kaushik Chavda <chavda@team23.de>
Date: Tue, 24 Sep 2019 17:02:18 +0200
Subject: [PATCH 3/3] #24581 Added unique key on eav_attribute_label table  -
 Fixed Integration tests

---
 app/code/Magento/Eav/etc/db_schema_whitelist.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/etc/db_schema_whitelist.json b/app/code/Magento/Eav/etc/db_schema_whitelist.json
index b3f1aca50df01..c571358a6c149 100644
--- a/app/code/Magento/Eav/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Eav/etc/db_schema_whitelist.json
@@ -304,7 +304,8 @@
         "constraint": {
             "PRIMARY": true,
             "EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
-            "EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID": true
+            "EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID": true,
+            "EAV_ATTRIBUTE_LABEL_STORE_ID_ATTRIBUTE_ID": true
         }
     },
     "eav_form_type": {