Skip to content

Fix grants for former owners after owner change #174

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

Merged
nettrash merged 3 commits into from
Apr 25, 2026
Merged

Fix grants for former owners after owner change #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20f9c8b
Fix grants for former owners after owner change
iBarBuba Apr 25, 2026
d96ed88
Address ACL review comments
iBarBuba Apr 25, 2026
f6564af
Simplify ACL owner filtering API
iBarBuba Apr 25, 2026
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
50 changes: 23 additions & 27 deletions app/src/comparer/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3224,11 +3224,11 @@ impl Comparer {

// --- Schemas ---
for schema in &self.to.schemas {
let (from_acl, from_owner) = from_schema_map
let (from_acl, _) = from_schema_map
.get(schema.name.as_str())
.copied()
.unwrap_or((&[], ""));
let owners: Vec<&str> = [from_owner, schema.owner.as_str()]
let to_owners: Vec<&str> = [schema.owner.as_str()]
.into_iter()
.filter(|o| !o.is_empty())
.collect();
Expand All @@ -3238,7 +3238,7 @@ impl Comparer {
full,
"SCHEMA",
&schema.name,
&owners,
&to_owners,
);
if !grants_script.is_empty() {
if self.use_comments {
Expand Down Expand Up @@ -3308,7 +3308,7 @@ impl Comparer {
} else {
Vec::new()
};
let (from_acl, from_owner): (&[String], &str) = if use_default {
let (from_acl, _): (&[String], &str) = if use_default {
(default_acl_storage.as_slice(), "")
} else if let Some(&(acl, owner)) =
from_table_map.get(&(table.schema.as_str(), table.name.as_str()))
Expand All @@ -3317,7 +3317,7 @@ impl Comparer {
} else {
(&[], "")
};
let owners: Vec<&str> = [from_owner, table.owner.as_str()]
let to_owners: Vec<&str> = [table.owner.as_str()]
.into_iter()
.filter(|o| !o.is_empty())
.collect();
Expand All @@ -3328,7 +3328,7 @@ impl Comparer {
full,
"TABLE",
&object_name,
&owners,
&to_owners,
);
if !grants_script.is_empty() {
if self.use_comments {
Expand All @@ -3351,7 +3351,7 @@ impl Comparer {
} else {
Vec::new()
};
let (from_acl, from_owner): (&[String], &str) = if is_new_seq && full {
let (from_acl, _): (&[String], &str) = if is_new_seq && full {
(default_seq_acl_storage.as_slice(), "")
} else if let Some(&(acl, owner)) =
from_seq_map.get(&(seq.schema.as_str(), seq.name.as_str()))
Expand All @@ -3360,7 +3360,7 @@ impl Comparer {
} else {
(&[], "")
};
let owners: Vec<&str> = [from_owner, seq.owner.as_str()]
let to_owners: Vec<&str> = [seq.owner.as_str()]
.into_iter()
.filter(|o| !o.is_empty())
.collect();
Expand All @@ -3371,7 +3371,7 @@ impl Comparer {
full,
"SEQUENCE",
&object_name,
&owners,
&to_owners,
);
if !grants_script.is_empty() {
if self.use_comments {
Expand Down Expand Up @@ -3409,7 +3409,7 @@ impl Comparer {
} else {
Vec::new()
};
let (from_acl, from_owner): (&[String], &str) = if use_view_default {
let (from_acl, _): (&[String], &str) = if use_view_default {
(view_default_acl_storage.as_slice(), "")
} else if is_dropped {
// use_drop=false: view wasn't actually dropped
Expand All @@ -3421,7 +3421,7 @@ impl Comparer {
} else {
(&[], "")
};
let owners: Vec<&str> = [from_owner, view.owner.as_str()]
let to_owners: Vec<&str> = [view.owner.as_str()]
.into_iter()
.filter(|o| !o.is_empty())
.collect();
Expand All @@ -3432,7 +3432,7 @@ impl Comparer {
full,
"TABLE",
&object_name,
&owners,
&to_owners,
);
if !grants_script.is_empty() {
if self.use_comments {
Expand All @@ -3457,11 +3457,11 @@ impl Comparer {
.collect();

for ft in &self.to.foreign_tables {
let (from_acl, from_owner) = from_ft_map
let (from_acl, _) = from_ft_map
.get(&(ft.schema.as_str(), ft.name.as_str()))
.copied()
.unwrap_or((&[], ""));
let owners: Vec<&str> = [from_owner, ft.owner.as_str()]
let to_owners: Vec<&str> = [ft.owner.as_str()]
.into_iter()
.filter(|o| !o.is_empty())
.collect();
Expand All @@ -3472,7 +3472,7 @@ impl Comparer {
full,
"FOREIGN TABLE",
Comment thread
iBarBuba marked this conversation as resolved.
&object_name,
&owners,
&to_owners,
);
if !grants_script.is_empty() {
if self.use_comments {
Expand All @@ -3486,15 +3486,15 @@ impl Comparer {

// --- Routines ---
for routine in &self.to.routines {
let (from_acl, from_owner) = from_routine_map
let (from_acl, _) = from_routine_map
.get(&(
routine.schema.as_str(),
routine.name.as_str(),
routine.arguments.as_str(),
))
.copied()
.unwrap_or((&[], ""));
let owners: Vec<&str> = [from_owner, routine.owner.as_str()]
let to_owners: Vec<&str> = [routine.owner.as_str()]
.into_iter()
.filter(|o| !o.is_empty())
.collect();
Expand All @@ -3509,7 +3509,7 @@ impl Comparer {
full,
object_kind,
&object_name,
&owners,
&to_owners,
);
if !grants_script.is_empty() {
if self.use_comments {
Expand All @@ -3535,11 +3535,11 @@ impl Comparer {
.collect();

for pg_type in &self.to.types {
let (from_acl, from_owner) = from_type_map
let (from_acl, _) = from_type_map
.get(&(pg_type.schema.as_str(), pg_type.typname.as_str()))
.copied()
.unwrap_or((&[], ""));
let owners: Vec<&str> = [from_owner, pg_type.owner.as_str()]
let to_owners: Vec<&str> = [pg_type.owner.as_str()]
.into_iter()
.filter(|o| !o.is_empty())
.collect();
Expand All @@ -3550,7 +3550,7 @@ impl Comparer {
full,
"TYPE",
&object_name,
&owners,
&to_owners,
);
if !grants_script.is_empty() {
if self.use_comments {
Expand All @@ -3574,11 +3574,7 @@ impl Comparer {
.collect();

for table in &self.to.tables {
let from_owner = from_table_map
.get(&(table.schema.as_str(), table.name.as_str()))
.map(|&(_, o)| o)
.unwrap_or("");
let table_owners: Vec<&str> = [from_owner, table.owner.as_str()]
let to_table_owners: Vec<&str> = [table.owner.as_str()]
.into_iter()
.filter(|o| !o.is_empty())
.collect();
Expand Down Expand Up @@ -3610,7 +3606,7 @@ impl Comparer {
full,
&object_table_name,
&col.name,
&table_owners,
&to_table_owners,
);
if !col_grants.is_empty() {
if self.use_comments {
Expand Down
Loading
Loading