PostgreSQL: Remove feature toggle postgresDSUsePGX (#113675)

* PostgreSQL: Remove feature toggle `postgresDSUsePGX` * Fix tests and linting * Address review comments
2025-11-24 10:26:41 +01:00
parent 39dc659ad8
commit 8d75d79313
34 changed files with 1176 additions and 5165 deletions
@@ -9,6 +9,8 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
+	"github.com/jackc/pgx/v5/pgconn"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

@@ -425,6 +427,246 @@ func TestSQLEngine(t *testing.T) {
 	})
 }

+func TestConvertResultsToFrame(t *testing.T) {
+	// Import the pgx packages needed for testing
+	// These imports are included in the main file but need to be accessible for tests
+	t.Run("convertResultsToFrame with single result", func(t *testing.T) {
+		// Create mock field descriptions
+		fieldDescs := []pgconn.FieldDescription{
+			{Name: "id", DataTypeOID: pgtype.Int4OID},
+			{Name: "name", DataTypeOID: pgtype.TextOID},
+			{Name: "value", DataTypeOID: pgtype.Float8OID},
+		}
+
+		// Create mock result data
+		mockRows := [][][]byte{
+			{[]byte("1"), []byte("test1"), []byte("10.5")},
+			{[]byte("2"), []byte("test2"), []byte("20.7")},
+		}
+
+		// Create mock result
+		result := &pgconn.Result{
+			FieldDescriptions: fieldDescs,
+			Rows:              mockRows,
+		}
+		result.CommandTag = pgconn.NewCommandTag("SELECT 2")
+
+		results := []*pgconn.Result{result}
+
+		frame, err := convertResultsToFrame(results, 1000)
+		require.NoError(t, err)
+		require.NotNil(t, frame)
+		require.Equal(t, 3, len(frame.Fields))
+		require.Equal(t, 2, frame.Rows())
+
+		// Verify field names
+		require.Equal(t, "id", frame.Fields[0].Name)
+		require.Equal(t, "name", frame.Fields[1].Name)
+		require.Equal(t, "value", frame.Fields[2].Name)
+	})
+
+	t.Run("convertResultsToFrame with multiple compatible results", func(t *testing.T) {
+		// Create mock field descriptions (same structure for both results)
+		fieldDescs := []pgconn.FieldDescription{
+			{Name: "id", DataTypeOID: pgtype.Int4OID},
+			{Name: "name", DataTypeOID: pgtype.TextOID},
+		}
+
+		// Create first result
+		mockRows1 := [][][]byte{
+			{[]byte("1"), []byte("test1")},
+			{[]byte("2"), []byte("test2")},
+		}
+		result1 := &pgconn.Result{
+			FieldDescriptions: fieldDescs,
+			Rows:              mockRows1,
+		}
+		result1.CommandTag = pgconn.NewCommandTag("SELECT 2")
+
+		// Create second result with same structure
+		mockRows2 := [][][]byte{
+			{[]byte("3"), []byte("test3")},
+			{[]byte("4"), []byte("test4")},
+		}
+		result2 := &pgconn.Result{
+			FieldDescriptions: fieldDescs,
+			Rows:              mockRows2,
+		}
+		result2.CommandTag = pgconn.NewCommandTag("SELECT 2")
+
+		results := []*pgconn.Result{result1, result2}
+
+		frame, err := convertResultsToFrame(results, 1000)
+		require.NoError(t, err)
+		require.NotNil(t, frame)
+		require.Equal(t, 2, len(frame.Fields))
+		require.Equal(t, 4, frame.Rows()) // Should have rows from both results
+
+		// Verify field names
+		require.Equal(t, "id", frame.Fields[0].Name)
+		require.Equal(t, "name", frame.Fields[1].Name)
+	})
+
+	t.Run("convertResultsToFrame with row limit", func(t *testing.T) {
+		// Create mock field descriptions
+		fieldDescs := []pgconn.FieldDescription{
+			{Name: "id", DataTypeOID: pgtype.Int4OID},
+		}
+
+		// Create mock result data with 3 rows
+		mockRows := [][][]byte{
+			{[]byte("1")},
+			{[]byte("2")},
+			{[]byte("3")},
+		}
+
+		result := &pgconn.Result{
+			FieldDescriptions: fieldDescs,
+			Rows:              mockRows,
+		}
+		result.CommandTag = pgconn.NewCommandTag("SELECT 3")
+
+		results := []*pgconn.Result{result}
+
+		// Set row limit to 2
+		frame, err := convertResultsToFrame(results, 2)
+		require.NoError(t, err)
+		require.NotNil(t, frame)
+		require.Equal(t, 1, len(frame.Fields))
+		require.Equal(t, 2, frame.Rows()) // Should be limited to 2 rows
+
+		// Should have a notice about the limit
+		require.NotNil(t, frame.Meta)
+		require.Len(t, frame.Meta.Notices, 1)
+		require.Contains(t, frame.Meta.Notices[0].Text, "Results have been limited to 2")
+	})
+
+	t.Run("convertResultsToFrame with mixed SELECT and non-SELECT results", func(t *testing.T) {
+		// Create a non-SELECT result (should be skipped)
+		nonSelectResult := &pgconn.Result{}
+		nonSelectResult.CommandTag = pgconn.NewCommandTag("UPDATE 1")
+
+		// Create a SELECT result
+		fieldDescs := []pgconn.FieldDescription{
+			{Name: "id", DataTypeOID: pgtype.Int4OID},
+		}
+		mockRows := [][][]byte{
+			{[]byte("1")},
+		}
+		selectResult := &pgconn.Result{
+			FieldDescriptions: fieldDescs,
+			Rows:              mockRows,
+		}
+		selectResult.CommandTag = pgconn.NewCommandTag("SELECT 1")
+
+		results := []*pgconn.Result{nonSelectResult, selectResult}
+
+		frame, err := convertResultsToFrame(results, 1000)
+		require.NoError(t, err)
+		require.NotNil(t, frame)
+		require.Equal(t, 1, len(frame.Fields))
+		require.Equal(t, 1, frame.Rows())
+	})
+
+	t.Run("convertResultsToFrame with no SELECT results", func(t *testing.T) {
+		// Create only non-SELECT results
+		result1 := &pgconn.Result{}
+		result1.CommandTag = pgconn.NewCommandTag("UPDATE 1")
+
+		result2 := &pgconn.Result{}
+		result2.CommandTag = pgconn.NewCommandTag("INSERT 1")
+
+		results := []*pgconn.Result{result1, result2}
+
+		frame, err := convertResultsToFrame(results, 1000)
+		require.NoError(t, err)
+		require.NotNil(t, frame)
+		require.Equal(t, 0, len(frame.Fields))
+		require.Equal(t, 0, frame.Rows())
+	})
+
+	t.Run("convertResultsToFrame with multiple results and row limit per result", func(t *testing.T) {
+		// Create mock field descriptions (same structure for both results)
+		fieldDescs := []pgconn.FieldDescription{
+			{Name: "id", DataTypeOID: pgtype.Int4OID},
+		}
+
+		// Create first result with 3 rows
+		mockRows1 := [][][]byte{
+			{[]byte("1")},
+			{[]byte("2")},
+			{[]byte("3")},
+		}
+		result1 := &pgconn.Result{
+			FieldDescriptions: fieldDescs,
+			Rows:              mockRows1,
+		}
+		result1.CommandTag = pgconn.NewCommandTag("SELECT 3")
+
+		// Create second result with 3 rows
+		mockRows2 := [][][]byte{
+			{[]byte("4")},
+			{[]byte("5")},
+			{[]byte("6")},
+		}
+		result2 := &pgconn.Result{
+			FieldDescriptions: fieldDescs,
+			Rows:              mockRows2,
+		}
+		result2.CommandTag = pgconn.NewCommandTag("SELECT 3")
+
+		results := []*pgconn.Result{result1, result2}
+
+		// Set row limit to 2 (should limit each result to 2 rows)
+		frame, err := convertResultsToFrame(results, 2)
+		require.NoError(t, err)
+		require.NotNil(t, frame)
+		require.Equal(t, 1, len(frame.Fields))
+		require.Equal(t, 4, frame.Rows()) // 2 rows from each result
+
+		// Should have notices about the limit from both results
+		require.NotNil(t, frame.Meta)
+		require.Len(t, frame.Meta.Notices, 2)
+		require.Contains(t, frame.Meta.Notices[0].Text, "Results have been limited to 2")
+		require.Contains(t, frame.Meta.Notices[1].Text, "Results have been limited to 2")
+	})
+
+	t.Run("convertResultsToFrame handles null values correctly", func(t *testing.T) {
+		// Create mock field descriptions
+		fieldDescs := []pgconn.FieldDescription{
+			{Name: "id", DataTypeOID: pgtype.Int4OID},
+			{Name: "name", DataTypeOID: pgtype.TextOID},
+		}
+
+		// Create mock result data with null values
+		mockRows := [][][]byte{
+			{[]byte("1"), nil},     // null name
+			{nil, []byte("test2")}, // null id
+		}
+
+		result := &pgconn.Result{
+			FieldDescriptions: fieldDescs,
+			Rows:              mockRows,
+		}
+		result.CommandTag = pgconn.NewCommandTag("SELECT 2")
+
+		results := []*pgconn.Result{result}
+
+		frame, err := convertResultsToFrame(results, 1000)
+		require.NoError(t, err)
+		require.NotNil(t, frame)
+		require.Equal(t, 2, len(frame.Fields))
+		require.Equal(t, 2, frame.Rows())
+
+		// Check that null values are handled correctly
+		// The exact representation depends on the field type, but should not panic
+		require.NotPanics(t, func() {
+			frame.Fields[0].At(1) // null id
+			frame.Fields[1].At(0) // null name
+		})
+	})
+}
+
 type testQueryResultTransformer struct {
 	transformQueryErrorWasCalled bool
 }