Merge remote-tracking branch 'origin/MAGETWO-65420' into bugfixes

Author: olysenko

app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Analytics\ReportXml\DB;
 
+use Magento\Framework\DB\Sql\ColumnValueExpression;
+
 /**
  * Class ColumnsResolver
  *
@@ -51,7 +53,7 @@ public function getColumns(SelectBuilder $selectBuilder, $entityConfig)
                 if (isset($attributeData['distinct']) && $attributeData['distinct'] == true) {
                     $prefix = ' DISTINCT ';
                 }
-                $expression = new \Zend_Db_Expr(
+                $expression = new ColumnValueExpression(
                     strtoupper($attributeData['function']) . '(' . $prefix . $tableAlias . '.' . $columnName . ')'
                 );
             } else {

app/code/Magento/Analytics/ReportXml/DB/ConditionResolver.php

@@ -7,6 +7,7 @@
 namespace Magento\Analytics\ReportXml\DB;
 
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Sql\Expression;
 
 /**
  * Class ConditionResolver
@@ -87,7 +88,7 @@ private function getValue($condition, $referencedEntity)
                 $value = $this->getConnection()->quote($argument);
                 break;
             case "variable":
-                $value = new \Zend_Db_Expr($argument);
+                $value = new Expression($argument);
                 break;
             case "identifier":
                 $value = $this->getConnection()->quoteIdentifier(
@@ -110,7 +111,9 @@ private function getValue($condition, $referencedEntity)
     private function getCondition(SelectBuilder $selectBuilder, $tableName, $condition, $referencedEntity = null)
     {
         $columns = $selectBuilder->getColumns();
-        if (isset($columns[$condition['attribute']]) && $columns[$condition['attribute']] instanceof \Zend_Db_Expr) {
+        if (isset($columns[$condition['attribute']])
+            && $columns[$condition['attribute']] instanceof Expression
+        ) {
             $expression = $columns[$condition['attribute']];
         } else {
             $expression = $tableName . '.' . $condition['attribute'];

app/code/Magento/Analytics/ReportXml/SelectHydrator.php

@@ -8,6 +8,7 @@
 
 use Magento\Framework\DB\Select;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class SelectHydrator
@@ -45,15 +46,22 @@ class SelectHydrator
     private $resourceConnection;
 
     /**
-     * SelectHydrator constructor.
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
      * @param ResourceConnection $resourceConnection
+     * @param ObjectManagerInterface $objectManager
      * @param array $selectParts
      */
     public function __construct(
         ResourceConnection $resourceConnection,
+        ObjectManagerInterface $objectManager,
         $selectParts = []
     ) {
         $this->resourceConnection = $resourceConnection;
+        $this->objectManager = $objectManager;
         $this->selectParts = $selectParts;
     }
 
@@ -88,9 +96,48 @@ public function extract(Select $select)
     public function recreate(array $selectParts)
     {
         $select = $this->resourceConnection->getConnection()->select();
+
+        $select = $this->processColumns($select, $selectParts);
+
         foreach ($selectParts as $partName => $partValue) {
             $select->setPart($partName, $partValue);
         }
+
+        return $select;
+    }
+
+    /**
+     * Process COLUMNS part values and add this part into select.
+     *
+     * If each column contains information about select expression
+     * an object with the type of this expression going to be created and assigned to this column.
+     *
+     * @param Select $select
+     * @param array $selectParts
+     * @return Select
+     */
+    private function processColumns(Select $select, array &$selectParts)
+    {
+        if (!empty($selectParts[Select::COLUMNS]) && is_array($selectParts[Select::COLUMNS])) {
+            $part = [];
+
+            foreach ($selectParts[Select::COLUMNS] as $columnEntry) {
+                list($correlationName, $column, $alias) = $columnEntry;
+                if (is_array($column) && !empty($column['class'])) {
+                    $expression = $this->objectManager->create(
+                        $column['class'],
+                        isset($column['arguments']) ? $column['arguments'] : []
+                    );
+                    $part[] = [$correlationName, $expression, $alias];
+                } else {
+                    $part[] = $columnEntry;
+                }
+            }
+
+            $select->setPart(Select::COLUMNS, $part);
+            unset($selectParts[Select::COLUMNS]);
+        }
+
         return $select;
     }
 }

app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php

@@ -8,6 +8,7 @@
 use Magento\Analytics\ReportXml\DB\NameResolver;
 use Magento\Analytics\ReportXml\DB\ColumnsResolver;
 use Magento\Analytics\ReportXml\DB\SelectBuilder;
+use Magento\Framework\DB\Sql\ColumnValueExpression;
 
 /**
  * Class ColumnsResolverTest
@@ -51,12 +52,12 @@ public function testGetColumnsWithoutAttributes()
     }
 
     /**
-     * @dataProvider dataProvider
+     * @dataProvider getColumnsDataProvider
      */
     public function testGetColumns($expression, $attributeData)
     {
         $columnAlias = 'fn';
-        $expr = new \Zend_Db_Expr($expression);
+        $expr = new ColumnValueExpression($expression);
         $expectedResult = [$columnAlias => $expr];
         $columns = [$columnAlias => 'name'];
         $entityConfig['attribute'] = ['attribute1' => $attributeData];
@@ -91,7 +92,10 @@ public function testGetColumns($expression, $attributeData)
         );
     }
 
-    public function dataProvider()
+    /**
+     * @return array
+     */
+    public function getColumnsDataProvider()
     {
         return [
             'TestWithFunction' =>

app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ConditionResolverTest.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Analytics\ReportXml\DB\SelectBuilder;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Sql\Expression;
 
 /**
  * Class ConditionResolverTest
@@ -80,7 +81,7 @@ public function testGetFilter()
 
         $this->selectBuilderMock->expects($this->any())
             ->method('getColumns')
-            ->willReturn(['price' => new \Zend_Db_Expr("(n.price = 400)")]);
+            ->willReturn(['price' => new Expression("(n.price = 400)")]);
 
         $this->resourceConnectionMock->expects($this->once())
             ->method('getConnection')