Merge remote-tracking branch 'origin/msi-core-changes-no-history' into msi-core-changes-no-history

RomaKis · RomaKis · commit 7fc59e721942 · 2018-03-19T13:30:18.000+02:00
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema.xml b/app/code/Magento/CatalogInventory/etc/db_schema.xml
@@ -84,10 +84,6 @@
             <column name="product_id"/>
             <column name="stock_id"/>
         </constraint>
-        <constraint xsi:type="unique" name="CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_WEBSITE_ID">
-            <column name="product_id"/>
-            <column name="website_id"/>
-        </constraint>
         <index name="CATALOGINVENTORY_STOCK_ITEM_WEBSITE_ID" indexType="btree">
             <column name="website_id"/>
         </index>
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json b/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json
@@ -50,7 +50,6 @@
       "CATINV_STOCK_ITEM_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
       "CATINV_STOCK_ITEM_STOCK_ID_CATINV_STOCK_STOCK_ID": true,
       "CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_STOCK_ID": true,
-      "CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_WEBSITE_ID": true,
       "CATINV_STOCK_ITEM_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@`
`50`	`50`	`"CATINV_STOCK_ITEM_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,`
`51`	`51`	`"CATINV_STOCK_ITEM_STOCK_ID_CATINV_STOCK_STOCK_ID": true,`
`52`	`52`	`"CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_STOCK_ID": true,`
`53`		`- "CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_WEBSITE_ID": true,`
`54`	`53`	`"CATINV_STOCK_ITEM_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true`
`55`	`54`	`}`
`56`	`55`	`},`