root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 142 Packages Projects Releases Wiki Activity

PostgreSQL: Check for null in JSON columns (#111747)

This commit is contained in:
Zoltán Bedi 2025-09-29 18:28:07 +02:00 committed by GitHub
parent 52eaa77bdd
commit 117e357cc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 301 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/tsdb/grafana-postgresql-datasource/postgres_pgx_snapshot_test.go
View File

@ -127,6 +127,7 @@ func TestIntegrationPostgresPGXSnapshots(t *testing.T) {
{format: "table", name: "types_datetime_pgx"},
{format: "table", name: "types_other"},
{format: "table", name: "types_enum"},
{format: "table", name: "types_jsonb"},
{format: "table", name: "timestamp_convert_bigint"},
{format: "table", name: "timestamp_convert_integer"},
{format: "table", name: "timestamp_convert_real"},

4
pkg/tsdb/grafana-postgresql-datasource/sqleng/sql_engine_pgx.go
View File

@ -550,6 +550,10 @@ func convertPostgresValue(rawValue []byte, fd pgconn.FieldDescription, m *pgtype
if err != nil {
return nil, err
}
// Handle null JSON values
if d == nil {
return nil, nil
}
j := json.RawMessage(*d)
return &j, nil
default:

277
pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_jsonb.golden.jsonc vendored Normal file
View File

@ -0,0 +1,277 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0] {
// "typeVersion": [
// 0,
// 0
// ],
// "executedQueryString": "SELECT * FROM tbl"
// }
// Name:
// Dimensions: 9 Fields by 4 Rows
// +----------------+---------------------------------------------------------------+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------+-----------------------------------------------------------------------------+--------------------------+--------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
// | Name: id | Name: simple_json | Name: simple_json_nn | Name: complex_json | Name: array_json | Name: nested_json | Name: empty_json | Name: null_json | Name: network_response |
// | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: |
// | Type: []*int32 | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []*json.RawMessage |
// +----------------+---------------------------------------------------------------+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------+-----------------------------------------------------------------------------+--------------------------+--------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
// | 1 | {"key": "value"} | {"status": "active"} | {"user": {"id": 123, "name": "John Doe", "email": "john@example.com"}, "metadata": {"tags": ["user", "active"], "created": "2023-01-01"}} | [1, 2, 3, "test"] | {"level1": {"level2": {"level3": {"data": "deep"}}}} | {} | null | {"code": "network_error", "message": "The restore request was not successful The request failed because the MSISDN does not exist in the PPS."} |
// | 2 | {"number": 42, "boolean": true} | {"status": "inactive"} | {"product": {"id": "abc-123", "price": 99.99, "available": true}, "inventory": {"count": 5, "warehouse": "US-WEST"}} | [] | {"config": {"database": {"ssl": false, "host": "localhost", "port": 5432}}} | [] | null | {"code": "network_error", "message": "The imei for the device 007abee2-2105-459b-b4a9-d218c8180a84 could not be found"} |
// | 3 | null | {"status": "pending"} | null | [{"id": 1, "name": "item1"}, {"id": 2, "name": "item2"}] | null | {"empty": {}} | null | [] |
// | 4 | {"special_chars": "test with spaces and symbols: !@#$%^&*()"} | {"unicode": "测试 🚀 émojis"} | {"error": {"code": 500, "details": {"timestamp": "2023-12-24T14:30:00Z", "stack_trace": "Error at line 42"}, "message": "Internal server error"}} | [null, true, false, 0, "", {}] | {"a": {"b": {"c": {"d": {"e": "very deep nesting"}}}}} | null | null | {"code": "network_error", "message": "The imei for the device cdfd9055-3b61-46f3-945a-dfd0f6aa4f27 could not be found"} |
// +----------------+---------------------------------------------------------------+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------+-----------------------------------------------------------------------------+--------------------------+--------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
//
//
// 🌟 This was machine generated. Do not edit. 🌟
{
"status": 200,
"frames": [
{
"schema": {
"meta": {
"typeVersion": [
0,
0
],
"executedQueryString": "SELECT * FROM tbl"
},
"fields": [
{
"name": "id",
"type": "number",
"typeInfo": {
"frame": "int32",
"nullable": true
}
},
{
"name": "simple_json",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage",
"nullable": true
}
},
{
"name": "simple_json_nn",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage",
"nullable": true
}
},
{
"name": "complex_json",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage",
"nullable": true
}
},
{
"name": "array_json",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage",
"nullable": true
}
},
{
"name": "nested_json",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage",
"nullable": true
}
},
{
"name": "empty_json",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage",
"nullable": true
}
},
{
"name": "null_json",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage",
"nullable": true
}
},
{
"name": "network_response",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage",
"nullable": true
}
}
]
},
"data": {
"values": [
[
1,
2,
3,
4
],
[
{
"key": "value"
},
{
"number": 42,
"boolean": true
},
null,
{
"special_chars": "test with spaces and symbols: !@#$%^\u0026*()"
}
],
[
{
"status": "active"
},
{
"status": "inactive"
},
{
"status": "pending"
},
{
"unicode": "测试 🚀 émojis"
}
],
[
{
"user": {
"id": 123,
"name": "John Doe",
"email": "john@example.com"
},
"metadata": {
"tags": [
"user",
"active"
],
"created": "2023-01-01"
}
},
{
"product": {
"id": "abc-123",
"price": 99.99,
"available": true
},
"inventory": {
"count": 5,
"warehouse": "US-WEST"
}
},
null,
{
"error": {
"code": 500,
"details": {
"timestamp": "2023-12-24T14:30:00Z",
"stack_trace": "Error at line 42"
},
"message": "Internal server error"
}
}
],
[
[
1,
2,
3,
"test"
],
[],
[
{
"id": 1,
"name": "item1"
},
{
"id": 2,
"name": "item2"
}
],
[
null,
true,
false,
0,
"",
{}
]
],
[
{
"level1": {
"level2": {
"level3": {
"data": "deep"
}
}
}
},
{
"config": {
"database": {
"ssl": false,
"host": "localhost",
"port": 5432
}
}
},
null,
{
"a": {
"b": {
"c": {
"d": {
"e": "very deep nesting"
}
}
}
}
}
],
[
{},
[],
{
"empty": {}
},
null
],
[
null,
null,
null,
null
],
[
{
"code": "network_error",
"message": "The restore request was not successful The request failed because the MSISDN does not exist in the PPS."
},
{
"code": "network_error",
"message": "The imei for the device 007abee2-2105-459b-b4a9-d218c8180a84 could not be found"
},
[],
{
"code": "network_error",
"message": "The imei for the device cdfd9055-3b61-46f3-945a-dfd0f6aa4f27 could not be found"
}
]
]
}
}
]
}

