Merge remote-tracking branch 'epam/MAGETWO-95654' into BugFixPR

joanhe · joanhe · commit d6014416bfbe · 2018-10-23T09:04:39.000-05:00
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
@@ -15,7 +15,8 @@
         },
         "constraint": {
             "PRIMARY": true,
-            "MAGENTO_BULK_UUID": true
+            "MAGENTO_BULK_UUID": true,
+            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true
         }
     },
     "magento_operation": {
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
@@ -35,26 +35,23 @@ public function __construct(DropElement $dropElement)
     }
 
     /**
-     * {@inheritdoc}
-     * We can drop references and this will not cause any issues.
-     *
-     * @return bool
+     * @inheritdoc
      */
     public function isOperationDestructive()
     {
-        return false;
+        return true;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getOperationName()
     {
         return self::OPERATION_NAME;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function doOperation(ElementHistory $elementHistory)
     {

Original file line number	Diff line number	Diff line change
`@@ -35,26 +35,23 @@ public function __construct(DropElement $dropElement)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
`38`		`- * {@inheritdoc}`
`39`		`- * We can drop references and this will not cause any issues.`
`40`		`- *`
`41`		`- * @return bool`
	`38`	`+ * @inheritdoc`
`42`	`39`	`*/`
`43`	`40`	`public function isOperationDestructive()`
`44`	`41`	`{`
`45`		`- return false;`
	`42`	`+ return true;`
`46`	`43`	`}`
`47`	`44`
`48`	`45`	`/**`
`49`		`- * {@inheritdoc}`
	`46`	`+ * @inheritdoc`
`50`	`47`	`*/`
`51`	`48`	`public function getOperationName()`
`52`	`49`	`{`
`53`	`50`	`return self::OPERATION_NAME;`
`54`	`51`	`}`
`55`	`52`
`56`	`53`	`/**`
`57`		`- * {@inheritdoc}`
	`54`	`+ * @inheritdoc`
`58`	`55`	`*/`
`59`	`56`	`public function doOperation(ElementHistory $elementHistory)`
`60`	`57`	`{`