Merge branch 'release/1.0.4' into v1

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Similar Changelog
 
-All notable changes to this project will be documented in this file.
+## 1.0.4 - 2018-10-08
+### Changed
+* Only try to fetch elements if SQL query returns an `id`
+* Update GROUP BY clause in SELECT queries to ensure they are compatible with `sql_mode=only_full_group_by`
 
 ## 1.0.3 - 2018-08-04
 ### Changed

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.3",
+    "version": "1.0.4",
     "keywords": [
         "craft",
         "cms",

src/services/Similar.php

@@ -105,12 +105,14 @@ public function find($data)
         $elements = Craft::$app->getElements();
         $models = [];
         foreach ($results as $config) {
-            $model = $elements->getElementById($config['id'], $elementClass, $config['siteId']);
-            if ($model) {
-                // The `count` property is added dynamically by our CountBehavior behavior
-                /** @noinspection PhpUndefinedFieldInspection */
-                $model->count = $config['count'];
-                $models[] = $model;
+            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
+                    /** @noinspection PhpUndefinedFieldInspection */
+                    $model->count = $config['count'];
+                    $models[] = $model;
+                }
             }
         }
 
@@ -130,13 +132,13 @@ protected function eventAfterPrepareHandler(CancelableEvent $event)
         // Add in the `count` param so we know how many were fetched
         $query->query->addSelect(['COUNT(*) as count']);
         $query->query->orderBy('count DESC, '.str_replace('`', '', $this->preOrder));
-        $query->query->groupBy('{{%relations}}.sourceId');
+        $query->query->groupBy(['{{%relations}}.sourceId', 'elements.id']);
 
         $query->query->andWhere(['in', '{{%relations}}.targetId', $this->targetElements]);
         $query->subQuery->limit(null); // inner limit to null -> fetch all possible entries, sort them afterwards
         $query->query->limit($this->limit); // or whatever limit is set
 
-        $query->subQuery->groupBy('elements.id');
+        $query->subQuery->groupBy(['structureelements.lft', 'elements.id']);
         $event->isValid = true;
     }