MAGETWO-65420: Update reports definitions for the Advanced Reporting service

Author: fascinosum

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

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

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

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

lib/internal/Magento/Framework/DB/Sql/ColumnValueExpression.php

@@ -8,9 +8,9 @@
 /**
  * Class Column Value Expression
  *
- * Just a wrapper over MagentoDbExpression for implementing the specific type of expression.
+ * Just a wrapper over Expression for implementing the specific type of expression.
  * @api
  */
-class ColumnValueExpression extends MagentoDbExpression
+class ColumnValueExpression extends Expression
 {
 }

lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php

@@ -11,7 +11,7 @@
 /**
  * Class Concat
  */
-class ConcatExpression extends MagentoDbExpression
+class ConcatExpression extends Expression
 {
     /**
      * @var AdapterInterface

lib/internal/Magento/Framework/DB/Sql/MagentoDbExpression.php renamed to lib/internal/Magento/Framework/DB/Sql/Expression.php

@@ -5,10 +5,12 @@
  */
 namespace Magento\Framework\DB\Sql;
 
+use Zend\Stdlib\JsonSerializable;
+
 /**
  * Class is wrapper over Zend_Db_Expr for implement JsonSerializable interface.
  */
-class MagentoDbExpression extends \Zend_Db_Expr implements MagentoDbExpressionInterface
+class Expression extends \Zend_Db_Expr implements ExpressionInterface, JsonSerializable
 {
     /**
      * @inheritdoc

lib/internal/Magento/Framework/DB/Sql/ExpressionInterface.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\DB\Sql;
+
+/**
+ * Interface ExpressionInterface
+ *
+ * Defines interface was implemented in Zend_Db_Expr.
+ * Interface for SQL Expressions for DB Adapter/Select.
+ * By using this interface a developer can strictly control type for code that manages an Expression directly.
+ */
+interface ExpressionInterface
+{
+    /**
+     * @return string The string of the SQL expression stored in this object.
+     */
+    public function __toString();
+}

lib/internal/Magento/Framework/DB/Sql/LimitExpression.php

@@ -8,7 +8,7 @@
 /**
  * Class LimitExpression
  */
-class LimitExpression extends MagentoDbExpression
+class LimitExpression extends Expression
 {
     /**
      * @var string

lib/internal/Magento/Framework/DB/Sql/LookupExpression.php

@@ -12,9 +12,8 @@
 /**
  * Class LookupExpression
  */
-class LookupExpression extends MagentoDbExpression
+class LookupExpression extends Expression
 {
-
     /**
      * @var Resource
      */

lib/internal/Magento/Framework/DB/Sql/MagentoDbExpressionInterface.php

@@ -7,7 +7,10 @@
 
 use Magento\Framework\DB\Select;
 
-class UnionExpression extends MagentoDbExpression
+/**
+ * Class UnionExpression
+ */
+class UnionExpression extends Expression
 {
     /**
      * @var Select[]