Skip to content

Commit e2c4876

Browse files
committed
rule: remove duplicate filters in squashed ref_commits
Signed-off-by: Javi Fontan <[email protected]>
1 parent c9d114a commit e2c4876

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

internal/rule/squashjoins.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ func buildSquashedTable(
395395
var refIt gitbase.RefsIter
396396

397397
if index == nil {
398-
f, err = transferFilters(
398+
f, filters, err = transferFilters(
399399
filters,
400400
gitbase.RefCommitsTableName,
401401
gitbase.ReferencesTableName,
@@ -1623,9 +1623,14 @@ func transferFilters(
16231623
from, to string,
16241624
schema sql.Schema,
16251625
columns ...string,
1626-
) (sql.Expression, error) {
1627-
f, _ := filtersForColumns(filters, from, columns...)
1628-
return fixFieldTable(expression.JoinAnd(f...), to, schema)
1626+
) (sql.Expression, []sql.Expression, error) {
1627+
f, r := filtersForColumns(filters, from, columns...)
1628+
fixed, err := fixFieldTable(expression.JoinAnd(f...), to, schema)
1629+
if err != nil {
1630+
return nil, nil, err
1631+
}
1632+
1633+
return fixed, r, err
16291634
}
16301635

16311636
func fixFieldTable(

0 commit comments

Comments
 (0)