Skip to content

fix: Don't include other relation siblings if not specified in config #1720

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
kodiakhq merged 3 commits into from
Jun 14, 2024
Merged

fix: Don't include other relation siblings if not specified in config #1720

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
b059f23
test: Add failing test
erezrokah Jun 5, 2024
5186593
fix: Don't include other relations if not specified in config
erezrokah Jun 5, 2024
468b5e3
Merge branch 'main' into fix/child_matching_skip_dependent
erezrokah Jun 14, 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
5 changes: 3 additions & 2 deletions schema/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,15 +425,16 @@ func (t *Table) filterDfs(parentMatched bool, include, exclude func(*Table) bool
matched = true
}
filteredRelations := make([]*Table, 0, len(t.Relations))
childMatched := false
for _, r := range t.Relations {
filteredChild := r.filterDfs(matched, include, exclude, skipDependentTables)
if filteredChild != nil {
matched = true
childMatched = true
filteredRelations = append(filteredRelations, r)
}
}
t.Relations = filteredRelations
if matched {
if matched || childMatched {
return t
}
return nil
Expand Down
169 changes: 169 additions & 0 deletions schema/table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,175 @@ func TestTablesFilterDFS(t *testing.T) {
configurationSkipTables: []string{"sub_table_2"},
want: []string{"main_table", "sub_table_1"},
},
{
name: "when specifying a single child table, return only the parent and the specified child",
tables: []*Table{
{Name: "main_table", Relations: []*Table{
{Name: "sub_table_1", Parent: &Table{Name: "main_table"}},
{Name: "sub_table_2", Parent: &Table{Name: "main_table"}}}}},
configurationTables: []string{"sub_table_1"},
want: []string{"main_table", "sub_table_1"},
},
{
name: "when specifying a leaf table, return only the parents and the leaf",
tables: []*Table{
{Name: "0", Relations: []*Table{
{Name: "0_1", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_1_1", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_1_1", Parent: &Table{Name: "0_1_1"}},
{Name: "0_1_1_2", Parent: &Table{Name: "0_1_1"}, Relations: []*Table{
{Name: "0_1_1_2_1", Parent: &Table{Name: "0_1_1_2"}},
{Name: "0_1_1_2_2", Parent: &Table{Name: "0_1_1_2"}},
}},
{Name: "0_1_1_3", Parent: &Table{Name: "0_1_1"}},
}},
{Name: "0_1_2", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_2_1", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_2", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_3", Parent: &Table{Name: "0_1_2"}},
}},
{Name: "0_1_3", Parent: &Table{Name: "0_1"}},
}},
{Name: "0_2", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_2_1", Parent: &Table{Name: "0_2"}},
{Name: "0_2_2", Parent: &Table{Name: "0_2"}},
}},
{Name: "0_3", Parent: &Table{Name: "0"}},
}},
{Name: "1", Relations: []*Table{
{Name: "1_1", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_1_1", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_1_1", Parent: &Table{Name: "1_1_1"}},
{Name: "1_1_1_2", Parent: &Table{Name: "1_1_1"}, Relations: []*Table{
{Name: "1_1_1_2_1", Parent: &Table{Name: "1_1_1_2"}},
{Name: "1_1_1_2_2", Parent: &Table{Name: "1_1_1_2"}},
}},
{Name: "1_1_1_3", Parent: &Table{Name: "1_1_1"}},
}},
{Name: "1_1_2", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_2_1", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_2", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_3", Parent: &Table{Name: "1_1_2"}},
}},
{Name: "1_1_3", Parent: &Table{Name: "1_1"}},
}},
{Name: "1_2", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_2_1", Parent: &Table{Name: "1_2"}},
{Name: "1_2_2", Parent: &Table{Name: "1_2"}},
}},
{Name: "1_3", Parent: &Table{Name: "1"}},
}},
},
configurationTables: []string{"0_1_1_2_2", "0_1_2_3", "1_1_2_3"},
want: []string{"0", "0_1", "0_1_1", "0_1_1_2", "0_1_1_2_2", "0_1_2", "0_1_2_3", "1", "1_1", "1_1_2", "1_1_2_3"},
},
{
name: "when specifying a descendant table, return the parents, the specified descendant and all its descendant if skip_dependent_tables is false",
tables: []*Table{
{Name: "0", Relations: []*Table{
{Name: "0_1", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_1_1", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_1_1", Parent: &Table{Name: "0_1_1"}},
{Name: "0_1_1_2", Parent: &Table{Name: "0_1_1"}, Relations: []*Table{
{Name: "0_1_1_2_1", Parent: &Table{Name: "0_1_1_2"}},
{Name: "0_1_1_2_2", Parent: &Table{Name: "0_1_1_2"}},
}},
{Name: "0_1_1_3", Parent: &Table{Name: "0_1_1"}},
}},
{Name: "0_1_2", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_2_1", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_2", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_3", Parent: &Table{Name: "0_1_2"}},
}},
{Name: "0_1_3", Parent: &Table{Name: "0_1"}},
}},
{Name: "0_2", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_2_1", Parent: &Table{Name: "0_2"}},
{Name: "0_2_2", Parent: &Table{Name: "0_2"}},
}},
{Name: "0_3", Parent: &Table{Name: "0"}},
}},
{Name: "1", Relations: []*Table{
{Name: "1_1", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_1_1", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_1_1", Parent: &Table{Name: "1_1_1"}},
{Name: "1_1_1_2", Parent: &Table{Name: "1_1_1"}, Relations: []*Table{
{Name: "1_1_1_2_1", Parent: &Table{Name: "1_1_1_2"}},
{Name: "1_1_1_2_2", Parent: &Table{Name: "1_1_1_2"}},
}},
{Name: "1_1_1_3", Parent: &Table{Name: "1_1_1"}},
}},
{Name: "1_1_2", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_2_1", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_2", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_3", Parent: &Table{Name: "1_1_2"}},
}},
{Name: "1_1_3", Parent: &Table{Name: "1_1"}},
}},
{Name: "1_2", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_2_1", Parent: &Table{Name: "1_2"}},
{Name: "1_2_2", Parent: &Table{Name: "1_2"}},
}},
{Name: "1_3", Parent: &Table{Name: "1"}},
}},
},
configurationTables: []string{"1_1_1_2"},
want: []string{"1", "1_1", "1_1_1", "1_1_1_2", "1_1_1_2_1", "1_1_1_2_2"},
},
{
name: "when specifying a descendant table, return the parents and only the specified descendant if skip_dependent_tables is true",
tables: []*Table{
{Name: "0", Relations: []*Table{
{Name: "0_1", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_1_1", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_1_1", Parent: &Table{Name: "0_1_1"}},
{Name: "0_1_1_2", Parent: &Table{Name: "0_1_1"}, Relations: []*Table{
{Name: "0_1_1_2_1", Parent: &Table{Name: "0_1_1_2"}},
{Name: "0_1_1_2_2", Parent: &Table{Name: "0_1_1_2"}},
}},
{Name: "0_1_1_3", Parent: &Table{Name: "0_1_1"}},
}},
{Name: "0_1_2", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_2_1", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_2", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_3", Parent: &Table{Name: "0_1_2"}},
}},
{Name: "0_1_3", Parent: &Table{Name: "0_1"}},
}},
{Name: "0_2", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_2_1", Parent: &Table{Name: "0_2"}},
{Name: "0_2_2", Parent: &Table{Name: "0_2"}},
}},
{Name: "0_3", Parent: &Table{Name: "0"}},
}},
{Name: "1", Relations: []*Table{
{Name: "1_1", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_1_1", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_1_1", Parent: &Table{Name: "1_1_1"}},
{Name: "1_1_1_2", Parent: &Table{Name: "1_1_1"}, Relations: []*Table{
{Name: "1_1_1_2_1", Parent: &Table{Name: "1_1_1_2"}},
{Name: "1_1_1_2_2", Parent: &Table{Name: "1_1_1_2"}},
}},
{Name: "1_1_1_3", Parent: &Table{Name: "1_1_1"}},
}},
{Name: "1_1_2", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_2_1", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_2", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_3", Parent: &Table{Name: "1_1_2"}},
}},
{Name: "1_1_3", Parent: &Table{Name: "1_1"}},
}},
{Name: "1_2", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_2_1", Parent: &Table{Name: "1_2"}},
{Name: "1_2_2", Parent: &Table{Name: "1_2"}},
}},
{Name: "1_3", Parent: &Table{Name: "1"}},
}},
},
configurationTables: []string{"1_1_1_2"},
skipDependentTables: true,
want: []string{"1", "1_1", "1_1_1", "1_1_1_2"},
},
{
name: "skip child tables if skip_dependent_tables is true",
tables: []*Table{
Expand Down