Skip to content
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

Fix query for metadata on foreign keys and fix duplicate references being produced #444

Merged
merged 2 commits into from
Dec 15, 2024
Merged

Fix query for metadata on foreign keys and fix duplicate references being produced #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06883fa
Fix query to avoid permutations when multiple FKs are present
olivermt Dec 15, 2024
e6f788a
Fix bug that makes tooling emit multiple references blocks if more t…
olivermt Dec 15, 2024
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
22 changes: 11 additions & 11 deletions lib/resource_generator/resource_generator.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,18 +385,18 @@ defmodule AshPostgres.ResourceGenerator do
[]
end
end
|> Enum.join("\n")
|> String.trim()
|> then(
&[
"""
references do
#{&1}
end
"""
]
)
end)
|> Enum.join("\n")
|> String.trim()
|> then(
&[
"""
references do
#{&1}
end
"""
]
)
end

defp add_match_with(str, empty) when empty in [[], nil], do: str
Expand Down
87 changes: 46 additions & 41 deletions lib/resource_generator/spec.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,52 +123,57 @@ defmodule AshPostgres.ResourceGenerator.Spec do
%Postgrex.Result{rows: fkey_rows} =
spec.repo.query!(
"""
SELECT tc.constraint_name,
-- This has to go via the pg_constraints table directly
-- because the built in constraint view does not surface the table name
-- and constraint names are only unique per table
CASE pgc.confmatchtype
WHEN 'f'::"char" THEN 'FULL'::text
WHEN 'p'::"char" THEN 'PARTIAL'::text
WHEN 's'::"char" THEN 'NONE'::text
ELSE NULL::text
END AS match_option,
CASE pgc.confupdtype
WHEN 'c'::"char" THEN 'CASCADE'::text
WHEN 'n'::"char" THEN 'SET NULL'::text
WHEN 'd'::"char" THEN 'SET DEFAULT'::text
WHEN 'r'::"char" THEN 'RESTRICT'::text
WHEN 'a'::"char" THEN 'NO ACTION'::text
ELSE NULL::text
END AS update_rule,
CASE pgc.confdeltype
WHEN 'c'::"char" THEN 'CASCADE'::text
WHEN 'n'::"char" THEN 'SET NULL'::text
WHEN 'd'::"char" THEN 'SET DEFAULT'::text
WHEN 'r'::"char" THEN 'RESTRICT'::text
WHEN 'a'::"char" THEN 'NO ACTION'::text
ELSE NULL::text
END AS delete_rule,
-- This has to go via the pg_constraints table directly
-- because the built in constraint view does not surface the table name
-- and constraint names are only unique per table
WITH constraints AS (SELECT conname as constraint_name,
ns.nspname::information_schema.sql_identifier AS table_schema,
CASE pgc.confmatchtype
WHEN 'f'::"char" THEN 'FULL'::text
WHEN 'p'::"char" THEN 'PARTIAL'::text
WHEN 's'::"char" THEN 'NONE'::text
ELSE NULL::text
END AS match_option,
CASE pgc.confupdtype
WHEN 'c'::"char" THEN 'CASCADE'::text
WHEN 'n'::"char" THEN 'SET NULL'::text
WHEN 'd'::"char" THEN 'SET DEFAULT'::text
WHEN 'r'::"char" THEN 'RESTRICT'::text
WHEN 'a'::"char" THEN 'NO ACTION'::text
ELSE NULL::text
END AS update_rule,
CASE pgc.confdeltype
WHEN 'c'::"char" THEN 'CASCADE'::text
WHEN 'n'::"char" THEN 'SET NULL'::text
WHEN 'd'::"char" THEN 'SET DEFAULT'::text
WHEN 'r'::"char" THEN 'RESTRICT'::text
WHEN 'a'::"char" THEN 'NO ACTION'::text
ELSE NULL::text
END AS delete_rule
FROM pg_constraint AS pgc
INNER JOIN pg_namespace AS ns ON pgc.connamespace = ns.oid
WHERE pgc.contype = 'f' -- Foreign key
AND pgc.conrelid = $1::text::regclass
AND ns.nspname = $2)
SELECT constraints.constraint_name,
constraints.match_option,
constraints.update_rule,
constraints.delete_rule,
array_agg(DISTINCT kcu.column_name) AS referencing_columns,
array_agg(DISTINCT ccu.column_name) AS referenced_columns,
ccu.table_name AS foreign_table_name
FROM information_schema.table_constraints AS tc
JOIN information_schema.key_column_usage AS kcu
ON tc.constraint_name = kcu.constraint_name
AND tc.table_schema = kcu.table_schema
FROM information_schema.key_column_usage AS kcu
JOIN constraints
ON constraints.constraint_name = kcu.constraint_name
AND constraints.table_schema = kcu.table_schema
JOIN information_schema.constraint_column_usage AS ccu
ON ccu.constraint_name = tc.constraint_name
AND ccu.table_schema = tc.table_schema
JOIN pg_constraint AS pgc ON contype = 'f' AND conrelid = tc.table_name::regclass
WHERE tc.constraint_type = 'FOREIGN KEY'
AND tc.table_name = $1
AND tc.table_schema = $2
GROUP BY tc.constraint_name,
ON ccu.constraint_name = constraints.constraint_name
AND ccu.table_schema = constraints.table_schema
GROUP BY constraints.constraint_name,
ccu.table_name,
pgc.confmatchtype,
pgc.confupdtype,
pgc.confdeltype

constraints.match_option,
constraints.update_rule,
constraints.delete_rule
""",
[spec.table_name, spec.schema],
log: false
Expand Down
Loading