[graphql] SearchBy: Fixed column prefix for Relation condition (not all whereHas adds prefix)

Author: LastDragon-ru

src/SearchBy/Operators/Complex/Relation.php

@@ -88,10 +88,15 @@ public function apply(
             static function (
                 EloquentBuilder|QueryBuilder $builder,
             ) use (
+                $relation,
                 $search,
                 $alias,
                 $has,
             ): EloquentBuilder|QueryBuilder {
+                if ($alias === $relation->getRelationCountHash(false)) {
+                    $alias = null;
+                }
+
                 return is_array($has)
                     ? $search->process($builder, $has, $alias)
                     : $builder;

src/SearchBy/Operators/Complex/RelationTest.php

@@ -63,7 +63,7 @@ public function testApply(
      */
     public function dataProviderApply(): array {
         return [
-            'query builder not supported' => [
+            'query builder not supported'      => [
                 new SearchLogicException(sprintf(
                     'Operator `%s` can not be used with `%s`.',
                     (new Relation())->getName(),
@@ -75,61 +75,60 @@ static function (self $test): QueryBuilder {
                 'test',
                 [],
             ],
-            'not a relation'              => [
+            'not a relation'                   => [
                 new LogicException(sprintf(
                     'Property `%s` is not a relation.',
                     'delete',
                 )),
                 static function (): EloquentBuilder {
-                    return RelationTest__Model::query();
+                    return RelationTest__ModelA::query();
                 },
                 'delete',
                 [],
             ],
-            '{has: yes}'                  => [
+            '{has: yes}'                       => [
                 [
-                    'sql'      => 'select * from "tmp" where exists ('.
-                        'select * from "tmp" as "table_alias_0" '.
-                        'where "tmp"."id" = "table_alias_0"."relation_test___model_id"'.
+                    'sql'      => 'select * from "table_a" where exists ('.
+                        'select * from "table_b" '.
+                        'where "table_a"."id" = "table_b"."table_a_id"'.
                         ')',
                     'bindings' => [],
                 ],
                 static function (): EloquentBuilder {
-                    return RelationTest__Model::query();
+                    return RelationTest__ModelA::query();
                 },
                 'test',
                 [
                     'has' => 'yes',
                 ],
             ],
-            '{has: yes, not: yes}'        => [
+            '{has: yes, not: yes}'             => [
                 [
-                    'sql'      => 'select * from "tmp" where not exists ('.
-                        'select * from "tmp" as "table_alias_0" '.
-                        'where "tmp"."id" = "table_alias_0"."relation_test___model_id"'.
+                    'sql'      => 'select * from "table_a" where not exists ('.
+                        'select * from "table_b" '.
+                        'where "table_a"."id" = "table_b"."table_a_id"'.
                         ')',
                     'bindings' => [],
                 ],
                 static function (): EloquentBuilder {
-                    return RelationTest__Model::query();
+                    return RelationTest__ModelA::query();
                 },
                 'test',
                 [
                     'has' => 'yes',
                     'not' => 'yes',
                 ],
             ],
-            '{has: {property: {eq: 1}}}'  => [
+            '{has: {property: {eq: 1}}}'       => [
                 [
-                    'sql'      => 'select * from "tmp" where exists ('.
-                        'select * from "tmp" as "table_alias_0" where '.
-                        '"tmp"."id" = "table_alias_0"."relation_test___model_id" '.
-                        'and "table_alias_0"."property" = ?'.
+                    'sql'      => 'select * from "table_a" where exists ('.
+                        'select * from "table_b" where '.
+                        '"table_a"."id" = "table_b"."table_a_id" and "property" = ?'.
                         ')',
                     'bindings' => [123],
                 ],
                 static function (): EloquentBuilder {
-                    return RelationTest__Model::query();
+                    return RelationTest__ModelA::query();
                 },
                 'test',
                 [
@@ -140,33 +139,33 @@ static function (): EloquentBuilder {
                     ],
                 ],
             ],
-            '{has: yes, eq: 1}'           => [
+            '{has: yes, eq: 1}'                => [
                 [
-                    'sql'      => 'select * from "tmp" where ('.
-                        'select count(*) from "tmp" as "table_alias_0" where '.
-                        '"tmp"."id" = "table_alias_0"."relation_test___model_id"'.
+                    'sql'      => 'select * from "table_a" where ('.
+                        'select count(*) from "table_b" where '.
+                        '"table_a"."id" = "table_b"."table_a_id"'.
                         ') = 345',
                     'bindings' => [/* strange */],
                 ],
                 static function (): EloquentBuilder {
-                    return RelationTest__Model::query();
+                    return RelationTest__ModelA::query();
                 },
                 'test',
                 [
                     'has' => 'yes',
                     'eq'  => 345,
                 ],
             ],
-            '{has: yes, eq: 1, not: yes}' => [
+            '{has: yes, eq: 1, not: yes}'      => [
                 [
-                    'sql'      => 'select * from "tmp" where ('.
-                        'select count(*) from "tmp" as "table_alias_0" '.
-                        'where "tmp"."id" = "table_alias_0"."relation_test___model_id"'.
+                    'sql'      => 'select * from "table_a" where ('.
+                        'select count(*) from "table_b" '.
+                        'where "table_a"."id" = "table_b"."table_a_id"'.
                         ') != 345',
                     'bindings' => [/* strange */],
                 ],
                 static function (): EloquentBuilder {
-                    return RelationTest__Model::query();
+                    return RelationTest__ModelA::query();
                 },
                 'test',
                 [
@@ -175,12 +174,12 @@ static function (): EloquentBuilder {
                     'eq'  => 345,
                 ],
             ],
-            '{has: yes, eq: 1, gt: 2}'    => [
+            '{has: yes, eq: 1, gt: 2}'         => [
                 new SearchLogicException(
                     'Only one comparison operator allowed, found: `eq`, `gt`',
                 ),
                 static function (): EloquentBuilder {
-                    return RelationTest__Model::query();
+                    return RelationTest__ModelA::query();
                 },
                 'test',
                 [
@@ -189,6 +188,27 @@ static function (): EloquentBuilder {
                     'gt'  => 2,
                 ],
             ],
+            '{has: {property: {eq: 1}}} (own)' => [
+                [
+                    'sql'      => 'select * from "table_a" where exists ('.
+                        'select * from "table_a" as "table_alias_0" where '.
+                        '"table_a"."id" = "table_alias_0"."relation_test___model_a_id" '.
+                        'and "table_alias_0"."property" = ?'.
+                        ')',
+                    'bindings' => [123],
+                ],
+                static function (): EloquentBuilder {
+                    return RelationTest__ModelA::query();
+                },
+                'a',
+                [
+                    'has' => [
+                        'property' => [
+                            'eq' => 123,
+                        ],
+                    ],
+                ],
+            ],
         ];
     }
     // </editor-fold>
@@ -201,15 +221,32 @@ static function (): EloquentBuilder {
  * @internal
  * @noinspection PhpMultipleClassesDeclarationsInOneFile
  */
-class RelationTest__Model extends Model {
+class RelationTest__ModelA extends Model {
     /**
      * @phpcsSuppress SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint
      *
      * @var string
      */
-    public $table = 'tmp';
+    public $table = 'table_a';
 
     public function test(): HasOne {
+        return $this->hasOne(RelationTest__ModelB::class, 'table_a_id');
+    }
+
+    public function a(): HasOne {
         return $this->hasOne(static::class);
     }
 }
+
+/**
+ * @internal
+ * @noinspection PhpMultipleClassesDeclarationsInOneFile
+ */
+class RelationTest__ModelB extends Model {
+    /**
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint
+     *
+     * @var string
+     */
+    public $table = 'table_b';
+}