MAGETWO-70279: Issue with the config merging introduced for the Analytics integration

Author: akaplya

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

@@ -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);
     }
 }

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

@@ -64,11 +64,9 @@ private function getIteratorName(Query $query)
      * Returns report data by name and criteria
      *
      * @param string $name
-     * @param SearchCriteria|null $criteria
      * @return \IteratorIterator
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getReport($name, SearchCriteria $criteria = null)
+    public function getReport($name)
     {
         $query = $this->queryFactory->create($name);
         $connection = $this->connectionFactory->getConnection($query->getConnectionName());