mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-15 02:52:55 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity

dolt_diff and dolt_status_ignored system tables shouldn't error when a table matches conflicting ignore rules.

Browse Source
This commit is contained in:
Nick Tobey
2026-02-19 00:28:20 -08:00
parent f3de6b7950
commit e27fe4e22b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go/libraries/doltcore/sqle/dtables/status_ignored_table.go
View File

@@ -147,7 +147,8 @@ func newStatusIgnoredItr(ctx *sql.Context, st *StatusIgnoredTable) (*StatusIgnor
if row.isStaged == byte(0) && row.status == newTableStatus && unstagedTableNames[row.tableName] {
tblNameObj := doltdb.TableName{Name: row.tableName}
result, err := ignorePatterns.IsTableNameIgnored(tblNameObj)
if err != nil {
// If a table name has conflicting ignore rules, don't ignore it.
if err != nil && doltdb.AsDoltIgnoreInConflict(err) == nil {
return nil, err
}
if result == doltdb.Ignore {

3
go/libraries/doltcore/sqle/dtables/unscoped_diff_table.go
View File

@@ -255,7 +255,8 @@ func (d *doltDiffWorkingSetRowItr) Next(ctx *sql.Context) (sql.Row, error) {
if changeSet == "WORKING" && tableDelta.IsAdd() {
tblName := doltdb.TableName{Name: tableDelta.CurName()}
result, err := d.ignorePatterns.IsTableNameIgnored(tblName)
if err != nil {
// If a table name has conflicting ignore rules, don't ignore it.
if err != nil && doltdb.AsDoltIgnoreInConflict(err) == nil {
return nil, err
}
if result == doltdb.Ignore {