Make the default value for json with Json.NET a string (#5914)

vonzshik · web-flow · commit e038010ae55e · 2024-11-08T21:07:42.000Z
Fixes #5913
diff --git a/src/Npgsql.Json.NET/Internal/JsonNetTypeInfoResolverFactory.cs b/src/Npgsql.Json.NET/Internal/JsonNetTypeInfoResolverFactory.cs
@@ -26,7 +26,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings,
             {
                 var jsonb = dataTypeName == "jsonb";
                 mappings.AddType<JToken>(dataTypeName, (options, mapping, _) =>
-                    mapping.CreateInfo(options, new JsonNetJsonConverter<JToken>(jsonb, options.TextEncoding, settings)), isDefault: true);
+                    mapping.CreateInfo(options, new JsonNetJsonConverter<JToken>(jsonb, options.TextEncoding, settings)));
                 mappings.AddType<JObject>(dataTypeName, (options, mapping, _) =>
                     mapping.CreateInfo(options, new JsonNetJsonConverter<JObject>(jsonb, options.TextEncoding, settings)));
                 mappings.AddType<JArray>(dataTypeName, (options, mapping, _) =>
diff --git a/src/Npgsql/Internal/ResolverFactories/JsonTypeInfoResolverFactory.cs b/src/Npgsql/Internal/ResolverFactories/JsonTypeInfoResolverFactory.cs
@@ -43,8 +43,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings,
                 var jsonb = dataTypeName == DataTypeNames.Jsonb;
                 mappings.AddType<JsonDocument>(dataTypeName, (options, mapping, _) =>
                         mapping.CreateInfo(options,
-                            new JsonConverter<JsonDocument, JsonDocument>(jsonb, options.TextEncoding, serializerOptions)),
-                    isDefault: true);
+                            new JsonConverter<JsonDocument, JsonDocument>(jsonb, options.TextEncoding, serializerOptions)));
                 mappings.AddStructType<JsonElement>(dataTypeName, (options, mapping, _) =>
                     mapping.CreateInfo(options,
                         new JsonConverter<JsonElement, JsonElement>(jsonb, options.TextEncoding, serializerOptions)));
diff --git a/test/Npgsql.PluginTests/JsonNetTests.cs b/test/Npgsql.PluginTests/JsonNetTests.cs
@@ -38,7 +38,7 @@ public Task Roundtrip_string()
             @"{""p"": 1}",
             _pgTypeName,
             npgsqlDbType,
-            isDefault: false,
+            isDefaultForWriting: false,
             isNpgsqlDbTypeInferredFromClrType: false);
 
     [Test, IssueLink("https://github.com/npgsql/npgsql/issues/3085")]

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings,`
`26`	`26`	`{`
`27`	`27`	`var jsonb = dataTypeName == "jsonb";`
`28`	`28`	`mappings.AddType<JToken>(dataTypeName, (options, mapping, _) =>`
`29`		`- mapping.CreateInfo(options, new JsonNetJsonConverter<JToken>(jsonb, options.TextEncoding, settings)), isDefault: true);`
	`29`	`+ mapping.CreateInfo(options, new JsonNetJsonConverter<JToken>(jsonb, options.TextEncoding, settings)));`
`30`	`30`	`mappings.AddType<JObject>(dataTypeName, (options, mapping, _) =>`
`31`	`31`	`mapping.CreateInfo(options, new JsonNetJsonConverter<JObject>(jsonb, options.TextEncoding, settings)));`
`32`	`32`	`mappings.AddType<JArray>(dataTypeName, (options, mapping, _) =>`