Refactor BelongsToArrayColumn: simplify JSON contains constraints and enhance eager loading logic

Author: MrPunyapal

.github/workflows/run-tests.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [8.4, 8.3, 8.2, 8.1]
-        laravel: [10.*, 11.*, 12.*]
+        laravel: [^10.38.0, 11.*, 12.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
@@ -33,7 +33,7 @@ jobs:
             php: 8.1
           - Laravel: 12.*
             php: 8.1
-          
+
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

src/Relations/BelongsToArrayColumn.php

@@ -29,11 +29,11 @@ public function addConstraints(): void
         }
         $query = $this->getBaseQuery();
 
-        $parentKey = $this->getParentKey();
-        if ($parentKey !== null) {
-            $searchValue = $this->isString ? (string) $parentKey : $parentKey;
-            $this->addJsonContainsConstraint($query, $this->ownerKey, $searchValue);
-        }
+        $query->when($this->isString, function ($q) {
+            $q->whereJsonContains($this->ownerKey, (string) $this->getParentKey());
+        }, function ($q) {
+            $q->whereJsonContains($this->ownerKey, $this->getParentKey());
+        });
 
         $query->whereNotNull($this->ownerKey);
     }
@@ -44,37 +44,15 @@ public function addConstraints(): void
     public function addEagerConstraints(array $models): void
     {
         $ids = $this->getEagerModelKeys($models);
-
-        if ($this->isString) {
-            // For strings, simple OR with quoted values
-            $this->query->where(function ($q) use ($ids) {
-                foreach ($ids as $id) {
-                    $q->orWhere($this->ownerKey, 'LIKE', '%"' . $id . '"%');
-                }
-            });
-        } else {
-            // For integers, use pattern matching with OR logic
-            $this->query->where(function ($q) use ($ids) {
-                foreach ($ids as $id) {
-                    $q->orWhere(function ($subQuery) use ($id) {
-                        $patterns = [
-                            '%[' . $id . ',%',
-                            '%,' . $id . ',%',
-                            '%,' . $id . ']%',
-                            '%[' . $id . ']%'
-                        ];
-
-                        foreach ($patterns as $i => $pattern) {
-                            if ($i === 0) {
-                                $subQuery->where($this->ownerKey, 'LIKE', $pattern);
-                            } else {
-                                $subQuery->orWhere($this->ownerKey, 'LIKE', $pattern);
-                            }
-                        }
-                    });
-                }
-            });
-        }
+        $this->query->where(function ($q) use ($ids) {
+            foreach ($ids as $id) {
+                $q->when($this->isString, function ($q) use ($id) {
+                    $q->orWhereJsonContains($this->ownerKey, (string) $id);
+                }, function ($q) use ($id) {
+                    $q->orWhereJsonContains($this->ownerKey, $id);
+                });
+            }
+        });
     }
 
     /**
@@ -107,49 +85,4 @@ public function getResults(): mixed
     {
         return $this->query->get();
     }
-
-    /**
-     * Add JSON contains constraint in a database-agnostic way.
-     * Uses pattern matching that works across all database engines and Laravel versions.
-     */
-    protected function addJsonContainsConstraint($query, string $column, $value, string $boolean = 'and'): void
-    {
-        // Use pattern matching for all databases to ensure compatibility
-        // with prefer-lowest dependency resolution in CI environments
-        if ($this->isString) {
-            // For strings, search for quoted value: "value"
-            $method = $boolean === 'or' ? 'orWhere' : 'where';
-            $query->$method($column, 'LIKE', '%"' . $value . '"%');
-        } else {
-            // For integers, use precise pattern matching for unquoted numbers
-            $patterns = [
-                '%[' . $value . ',%',  // [1,
-                '%,' . $value . ',%',  // ,1,
-                '%,' . $value . ']%',  // ,1]
-                '%[' . $value . ']%'   // [1]
-            ];
-
-            if ($boolean === 'or') {
-                $query->orWhere(function ($subQuery) use ($column, $patterns) {
-                    foreach ($patterns as $i => $pattern) {
-                        if ($i === 0) {
-                            $subQuery->where($column, 'LIKE', $pattern);
-                        } else {
-                            $subQuery->orWhere($column, 'LIKE', $pattern);
-                        }
-                    }
-                });
-            } else {
-                $query->where(function ($subQuery) use ($column, $patterns) {
-                    foreach ($patterns as $i => $pattern) {
-                        if ($i === 0) {
-                            $subQuery->where($column, 'LIKE', $pattern);
-                        } else {
-                            $subQuery->orWhere($column, 'LIKE', $pattern);
-                        }
-                    }
-                });
-            }
-        }
-    }
 }