fix(graphql): @graphql Logical operators will group conditions corr…

…ectly.
LastDragon-ru · Aug 18, 2022 · d79da46 · d79da46
1 parent b28362e
commit d79da46
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 27 deletions.
diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest.php b/packages/graphql/src/SearchBy/Directives/DirectiveTest.php
@@ -402,10 +402,17 @@ public function dataProviderHandleBuilder(): array {
                             from
                                 "tmp"
                             where
-                                not (
-                                    ("a" != ?)
-                                    and (
-                                        ("a" = ?) or ("b" != ?)
+                                (
+                                    not (
+                                        (
+                                            ("a" != ?)
+                                            and (
+                                                (
+                                                    ("a" = ?)
+                                                    or ("b" != ?)
+                                                )
+                                            )
+                                        )
                                     )
                                 )
                         SQL

diff --git a/packages/graphql/src/SearchBy/Operators/Logical/AllOfTest.php b/packages/graphql/src/SearchBy/Operators/Logical/AllOfTest.php
@@ -88,7 +88,7 @@ public function dataProviderCall(): array {
             new ArrayDataProvider([
                 'property'   => [
                     [
-                        'query'    => 'select * from "tmp" where ("a" = ?) and ("b" != ?)',
+                        'query'    => 'select * from "tmp" where (("a" = ?) and ("b" != ?))',
                         'bindings' => [
                             2,
                             22,
@@ -99,7 +99,7 @@ public function dataProviderCall(): array {
                 ],
                 'with alias' => [
                     [
-                        'query'    => 'select * from "tmp" where ("alias"."a" = ?) and ("alias"."b" != ?)',
+                        'query'    => 'select * from "tmp" where (("alias"."a" = ?) and ("alias"."b" != ?))',
                         'bindings' => [
                             2,
                             22,

diff --git a/packages/graphql/src/SearchBy/Operators/Logical/AnyOfTest.php b/packages/graphql/src/SearchBy/Operators/Logical/AnyOfTest.php
@@ -88,7 +88,7 @@ public function dataProviderCall(): array {
             new ArrayDataProvider([
                 'property'   => [
                     [
-                        'query'    => 'select * from "tmp" where ("a" = ?) or ("b" != ?)',
+                        'query'    => 'select * from "tmp" where (("a" = ?) or ("b" != ?))',
                         'bindings' => [
                             2,
                             22,
@@ -99,7 +99,7 @@ public function dataProviderCall(): array {
                 ],
                 'with alias' => [
                     [
-                        'query'    => 'select * from "tmp" where ("alias"."a" = ?) or ("alias"."b" != ?)',
+                        'query'    => 'select * from "tmp" where (("alias"."a" = ?) or ("alias"."b" != ?))',
                         'bindings' => [
                             2,
                             22,

diff --git a/packages/graphql/src/SearchBy/Operators/Logical/Logical.php b/packages/graphql/src/SearchBy/Operators/Logical/Logical.php
@@ -22,24 +22,28 @@ public function call(Handler $handler, object $builder, Property $property, Argu
             throw new OperatorUnsupportedBuilder($this, $builder);
         }
 
-        // The last item is the name of the operator not a property
-        $property   = $property->getParent();
-        $conditions = $this->getConditions($argument);
+        $builder->where(
+            function (EloquentBuilder|QueryBuilder $builder) use ($handler, $property, $argument): void {
+                // The last item is the name of the operator not a property
+                $property   = $property->getParent();
+                $conditions = $this->getConditions($argument);
 
-        foreach ($conditions as $arguments) {
-            $builder->where(
-                static function (EloquentBuilder|QueryBuilder $builder) use (
-                    $handler,
-                    $arguments,
-                    $property
-                ): void {
-                    $handler->handle($builder, $property, $arguments);
-                },
-                null,
-                null,
-                $this->getBoolean(),
-            );
-        }
+                foreach ($conditions as $arguments) {
+                    $builder->where(
+                        static function (EloquentBuilder|QueryBuilder $builder) use (
+                            $handler,
+                            $arguments,
+                            $property
+                        ): void {
+                            $handler->handle($builder, $property, $arguments);
+                        },
+                        null,
+                        null,
+                        $this->getBoolean(),
+                    );
+                }
+            },
+        );
 
         return $builder;
     }

diff --git a/packages/graphql/src/SearchBy/Operators/Logical/NotTest.php b/packages/graphql/src/SearchBy/Operators/Logical/NotTest.php
@@ -89,7 +89,7 @@ public function dataProviderCall(): array {
             new ArrayDataProvider([
                 'property'   => [
                     [
-                        'query'    => 'select * from "tmp" where not ("a" = ?)',
+                        'query'    => 'select * from "tmp" where (not ("a" = ?))',
                         'bindings' => [
                             2,
                         ],
@@ -99,7 +99,7 @@ public function dataProviderCall(): array {
                 ],
                 'with alias' => [
                     [
-                        'query'    => 'select * from "tmp" where not ("alias"."a" = ?)',
+                        'query'    => 'select * from "tmp" where (not ("alias"."a" = ?))',
                         'bindings' => [
                             2,
                         ],