diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp index 0b37afd2cc86..bf61ca0e9e85 100644 --- a/src/core/qgsfield.cpp +++ b/src/core/qgsfield.cpp @@ -24,7 +24,6 @@ #include #include #include -#include /*************************************************************************** * This class is considered CRITICAL and any change MUST be accompanied with diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index a3522533f05a..2ec15a8fc98e 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -4221,11 +4221,8 @@ static QVariant parseJson( const QString &txt ) { QVariant result; QJsonDocument jsonResponse = QJsonDocument::fromJson( txt.toUtf8() ); - //it's null when no json format + //it's null if no json format result = jsonResponse.toVariant(); - - //TODO json/jsonb convert toVariantMap from QJsonObject in case it's a map etc. - //we can check there with jsonResponse.isArray if it's an array etc. return result; } diff --git a/tests/testdata/provider/testdata_pg_json.sql b/tests/testdata/provider/testdata_pg_json.sql index e25262de6f5e..6e53dd123d17 100644 --- a/tests/testdata/provider/testdata_pg_json.sql +++ b/tests/testdata/provider/testdata_pg_json.sql @@ -11,5 +11,4 @@ CREATE TABLE qgis_test.json INSERT INTO qgis_test.json(jvalue, jbvalue) VALUES ('[1,2,3]', '[4,5,6]'), - ('{"a":1,"b":2}', '{"c":4,"d":5}'), - ('123', '456'); + ('{"a":1,"b":2}', '{"c":4,"d":5}');