Fix Npgsql{Slim}DataSourceBuilder name translator (#5348)

NinoFloris · web-flow · commit 4ccfcd71b690 · 2023-10-22T19:07:56.000+02:00
Fixes #5345
diff --git a/src/Npgsql/NpgsqlDataSourceBuilder.cs b/src/Npgsql/NpgsqlDataSourceBuilder.cs
@@ -3,15 +3,12 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
-using System.Text.Json;
-using System.Text.Json.Nodes;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Npgsql.Internal;
 using Npgsql.Internal.Resolvers;
 using Npgsql.TypeMapping;
-using NpgsqlTypes;
 
 namespace Npgsql;
 
diff --git a/src/Npgsql/NpgsqlSlimDataSourceBuilder.cs b/src/Npgsql/NpgsqlSlimDataSourceBuilder.cs
@@ -3,15 +3,13 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Npgsql.Internal;
 using Npgsql.Internal.Resolvers;
 using Npgsql.Properties;
 using Npgsql.TypeMapping;
-using NpgsqlTypes;
 
 namespace Npgsql;
 
@@ -72,7 +70,7 @@ static NpgsqlSlimDataSourceBuilder()
     public NpgsqlSlimDataSourceBuilder(string? connectionString = null)
     {
         ConnectionStringBuilder = new NpgsqlConnectionStringBuilder(connectionString);
-        _userTypeMapper = new();
+        _userTypeMapper = new() { DefaultNameTranslator = GlobalTypeMapper.Instance.DefaultNameTranslator };
         // Reverse order
         AddTypeInfoResolver(UnsupportedTypeInfoResolver);
         AddTypeInfoResolver(new AdoTypeInfoResolver());
@@ -257,7 +255,11 @@ public NpgsqlSlimDataSourceBuilder UsePeriodicPasswordProvider(
     #region Type mapping
 
     /// <inheritdoc />
-    public INpgsqlNameTranslator DefaultNameTranslator { get; set; } = GlobalTypeMapper.Instance.DefaultNameTranslator;
+    public INpgsqlNameTranslator DefaultNameTranslator
+    {
+        get => _userTypeMapper.DefaultNameTranslator;
+        set => _userTypeMapper.DefaultNameTranslator = value;
+    }
 
     /// <inheritdoc />
     public INpgsqlTypeMapper MapEnum<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] TEnum>(string? pgName = null, INpgsqlNameTranslator? nameTranslator = null)
diff --git a/src/Npgsql/TypeMapping/GlobalTypeMapper.cs b/src/Npgsql/TypeMapping/GlobalTypeMapper.cs
@@ -2,13 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Nodes;
 using System.Threading;
 using Npgsql.Internal;
 using Npgsql.Internal.Postgres;
-using Npgsql.Internal.Resolvers;
-using NpgsqlTypes;
 
 namespace Npgsql.TypeMapping;
 
diff --git a/test/Npgsql.Tests/Types/CompositeTests.cs b/test/Npgsql.Tests/Types/CompositeTests.cs
@@ -31,6 +31,56 @@ await AssertType(
             npgsqlDbType: null);
     }
 
+    [Test]
+    public async Task Basic_with_custom_default_translator()
+    {
+        await using var adminConnection = await OpenConnectionAsync();
+        var type = await GetTempTypeName(adminConnection);
+
+        await adminConnection.ExecuteNonQueryAsync($"CREATE TYPE {type} AS (x int, s text)");
+
+        var dataSourceBuilder = CreateDataSourceBuilder();
+        dataSourceBuilder.DefaultNameTranslator = new CustomTranslator();
+        dataSourceBuilder.MapComposite<SomeComposite>(type);
+        await using var dataSource = dataSourceBuilder.Build();
+        await using var connection = await dataSource.OpenConnectionAsync();
+
+        await AssertType(
+            connection,
+            new SomeComposite { SomeText = "foo", X = 8 },
+            "(8,foo)",
+            type,
+            npgsqlDbType: null);
+    }
+
+    [Test]
+    public async Task Basic_with_custom_translator()
+    {
+        await using var adminConnection = await OpenConnectionAsync();
+        var type = await GetTempTypeName(adminConnection);
+
+        await adminConnection.ExecuteNonQueryAsync($"CREATE TYPE {type} AS (x int, s text)");
+
+        var dataSourceBuilder = CreateDataSourceBuilder();
+        dataSourceBuilder.MapComposite<SomeComposite>(type, new CustomTranslator());
+        await using var dataSource = dataSourceBuilder.Build();
+        await using var connection = await dataSource.OpenConnectionAsync();
+
+        await AssertType(
+            connection,
+            new SomeComposite { SomeText = "foo", X = 8 },
+            "(8,foo)",
+            type,
+            npgsqlDbType: null);
+    }
+
+    class CustomTranslator : INpgsqlNameTranslator
+    {
+        public string TranslateTypeName(string clrName) => throw new NotImplementedException();
+
+        public string TranslateMemberName(string clrName) => clrName[0].ToString().ToLowerInvariant();
+    }
+
 #pragma warning disable CS0618 // GlobalTypeMapper is obsolete
     [Test, NonParallelizable]
     public async Task Global_mapping()
