PB-48: The order of product SKU is not respected if combined with category condition

Author: eug123

app/code/Magento/Rule/Model/Condition/Sql/Builder.php

@@ -270,26 +270,22 @@ private function buildConditions(AbstractCollection $collection, Combine $combin
             $conditions = '';
             $attributeField = '';
             foreach ($combine->getConditions() as $condition) {
-                if ($condition->getData('attribute') === \Magento\Catalog\Api\Data\ProductInterface::SKU) {
+                if ($condition->getData('attribute') === \Magento\Catalog\Api\Data\ProductInterface::SKU
+                    && $condition->getData('operator') === '()'
+                ) {
                     $conditions = $condition->getData('value');
-                    $attributeField = $condition->getMappedSqlField();
+                    $attributeField = $this->_connection->quoteIdentifier($condition->getMappedSqlField());
                 }
             }
 
             if (!empty($conditions) && !empty($attributeField)) {
-                $conditions = explode(',', $conditions);
-                foreach ($conditions as &$condition) {
-                    $condition = trim($condition);
-                }
-                $conditions = implode(', ', $conditions);
+                $conditions = $this->_connection->quote(
+                    array_map('trim', explode(',', $conditions))
+                );
                 $collection->getSelect()->reset(Select::ORDER);
                 $collection->getSelect()->order(
-                    $this->_connection->quoteInto(
-                        "FIELD(?, ?)",
-                        [
-                            $attributeField,
-                            $conditions
-                        ]
+                    $this->_expressionFactory->create(
+                        ['expression' => "FIELD($attributeField, $conditions)"]
                     )
                 );
             }

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

@@ -60,13 +60,20 @@ public function testAttachConditionToCollection(): void
                     'operator' => '==',
                     'value' => '2017-09-15',
                 ],
+                '1--3' => [
+                    'type' => ProductCondition::class,
+                    'attribute' => 'sku',
+                    'operator' => '()',
+                    'value' => ' :(  ,  :) ',
+                ]
             ],
         ];
 
         $rule->loadPost($ruleConditionArray);
         $this->model->attachConditionToCollection($collection, $rule->getConditions());
 
-        $whereString = "/\(category_id IN \('3'\).+\(IFNULL\(`e`\.`entity_id`,.+\) = '2017-09-15'\)/";
-        $this->assertNotFalse(preg_match($whereString, $collection->getSelectSql(true)));
+        $whereString = "/\(category_id IN \('3'\).+\(IFNULL\(`e`\.`entity_id`,.+\) = '2017-09-15'\)"
+            . ".+ORDER BY \(FIELD\(`e`.`sku`, ':\(', ':\)'\)\)/";
+        $this->assertEquals(1, preg_match($whereString, $collection->getSelectSql(true)));
     }
 }