Skip to content

Commit 6e91935

Browse files
committed
fix page 0 and 1 returning same results
1 parent b01a3cd commit 6e91935

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

internal/storage/clickhouse.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@ func (c *ClickHouseConnector) GetAggregations(table string, qf QueryFilter) (Que
515515
}
516516

517517
// Add limit clause
518-
if qf.Page > 0 && qf.Limit > 0 {
519-
offset := (qf.Page - 1) * qf.Limit
518+
if qf.Page >= 0 && qf.Limit > 0 {
519+
offset := qf.Page * qf.Limit
520520
query += fmt.Sprintf(" LIMIT %d OFFSET %d", qf.Limit, offset)
521521
} else if qf.Limit > 0 {
522522
query += fmt.Sprintf(" LIMIT %d", qf.Limit)
@@ -648,8 +648,8 @@ func (c *ClickHouseConnector) buildQuery(table, columns string, qf QueryFilter)
648648
}
649649

650650
// Add limit clause
651-
if qf.Page > 0 && qf.Limit > 0 {
652-
offset := (qf.Page - 1) * qf.Limit
651+
if qf.Page >= 0 && qf.Limit > 0 {
652+
offset := qf.Page * qf.Limit
653653
query += fmt.Sprintf(" LIMIT %d OFFSET %d", qf.Limit, offset)
654654
} else if qf.Limit > 0 {
655655
query += fmt.Sprintf(" LIMIT %d", qf.Limit)
@@ -1613,8 +1613,8 @@ func (c *ClickHouseConnector) GetTokenTransfers(qf TransfersQueryFilter, fields
16131613
}
16141614

16151615
// Add limit clause
1616-
if qf.Page > 0 && qf.Limit > 0 {
1617-
offset := (qf.Page - 1) * qf.Limit
1616+
if qf.Page >= 0 && qf.Limit > 0 {
1617+
offset := qf.Page * qf.Limit
16181618
query += fmt.Sprintf(" LIMIT %d OFFSET %d", qf.Limit, offset)
16191619
} else if qf.Limit > 0 {
16201620
query += fmt.Sprintf(" LIMIT %d", qf.Limit)
@@ -1704,7 +1704,7 @@ func (c *ClickHouseConnector) GetTokenBalances(qf BalancesQueryFilter, fields ..
17041704
}
17051705

17061706
// Add limit clause
1707-
if qf.Page > 0 && qf.Limit > 0 {
1707+
if qf.Page >= 0 && qf.Limit > 0 {
17081708
offset := qf.Page * qf.Limit
17091709
query += fmt.Sprintf(" LIMIT %d OFFSET %d", qf.Limit, offset)
17101710
} else if qf.Limit > 0 {

0 commit comments

Comments
 (0)