Default to JToken instead of JObject (#5477)

NinoFloris · web-flow · commit b10cc19d78ae · 2024-01-17T20:39:23.000+01:00
Fixes #5475
diff --git a/src/Npgsql.Json.NET/Internal/JsonNetTypeInfoResolverFactory.cs b/src/Npgsql.Json.NET/Internal/JsonNetTypeInfoResolverFactory.cs
@@ -33,11 +33,10 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings,
             foreach (var dataTypeName in new[] { "jsonb", "json" })
             {
                 var jsonb = dataTypeName == "jsonb";
-                mappings.AddType<JObject>(dataTypeName, (options, mapping, _) =>
-                    mapping.CreateInfo(options, new JsonNetJsonConverter<JObject>(jsonb, options.TextEncoding, settings)),
-                    isDefault: true);
                 mappings.AddType<JToken>(dataTypeName, (options, mapping, _) =>
-                    mapping.CreateInfo(options, new JsonNetJsonConverter<JToken>(jsonb, options.TextEncoding, settings)));
+                    mapping.CreateInfo(options, new JsonNetJsonConverter<JToken>(jsonb, options.TextEncoding, settings)), isDefault: true);
+                mappings.AddType<JObject>(dataTypeName, (options, mapping, _) =>
+                    mapping.CreateInfo(options, new JsonNetJsonConverter<JObject>(jsonb, options.TextEncoding, settings)));
                 mappings.AddType<JArray>(dataTypeName, (options, mapping, _) =>
                     mapping.CreateInfo(options, new JsonNetJsonConverter<JArray>(jsonb, options.TextEncoding, settings)));
                 mappings.AddType<JValue>(dataTypeName, (options, mapping, _) =>
diff --git a/test/Npgsql.PluginTests/JsonNetTests.cs b/test/Npgsql.PluginTests/JsonNetTests.cs
@@ -194,14 +194,42 @@ public class Bug3464Class
         public string? SomeString { get; set; }
     }
 
+    [Test, IssueLink("https://github.com/npgsql/npgsql/issues/5475")]
+    public async Task Read_jarray_from_get_value()
+    {
+        await using var conn = await JsonDataSource.OpenConnectionAsync();
+
+        await using var cmd = new NpgsqlCommand { Connection = conn };
+
+        var json = new JArray(new JObject { { "name", "value1" } });
+
+        cmd.CommandText = $"SELECT @p";
+        cmd.Parameters.Add(new("p", json));
+        await cmd.ExecuteScalarAsync();
+    }
     [Test]
-    [IssueLink("https://github.com/npgsql/npgsql/issues/4537")]
-    public async Task Write_jobject_array_without_npgsqldbtype()
+    public async Task Write_jobject_without_npgsqldbtype()
     {
-        // By default we map JObject to jsonb
-        if (!IsJsonb)
-            return;
+        await using var conn = await JsonDataSource.OpenConnectionAsync();
+        var tableName = await TestUtil.CreateTempTable(conn, "key SERIAL PRIMARY KEY, ingredients json");
 
+        await using var cmd = new NpgsqlCommand { Connection = conn };
+
+        var jsonObject = new JObject
+        {
+            { "name", "value1" },
+            { "amount", 1 },
+            { "unit", "ml" }
+        };
+
+        cmd.CommandText = $"INSERT INTO {tableName} (ingredients) VALUES (@p)";
+        cmd.Parameters.Add(new("p", jsonObject));
+        await cmd.ExecuteNonQueryAsync();
+    }
+
+    [Test, IssueLink("https://github.com/npgsql/npgsql/issues/4537")]
+    public async Task Write_jobject_array_without_npgsqldbtype()
+    {
         await using var conn = await JsonDataSource.OpenConnectionAsync();
         var tableName = await TestUtil.CreateTempTable(conn, "key SERIAL PRIMARY KEY, ingredients json[]");
 
