From 35d4b1411a131766124245506b986be216cc4173 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Wed, 27 Jan 2016 20:17:43 +0200
Subject: [PATCH] MAGETWO-47168: Stabilization
---
.../DataProvider/FulltextFilter.php | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
index f53fbf5d1f4..94ec24f1c52 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
@@ -33,6 +33,35 @@ class FulltextFilter implements FilterApplierInterface
return [];
}
+ /**
+ * Add table alias to columns
+ *
+ * @param array $columns
+ * @param DbCollection $collection
+ * @param string $indexTable
+ * @return array
+ */
+ protected function addTableAliasToColumns(array $columns, DbCollection $collection, $indexTable)
+ {
+ $alias = '';
+ foreach ($collection->getSelect()->getPart('from') as $tableAlias => $data) {
+ if ($indexTable == $data['tableName']) {
+ $alias = $tableAlias;
+ break;
+ }
+ }
+ if ($alias) {
+ $columns = array_map(
+ function ($column) use ($alias) {
+ return '`' . $alias . '`.' . $column;
+ },
+ $columns
+ );
+ }
+
+ return $columns;
+ }
+
/**
* Apply fulltext filters
*
@@ -46,6 +75,7 @@ class FulltextFilter implements FilterApplierInterface
if (!$columns) {
return;
}
+ $columns = $this->addTableAliasToColumns($columns, $collection, $collection->getMainTable());
$collection->getSelect()
->where(
'MATCH(' . implode(',', $columns) . ') AGAINST(?)',
--
GitLab