19
pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_jsonb.sql vendored Normal file
View File

@ -0,0 +1,19 @@
-- SELECT * FROM tbl
-- test jsonb data types including complex structures and edge cases
CREATE TEMPORARY TABLE tbl (
id integer,
simple_json jsonb,
simple_json_nn jsonb NOT NULL,
complex_json jsonb,
array_json jsonb,
nested_json jsonb,
empty_json jsonb,
null_json jsonb,
network_response jsonb
);
INSERT INTO tbl (id, simple_json, simple_json_nn, complex_json, array_json, nested_json, empty_json, null_json, network_response) VALUES
(1, '{"key": "value"}', '{"status": "active"}', '{"user": {"id": 123, "name": "John Doe", "email": "john@example.com"}, "metadata": {"created": "2023-01-01", "tags": ["user", "active"]}}', '[1, 2, 3, "test"]', '{"level1": {"level2": {"level3": {"data": "deep"}}}}', '{}', 'null', '{"code": "network_error", "message": "The restore request was not successful The request failed because the MSISDN does not exist in the PPS."}'),
(2, '{"number": 42, "boolean": true}', '{"status": "inactive"}', '{"product": {"id": "abc-123", "price": 99.99, "available": true}, "inventory": {"count": 5, "warehouse": "US-WEST"}}', '[]', '{"config": {"database": {"host": "localhost", "port": 5432, "ssl": false}}}', '[]', NULL, '{"code": "network_error", "message": "The imei for the device 007abee2-2105-459b-b4a9-d218c8180a84 could not be found"}'),
(3, NULL, '{"status": "pending"}', NULL, '[{"id": 1, "name": "item1"}, {"id": 2, "name": "item2"}]', NULL, '{"empty": {}}', 'null', '[]'),
(4, '{"special_chars": "test with spaces and symbols: !@#$%^&*()"}', '{"unicode": "测试 🚀 émojis"}', '{"error": {"code": 500, "message": "Internal server error", "details": {"stack_trace": "Error at line 42", "timestamp": "2023-12-24T14:30:00Z"}}}', '[null, true, false, 0, "", {}]', '{"a": {"b": {"c": {"d": {"e": "very deep nesting"}}}}}', 'null', 'null', '{"code": "network_error", "message": "The imei for the device cdfd9055-3b61-46f3-945a-dfd0f6aa4f27 could not be found"}');