show row count only when paged

querydisplay/display.go

@@ -444,14 +444,16 @@ func displayTable[T queryresult.TimingContainer](ctx context.Context, result *qu
 	t.Render()
 
 	// page out the table
-	ShowPaged(ctx, outbuf.String())
+	showRowCount := ShowPaged(ctx, outbuf.String())
 
-	status := fmt.Sprintf("%s rows", utils.HumanizeNumber(count))
-	if displayRowCount >= maxTableDisplayRows {
-		status += fmt.Sprintf(" (%s shown)", utils.HumanizeNumber(maxTableDisplayRows))
+	if showRowCount {
+		status := fmt.Sprintf("%s %s", utils.HumanizeNumber(count), utils.Pluralize("row", count))
+		if displayRowCount >= maxTableDisplayRows {
+			status += fmt.Sprintf(" (%s shown)", utils.HumanizeNumber(maxTableDisplayRows))
+		}
+		//nolint:forbidigo // acceptable
+		fmt.Println(status)
 	}
-	//nolint:forbidigo // acceptable
-	fmt.Println(status)
 
 	return count, rowErrors
 }

querydisplay/pager.go

@@ -16,16 +16,18 @@ import (
 )
 
 // ShowPaged displays the `content` in a system dependent pager
-func ShowPaged(ctx context.Context, content string) {
+func ShowPaged(ctx context.Context, content string) bool {
 	if isPagerNeeded(content) && (runtime.GOOS == "darwin" || runtime.GOOS == "linux") {
 		nixPager(ctx, content)
+		return true
 	} else {
 		nullPager(content)
+		return false
 	}
 }
 
 func isPagerNeeded(content string) bool {
-	// TODO use option, NOT viper https://github.com/turbot/pipe-fittings/v2/issues/613
+	// TODO use option, NOT viper https://github.com/turbot/pipe-fittings/issues/613
 	// only show pager in interactive mode
 	if !viper.GetBool(constants.ConfigKeyInteractive) {
 		return false