Skip to content

support schemas with primary_key set by macro + fallback to :id as primary key #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mayel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support schemas with primary_key set by macro + fallback to :id as primary key #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af4f09a
can use with schemas with @primary_key: false
mayel Feb 4, 2021
0f4ae2c
fallback to :id
mayel Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions lib/arbor/tree.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@ defmodule Arbor.Tree do
defmacro __before_compile__(%{module: definition} = _env) do
arbor_opts = Module.get_attribute(definition, :arbor_opts)

{primary_key, primary_key_type, _} = Module.get_attribute(definition, :primary_key)

{primary_key, primary_key_type} = case Module.get_attribute(definition, :primary_key) do
{primary_key, primary_key_type, _} -> {primary_key, primary_key_type}
_ -> {arbor_opts[:primary_key], arbor_opts[:primary_key_type]}
end

struct_fields = Module.get_attribute(definition, :struct_fields)

struct_source = struct_fields[:__meta__].source
Expand Down Expand Up @@ -80,13 +85,15 @@ defmodule Arbor.Tree do
)
end

defp id(struct), do: Map.get(struct, unquote(opts[:foreign_key]), Map.get(struct, :id))

def parent(struct) do
from(
t in unquote(definition),
where:
fragment(
unquote("#{opts[:primary_key]} = ?"),
type(^struct.unquote(opts[:foreign_key]), unquote(opts[:foreign_key_type]))
type(^id(struct), unquote(opts[:foreign_key_type]))
)
)
end
Expand All @@ -97,7 +104,7 @@ defmodule Arbor.Tree do
where:
fragment(
unquote("#{opts[:foreign_key]} = ?"),
type(^struct.unquote(opts[:primary_key]), unquote(opts[:foreign_key_type]))
type(^id(struct), unquote(opts[:foreign_key_type]))
)
)
end
Expand All @@ -107,7 +114,7 @@ defmodule Arbor.Tree do
t in unquote(definition),
where:
t.unquote(opts[:primary_key]) !=
type(^struct.unquote(opts[:primary_key]), unquote(opts[:primary_key_type])),
type(^id(struct), unquote(opts[:primary_key_type])),
where:
fragment(
unquote("#{opts[:foreign_key]} = ?"),
Expand Down Expand Up @@ -137,7 +144,7 @@ defmodule Arbor.Tree do
SELECT *
FROM #{opts[:tree_name]}
)
"""), type(^struct.unquote(opts[:primary_key]), unquote(opts[:primary_key_type]))),
"""), type(^id(struct), unquote(opts[:primary_key_type]))),
on: t.unquote(opts[:primary_key]) == g.unquote(opts[:foreign_key])
end

Expand All @@ -164,7 +171,7 @@ defmodule Arbor.Tree do
)
SELECT #{opts[:primary_key]} FROM #{opts[:tree_name]}
"""),
type(^struct.unquote(opts[:primary_key]), unquote(opts[:foreign_key_type])),
type(^id(struct), unquote(opts[:foreign_key_type])),
type(^depth, :integer)
)
)
Expand Down