Merge branch 'release/1.0.6' into v1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Similar Changelog
 
+## 1.0.6 - 2019-04-20
+### Changed
+* Add `structureelements.structureId` to `GROUP BY` clause
+
 ## 1.0.5 - 2019-01-05
 ### Changed
 * Fix SQL error: Unknown column `structureelements.lft` in 'group statement for Products

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-similar",
     "description": "Similar for Craft lets you find elements, Entries, Categories, Commerce Products, etc, that are similar, based on... other related elements.",
     "type": "craft-plugin",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "keywords": [
         "craft",
         "cms",

src/services/Similar.php

@@ -41,6 +41,7 @@ class Similar extends Component
     public $limit;
 
     public $targetElements;
+
     // Public Methods
     // =========================================================================
 
@@ -105,7 +106,7 @@ public function find($data)
         $elements = Craft::$app->getElements();
         $models = [];
         foreach ($results as $config) {
-            if($config['id'] && $config['siteId']) {
+            if ($config['id'] && $config['siteId']) {
                 $model = $elements->getElementById($config['id'], $elementClass, $config['siteId']);
                 if ($model) {
                     // The `count` property is added dynamically by our CountBehavior behavior
@@ -139,8 +140,8 @@ protected function eventAfterPrepareHandler(CancelableEvent $event)
         $query->query->limit($this->limit); // or whatever limit is set
 
         $query->subQuery->groupBy('elements.id');
-        if($query->elementType == 'craft\elements\Entry') {
-            $query->subQuery->addGroupBy('structureelements.lft');
+        if ($query->elementType === 'craft\elements\Entry') {
+            $query->subQuery->addGroupBy(['structureelements.structureId', 'structureelements.lft']);
         }
         $event->isValid = true;
     }