From db7600a8220295b0e637592839a0d61e6883a39d Mon Sep 17 00:00:00 2001 From: Nick Tobey Date: Thu, 27 Apr 2023 15:53:00 -0700 Subject: [PATCH] Move IgnoredTables into ignore_patterns.go --- go/libraries/doltcore/doltdb/ignore_patterns.go | 7 +++++++ go/libraries/doltcore/doltdb/root_val.go | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/go/libraries/doltcore/doltdb/ignore_patterns.go b/go/libraries/doltcore/doltdb/ignore_patterns.go index c96d0ae8dd..127f855c33 100644 --- a/go/libraries/doltcore/doltdb/ignore_patterns.go +++ b/go/libraries/doltcore/doltdb/ignore_patterns.go @@ -31,6 +31,13 @@ type ignorePattern struct { ignore bool } +// IgnoredTables contains the results of comparing a series of tables to a set of dolt_ignore patterns. +type IgnoredTables struct { + Ignore []string + DontIgnore []string + Conflicts []DoltIgnoreConflictError +} + // IgnoreResult is an enum containing the result of matching a table name against the list of ignored table patterns type IgnoreResult int diff --git a/go/libraries/doltcore/doltdb/root_val.go b/go/libraries/doltcore/doltdb/root_val.go index 00e98985c1..dea4a4f286 100644 --- a/go/libraries/doltcore/doltdb/root_val.go +++ b/go/libraries/doltcore/doltdb/root_val.go @@ -1055,12 +1055,6 @@ func UnionTableNames(ctx context.Context, roots ...*RootValue) ([]string, error) return tblNames, nil } -type IgnoredTables struct { - Ignore []string - DontIgnore []string - Conflicts []DoltIgnoreConflictError -} - // FilterIgnoredTables takes a slice of table names and divides it into new slices based on whether the table is ignored, not ignored, or matches conflicting ignore patterns. func FilterIgnoredTables(ctx context.Context, tables []string, roots Roots) (ignoredTables IgnoredTables, err error) { ignorePatterns, err := GetIgnoredTablePatterns(ctx, roots)