Skip to content

Commit 351e2f3

Browse files
committed
use related? instead of unrelated?
1 parent 9501c5f commit 351e2f3

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

lib/ash/expr/expr.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ defmodule Ash.Expr do
775775
resource: Macro.escape(unquote(alias_ast)),
776776
expr: unquote(processed_expr),
777777
at_path: [],
778-
unrelated?: true
778+
related?: false
779779
}
780780
end,
781781
escape?
@@ -790,7 +790,7 @@ defmodule Ash.Expr do
790790
resource: Macro.escape(unquote(alias_ast)),
791791
expr: true,
792792
at_path: [],
793-
unrelated?: true
793+
related?: false
794794
}
795795
end,
796796
escape?
@@ -810,7 +810,7 @@ defmodule Ash.Expr do
810810
resource: unquote(module_atom),
811811
expr: unquote(processed_expr),
812812
at_path: [],
813-
unrelated?: true
813+
related?: false
814814
}
815815
end,
816816
escape?
@@ -830,7 +830,7 @@ defmodule Ash.Expr do
830830
resource: module_atom,
831831
expr: true,
832832
at_path: [],
833-
unrelated?: true
833+
related?: false
834834
},
835835
escape?
836836
)

lib/ash/filter/runtime.ex

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -542,23 +542,15 @@ defmodule Ash.Filter.Runtime do
542542
at_path: [],
543543
path: path,
544544
expr: expr,
545-
unrelated?: unrelated?,
545+
related?: related?,
546546
resource: unrelated_resource
547547
},
548548
record,
549549
parent,
550550
resource,
551551
unknown_on_unknown_refs?
552552
) do
553-
if unrelated? do
554-
resolve_unrelated_exists(
555-
unrelated_resource,
556-
expr,
557-
record,
558-
parent,
559-
unknown_on_unknown_refs?
560-
)
561-
else
553+
if related? do
562554
record
563555
|> flatten_relationships([path])
564556
|> load_unflattened(path)
@@ -589,6 +581,14 @@ defmodule Ash.Filter.Runtime do
589581
end
590582
end)
591583
end
584+
else
585+
resolve_unrelated_exists(
586+
unrelated_resource,
587+
expr,
588+
record,
589+
parent,
590+
unknown_on_unknown_refs?
591+
)
592592
end
593593
end
594594

lib/ash/query/function/exists.ex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ defmodule Ash.Query.Exists do
33
Determines if a given related entity exists.
44
"""
55

6-
defstruct [:path, :expr, :resource, at_path: [], unrelated?: false, input?: false]
6+
defstruct [:path, :expr, :resource, at_path: [], related?: true, input?: false]
77

88
def new(path, expr, at_path \\ [])
99

@@ -25,14 +25,14 @@ defmodule Ash.Query.Exists do
2525
import Inspect.Algebra
2626

2727
def inspect(
28-
%{path: path, expr: expr, at_path: at_path, unrelated?: unrelated?, resource: resource},
28+
%{path: path, expr: expr, at_path: at_path, related?: related?, resource: resource},
2929
opts
3030
) do
3131
path_or_resource =
32-
if unrelated? && resource do
33-
inspect(resource)
34-
else
32+
if related? do
3533
Enum.join(path, ".")
34+
else
35+
inspect(resource)
3636
end
3737

3838
if at_path && at_path != [] do

test/resource/unrelated_exists_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,12 +554,12 @@ defmodule Ash.Test.Resource.UnrelatedExistsTest do
554554
)
555555

556556
# Should parse without errors
557-
assert %Ash.Query.Exists{unrelated?: true} = expr_ast
557+
assert %Ash.Query.Exists{related?: false} = expr_ast
558558

559559
# The inner structure should contain a nested unrelated exists
560560
assert %Ash.Query.BooleanExpression{
561561
right: %Ash.Query.Exists{
562-
unrelated?: true,
562+
related?: false,
563563
resource: Ash.Test.Resource.UnrelatedExistsTest.Report
564564
}
565565
} = expr_ast.expr

0 commit comments

Comments
 (0)