Merge remote-tracking branch 'firedrakes/MAGETWO-70279' into PRS

Author: slavvka

app/code/Magento/Analytics/Model/Config/Data.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Analytics\ReportXml;
 
-use Magento\Analytics\ReportXml\Config\Data;
+use Magento\Framework\Config\DataInterface;
 
 /**
  * Class Config
@@ -15,17 +15,17 @@
 class Config implements ConfigInterface
 {
     /**
-     * @var Data
+     * @var DataInterface
      */
     private $data;
 
     /**
      * Config constructor.
      *
-     * @param Data $data
+     * @param DataInterface $data
      */
     public function __construct(
-        Data $data
+        DataInterface $data
     ) {
         $this->data = $data;
     }

app/code/Magento/Analytics/Model/Config/Reader/Xml.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Analytics\ReportXml\DB;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Sql\ColumnValueExpression;
 
 /**
@@ -20,14 +21,41 @@ class ColumnsResolver
      */
     private $nameResolver;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
     /**
      * ColumnsResolver constructor.
+     *
      * @param NameResolver $nameResolver
+     * @param ResourceConnection $resourceConnection
      */
     public function __construct(
-        NameResolver $nameResolver
+        NameResolver $nameResolver,
+        ResourceConnection $resourceConnection
     ) {
         $this->nameResolver = $nameResolver;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Returns connection
+     *
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private function getConnection()
+    {
+        if (!$this->connection) {
+            $this->connection = $this->resourceConnection->getConnection();
+        }
+        return $this->connection;
     }
 
     /**
@@ -54,7 +82,9 @@ public function getColumns(SelectBuilder $selectBuilder, $entityConfig)
                     $prefix = ' DISTINCT ';
                 }
                 $expression = new ColumnValueExpression(
-                    strtoupper($attributeData['function']) . '(' . $prefix . $tableAlias . '.' . $columnName . ')'
+                    strtoupper($attributeData['function']) . '(' . $prefix
+                    . $this->getConnection()->quoteIdentifier($tableAlias . '.' . $columnName)
+                    . ')'
                 );
             } else {
                 $expression = $tableAlias . '.' . $columnName;

app/code/Magento/Analytics/Model/Config/SchemaLocator.php

@@ -116,7 +116,7 @@ private function getCondition(SelectBuilder $selectBuilder, $tableName, $conditi
         ) {
             $expression = $columns[$condition['attribute']];
         } else {
-            $expression = $tableName . '.' . $condition['attribute'];
+            $expression = $this->getConnection()->quoteIdentifier($tableName . '.' . $condition['attribute']);
         }
         return sprintf(
             $this->conditionMap[$condition['operator']],
@@ -161,6 +161,6 @@ public function getFilter(SelectBuilder $selectBuilder, $filterConfig, $aliasNam
             }
             $filtersParts[] = '(' . implode(' ' . strtoupper($glue) . ' ', $parts) . ')';
         }
-        return implode(' AND ', $filtersParts);
+        return implode(' OR ', $filtersParts);
     }
 }