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

Jump to bottom

sql/internal/sqlx: support exclude funcs and procs #2208

Merged
merged 1 commit into from
Oct 24, 2023
Merged

sql/internal/sqlx: support exclude funcs and procs #2208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 26 additions & 6 deletions sql/internal/sqlx/exclude.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,24 @@ func excludeS(s *schema.Schema, glob []string) error {
}
s.Views = views
}
if globF, exclude := excludeType(typeFn, glob[0]); exclude {
var err error
s.Funcs, err = filter(s.Funcs, func(f *schema.Func) (bool, error) {
return filepath.Match(globF, f.Name)
})
if err != nil {
return err
}
}
if globP, exclude := excludeType(typePr, glob[0]); exclude {
var err error
s.Procs, err = filter(s.Procs, func(p *schema.Proc) (bool, error) {
return filepath.Match(globP, p.Name)
})
if err != nil {
return err
}
}
return nil
}

Expand Down Expand Up @@ -198,12 +216,14 @@ func excludeV(t *schema.View, pattern string) (err error) {
}

const (
typeV = "view"
typeT = "table"
typeC = "column"
typeI = "index"
typeF = "fk"
typeK = "check"
typeV = "view"
typeT = "table"
typeC = "column"
typeI = "index"
typeF = "fk"
typeK = "check"
typeFn = "function"
typePr = "procedure"
)

var reTypeVT = regexp.MustCompile(`\[type=([a-z|]+)+\]$`)
Expand Down
26 changes: 26 additions & 0 deletions sql/internal/sqlx/exclude_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,38 @@ func TestExcludeRealm_Selector(t *testing.T) {
).
AddViews(
schema.NewView("v1", "SELECT * FROM t1"),
).
AddFuncs(
&schema.Func{Name: "f1"},
&schema.Func{Name: "f2"},
&schema.Func{Name: "f3"},
).
AddProcs(
&schema.Proc{Name: "p1"},
&schema.Proc{Name: "p2"},
&schema.Proc{Name: "p3"},
),
)
r, err := ExcludeRealm(r, []string{"*.*[type=table]"})
require.NoError(t, err)
require.Empty(t, r.Schemas[0].Tables)
require.Len(t, r.Schemas[0].Views, 1)

r, err = ExcludeRealm(r, []string{"*.f1[type=function]"})
require.NoError(t, err)
require.Len(t, r.Schemas[0].Funcs, 2)
require.Equal(t, []string{"f2", "f3"}, []string{r.Schemas[0].Funcs[0].Name, r.Schemas[0].Funcs[1].Name})

r, err = ExcludeRealm(r, []string{"*.p2[type=procedure]"})
require.NoError(t, err)
require.Len(t, r.Schemas[0].Procs, 2)
require.Equal(t, []string{"p1", "p3"}, []string{r.Schemas[0].Procs[0].Name, r.Schemas[0].Procs[1].Name})

r, err = ExcludeRealm(r, []string{"*.*[type=procedure|function]"})
require.NoError(t, err)
require.Empty(t, r.Schemas[0].Funcs)
require.Empty(t, r.Schemas[0].Procs)

r.Schemas[0].AddTables(
schema.NewTable("t1"),
schema.NewTable("t2"),
Expand Down Expand Up @@ -161,6 +186,7 @@ func TestExcludeRealm_Checks(t *testing.T) {
require.NoError(t, err)
require.Len(t, r.Schemas[0].Tables[0].Attrs, 0)
}

func TestExcludeRealm_Columns(t *testing.T) {
r := schema.NewRealm(
schema.New("s1").AddTables(
Expand Down