ACP2E-3449: Slow query is executed when product widget is included via pagebuilder

Author: aplapana

dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php

@@ -179,10 +179,10 @@ public static function attachConditionToCollectionDataProvider(): array
                         'value' => 'sku1,sku2,sku3,sku4,sku5',
                     ]
                 ],
-                "WHERE ((((`e`.`entity_id` IN (SELECT `catalog_category_product`.`product_id` FROM " .
+                "(((`e`.`entity_id` IN (SELECT `catalog_category_product`.`product_id` FROM " .
                 "`catalog_category_product` WHERE (category_id IN ('3')))) " .
-                "AND(`e`.`entity_id` = '2017-09-15 00:00:00') AND(`e`.`sku` IN " .
-                "('sku1', 'sku2', 'sku3', 'sku4', 'sku5')) ))) AND (e.created_in <= 1) AND (e.updated_in > 1)",
+                "AND(`e`.`entity_id` = '2017-09-15 00:00:00') " .
+                "AND(`e`.`sku` IN ('sku1', 'sku2', 'sku3', 'sku4', 'sku5'))",
                 "ORDER BY (FIELD(`e`.`sku`, 'sku1', 'sku2', 'sku3', 'sku4', 'sku5'))"
             ],
             [
@@ -212,12 +212,11 @@ public static function attachConditionToCollectionDataProvider(): array
                         'collected_attributes' => ['multiselect_attribute' => true],
                     ]
                 ],
-                "WHERE ((((`e`.`entity_id` IN (SELECT `catalog_category_product`.`product_id` FROM " .
-                "`catalog_category_product` WHERE (category_id IN ('3')))) AND(`e`.`sku` IN " .
-                "('sku1', 'sku2', 'sku3')) AND(`at_multi_select_attr`.`value` IN ('#optionAtrId1#', '#optionAtrId2#') OR " .
-                "(FIND_IN_SET ('#optionAtrId1#', `at_multi_select_attr`.`value`) > 0) OR " .
-                "(FIND_IN_SET ('#optionAtrId2#', `at_multi_select_attr`.`value`) > 0)) ))) AND " .
-                "(e.created_in <= 1) AND (e.updated_in > 1)",
+                "(((`e`.`entity_id` IN (SELECT `catalog_category_product`.`product_id` FROM " .
+                "`catalog_category_product` WHERE (category_id IN ('3')))) " .
+                "AND(`e`.`sku` IN ('sku1', 'sku2', 'sku3')) AND(`at_multi_select_attr`.`value` IN ('4', '5') OR " .
+                "(FIND_IN_SET ('4', `at_multi_select_attr`.`value`) > 0) OR " .
+                "(FIND_IN_SET ('5', `at_multi_select_attr`.`value`) > 0))",
                 "ORDER BY (FIELD(`e`.`sku`, 'sku1', 'sku2', 'sku3'))"
             ]
         ];