Use latest stacktrace frame to find unique queries

Author: mpociot

src/QueryDetector.php

@@ -67,7 +67,9 @@ public function logQuery($query, Collection $backtrace)
                     $relatedModel = $relationName;
                 }
 
-                $key = md5($query->sql . $model . $relationName);
+                $sources = $this->findSource($backtrace);
+
+                $key = md5($query->sql . $model . $relationName . $sources[0]->name . $sources[0]->line);
 
                 $count = array_get($this->queries, $key.'.count', 0);
 
@@ -77,7 +79,7 @@ public function logQuery($query, Collection $backtrace)
                     'model' => $model,
                     'relatedModel' => $relatedModel,
                     'relation' => $relationName,
-                    'sources' => $this->findSource($backtrace)
+                    'sources' => $sources
                 ];
             }
         }
@@ -91,7 +93,7 @@ protected function findSource($stack)
             $sources[] = $this->parseTrace($index, $trace);
         }
 
-        return array_filter($sources);
+        return array_values(array_filter($sources));
     }
 
     public function parseTrace($index, array $trace)

tests/QueryDetectorTest.php

@@ -262,4 +262,30 @@ public function it_does_not_fire_an_event_if_there_is_no_n1_query()
 
         Event::assertNotDispatched(QueryDetected::class);
     }
+    /** @test */
+    public function it_uses_the_trace_line_to_detect_queries()
+    {
+        Route::get('/', function (){
+            $authors = Author::all();
+            $authors2 = Author::all();
+
+            foreach ($authors as $author) {
+                $author->profile->city;
+            }
+
+            foreach ($authors2 as $author) {
+                $author->profile->city;
+            }
+        });
+
+        $this->get('/');
+
+        $queries = app(QueryDetector::class)->getDetectedQueries();
+
+        $this->assertCount(2, $queries);
+
+        $this->assertSame(Author::count(), $queries[0]['count']);
+        $this->assertSame(Author::class, $queries[0]['model']);
+        $this->assertSame('profile', $queries[0]['relation']);
+    }
 }