Skip to content

Commit f79f1b0

Browse files
authored
Don't error in views if no docs found (#8339)
1 parent f303394 commit f79f1b0

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

db/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ func (c *DatabaseCollection) CountAllDocs(ctx context.Context) (uint64, error) {
811811
Value float64 `json:"value"`
812812
}
813813
err = results.One(ctx, &row)
814-
if err != nil {
814+
if err != nil && !strings.Contains(err.Error(), "No results returned.") {
815815
return 0, err
816816
}
817817
return uint64(row.Value), nil

db/query_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,10 @@ func TestCountAllDocs(t *testing.T) {
539539
defer db.Close(ctx)
540540
collection, ctx := GetSingleDatabaseCollectionWithUser(ctx, t, db)
541541

542+
count, err := collection.CountAllDocs(ctx)
543+
require.NoError(t, err)
544+
assert.Equal(t, uint64(0), count)
545+
542546
// Add some docs
543547
numDocs := 5
544548
var docToDelete *Document
@@ -550,7 +554,7 @@ func TestCountAllDocs(t *testing.T) {
550554
}
551555
}
552556

553-
count, err := collection.CountAllDocs(ctx)
557+
count, err = collection.CountAllDocs(ctx)
554558
require.NoError(t, err)
555559
assert.Equal(t, uint64(numDocs), count)
556560

0 commit comments

Comments
 (0)