From dab120d69400414c07825961723601430bedba99 Mon Sep 17 00:00:00 2001
From: Mohammed Numaan <138296610+mohammednumaan@users.noreply.github.com>
Date: Mon, 19 Oct 2026 18:18:37 +0530
Subject: [PATCH] fix: handle rows.Err() in getDatabases to prevent partial
 results.

---
 pkg/cluster/database.go      |   5 ++
 pkg/cluster/database_test.go | 136 +++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 pkg/cluster/database_test.go

diff --git a/pkg/cluster/database.go b/pkg/cluster/database.go
index d46dc6067..8fd1149ec 100644
--- a/pkg/cluster/database.go
+++ b/pkg/cluster/database.go
@@ -352,6 +352,7 @@ func (c *Cluster) getDatabases() (dbs map[string]string, err error) {
 	dbs = make(map[string]string)
 
 	for rows.Next() {
+
 		var datname, owner string
 
 		if err = rows.Scan(&datname, &owner); err != nil {
@@ -360,6 +361,10 @@ func (c *Cluster) getDatabases() (dbs map[string]string, err error) {
 		dbs[datname] = owner
 	}
 
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("error when iterating database rows: %v", err)
+	}
+
 	return dbs, err
 }
 
diff --git a/pkg/cluster/database_test.go b/pkg/cluster/database_test.go
new file mode 100644
index 000000000..016c6ac9f
--- /dev/null
+++ b/pkg/cluster/database_test.go
@@ -0,0 +1,136 @@
+package cluster
+
+import (
+	"context"
+	"database/sql"
+	"database/sql/driver"
+	"errors"
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// this is a mock struct that represents
+// the Connector interface from the database/sql/driver package
+type mockConnector struct {
+	rows driver.Rows
+}
+
+func (m *mockConnector) Connect(context.Context) (driver.Conn, error) {
+	return &mockConn{rows: m.rows}, nil
+}
+
+func (m *mockConnector) Driver() driver.Driver {
+	return nil
+}
+
+// this is a mock struct that represents
+// the Connection interface from the database/sql/driver package
+type mockConn struct {
+	rows driver.Rows
+}
+
+func (m *mockConn) Prepare(query string) (driver.Stmt, error) {
+	return nil, nil
+}
+
+func (m *mockConn) Begin() (driver.Tx, error) {
+	return nil, nil
+}
+
+func (m *mockConn) Close() error {
+	return nil
+}
+
+// the reason we need this is because sql.DB.Query calls QueryerContext
+// here the fakeConn is implicitly implementing the QueryerContext interface
+func (m *mockConn) QueryContext(context.Context, string, []driver.NamedValue) (driver.Rows, error) {
+	return m.rows, nil
+}
+
+// this is the mock struct that represents
+// the Rows interface from the database/sql/driver package
+type fakeRows struct {
+	rows    [][]driver.Value
+	rowErrs map[int]error
+	pos     int
+}
+
+func (f *fakeRows) Columns() []string {
+	return []string{"datname", "owner"}
+}
+
+func (f *fakeRows) Close() error {
+	return nil
+}
+
+func (f *fakeRows) Next(dest []driver.Value) error {
+	if f.pos >= len(f.rows) {
+		return io.EOF
+	}
+
+	if err := f.rowErrs[f.pos]; err != nil {
+		f.pos++
+		return err
+	}
+
+	copy(dest, f.rows[f.pos])
+	f.pos++
+	return nil
+}
+
+func TestGetDatabases(t *testing.T) {
+	tests := []struct {
+		name    string
+		rows    *fakeRows
+		want    map[string]string
+		wantErr string
+	}{
+		{
+			name: "success",
+			rows: &fakeRows{
+				rows: [][]driver.Value{
+					{"postgres", "postgres"},
+					{"test_db", "test_owner"},
+				},
+			},
+			want: map[string]string{
+				"postgres": "postgres",
+				"test_db":  "test_owner",
+			},
+		},
+		{
+			name: "partial result returns error",
+			rows: &fakeRows{
+				rows: [][]driver.Value{
+					{"postgres", "postgres"},
+					{"test_db", "test_owner"},
+				},
+				rowErrs: map[int]error{1: errors.New("connection reset")},
+			},
+			wantErr: "error when iterating database rows",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			db := sql.OpenDB(&mockConnector{rows: tt.rows})
+			defer db.Close()
+
+			c := &Cluster{pgDb: db}
+			got, err := c.getDatabases()
+
+			if tt.wantErr != "" {
+				require.Error(t, err)
+				assert.Contains(t, err.Error(), tt.wantErr)
+				assert.Nil(t, got)
+				return
+			}
+
+			require.NoError(t, err)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}