Optimizing int related id handling

Author: stephandesouza

src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php

@@ -123,8 +123,10 @@ protected function getHasCompareKey(Relation $relation)
     protected function getConstrainedRelatedIds($relations, $operator, $count)
     {
         $intHash = 'INT_RELATION_';
-        $relationCount = array_count_values(array_map(function ($id) use ($intHash) {
+        $hasNumericIndex = false;
+        $relationCount = array_count_values(array_map(function ($id) use ($intHash, &$hasNumericIndex) {
             if (!is_string($id) && is_int($id)) {
+                $hasNumericIndex = true;
                 return $intHash . $id;
             }
             return (string) $id; // Convert Back ObjectIds to Strings
@@ -149,6 +151,11 @@ protected function getConstrainedRelatedIds($relations, $operator, $count)
         });
 
         // All related ids.
+        if(!$hasNumericIndex) {
+            return array_keys($relationCount);
+        }
+
+        // Has any numeric index?
         return array_map(static function ($id) use ($intHash) {
             if (strpos($id, $intHash, 0) === 0) {
                 return (int) str_replace($intHash, '', $id);

tests/RelationsTest.php

@@ -438,10 +438,13 @@ public function testHasManyHas(): void
 
     public function testHasNumeric(): void
     {
-        $author1 = User::create(['_id' => '1', 'name' => 'George R. R. Martin']);
-        $author1->books()->create(['_id' => '1', 'title' => 'A Game of Thrones', 'rating' => 5]);
+        $author1 = User::create(['name' => 'George R. R. Martin']);
+        $author1->books()->create(['title' => 'A Game of Thrones', 'rating' => 5]);
         $author1->books()->create(['_id' => '2', 'title' => 'A Clash of Kings', 'rating' => 5]);
 
+        $author2 = User::create(['name' => 'John Doe']);
+        $author2->books()->create(['title' => 'My book', 'rating' => 2]);
+
         $authors = User::has('books', '>', 1)->get();
         $this->assertCount(1, $authors);
     }