Fix CountAuthorizedAuditLogs query impl

coder · kacpersaw · Jul 1, 2025 · Jun 25, 2025 · Jun 26, 2025 · Jun 26, 2025
commit 0587a914fc7d6005f212635a7034fdad8ddaabd2
diff --git a/coderd/database/dbauthz/setup_test.go b/coderd/database/dbauthz/setup_test.go
@@ -296,7 +296,7 @@ func (s *MethodTestSuite) NotAuthorizedErrorTest(ctx context.Context, az *coderd
 		resp, err := callMethod(ctx)
 
 		// This is unfortunate, but if we are using `Filter` the error returned will be nil. So filter out
-		// any case where the error is nil and the response is an empty slice.
+		// any case where the error is nil and the response is an empty slice or int64(0).
 		if err != nil || !hasEmptyResponse(resp) {
 			if testCase.cancelledCtxExpect == "" {
 				s.Errorf(err, "method should an error with cancellation")

diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -598,7 +598,9 @@ func (q *sqlQuerier) CountAuthorizedAuditLogs(ctx context.Context, arg CountAudi
 	defer rows.Close()
 	var count int64
 	for rows.Next() {
-		count++
+		if err := rows.Scan(&count); err != nil {
+			return 0, err
+		}
 	}
 	if err := rows.Close(); err != nil {
 		return 0, err