npgsql
diff --git a/‎src/Npgsql/Internal/Postgres/DataTypeName.cs
Copy file name to clipboardExpand all lines: src/Npgsql/Internal/Postgres/DataTypeName.cs
+3-1Lines changed: 3 additions & 1 deletion b/‎src/Npgsql/Internal/Postgres/DataTypeName.cs
Copy file name to clipboardExpand all lines: src/Npgsql/Internal/Postgres/DataTypeName.cs
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎test/Npgsql.Tests/Support/TestBase.cs
Copy file name to clipboardExpand all lines: test/Npgsql.Tests/Support/TestBase.cs
+9-3Lines changed: 9 additions & 3 deletions b/‎test/Npgsql.Tests/Support/TestBase.cs
Copy file name to clipboardExpand all lines: test/Npgsql.Tests/Support/TestBase.cs
+9-3Lines changed: 9 additions & 3 deletions
diff --git a/‎test/Npgsql.Tests/Types/CompositeTests.cs
Copy file name to clipboardExpand all lines: test/Npgsql.Tests/Types/CompositeTests.cs
+22Lines changed: 22 additions & 0 deletions b/‎test/Npgsql.Tests/Types/CompositeTests.cs
Copy file name to clipboardExpand all lines: test/Npgsql.Tests/Types/CompositeTests.cs
+22Lines changed: 22 additions & 0 deletions
@@ -127,12 +127,14 @@ public static DataTypeName FromDisplayName(string displayName, string? schema =
         // There is one exception and that's array syntax, which is always resolvable in both ways, while we want the canonical name.
         var schemaEndIndex = displayNameSpan.IndexOf('.');
         if (schemaEndIndex is not -1 &&
+            string.IsNullOrEmpty(schema) &&
             !displayNameSpan.Slice(schemaEndIndex).StartsWith("_".AsSpan(), StringComparison.Ordinal) &&
             !displayNameSpan.EndsWith("[]".AsSpan(), StringComparison.Ordinal))
             return new(displayName);
 
         // First we strip the schema to get the type name.
-        if (schemaEndIndex is not -1)
+        if (schemaEndIndex is not -1 &&
+            string.IsNullOrEmpty(schema))
         {
             schema = displayNameSpan.Slice(0, schemaEndIndex).ToString();
             displayNameSpan = displayNameSpan.Slice(schemaEndIndex + 1);
 
@@ -201,7 +201,10 @@ internal static async Task<T> AssertTypeReadCore<T>(
         if (dotIndex > -1 && dataTypeName.Substring(0, dotIndex) is "pg_catalog" or "public")
             dataTypeName = dataTypeName.Substring(dotIndex + 1);
 
-        Assert.That(dataTypeName, Is.EqualTo(pgTypeName),
+        // For composite type with dots, postgres works only with quoted name - scheme."My.type.name"
+        // but npgsql converts it to name without quotes
+        var pgTypeNameWithoutQuotes = dataTypeName.Replace("\"", string.Empty);
+        Assert.That(dataTypeName, Is.EqualTo(pgTypeNameWithoutQuotes),
             $"Got wrong result from GetDataTypeName when reading '{truncatedSqlLiteral}'");
 
         if (isDefault)
@@ -300,9 +303,12 @@ internal static async Task AssertTypeWriteCore<T>(
         }
 
         // With data type name
-        p = new NpgsqlParameter { Value = valueFactory(), DataTypeName = pgTypeNameWithoutFacets };
+        // For composite type with dots in name, Postgresql returns name with quotes - scheme."My.type.name"
+        // but for npgsql mapping we should use names without quotes - scheme.My.type.name
+        var pgTypeNameWithoutFacetsAndDots = pgTypeNameWithoutFacets.Replace("\"", string.Empty);
+        p = new NpgsqlParameter { Value = valueFactory(), DataTypeName = pgTypeNameWithoutFacetsAndDots };
         cmd.Parameters.Add(p);
-        errorIdentifier[++errorIdentifierIndex] = $"DataTypeName={pgTypeNameWithoutFacets}";
+        errorIdentifier[++errorIdentifierIndex] = $"DataTypeName={pgTypeNameWithoutFacetsAndDots}";
         CheckInference();
 
         // With DbType
 
@@ -201,6 +201,28 @@ await AssertType(
             isDefaultForWriting: true);
     }
 
+    [Test, IssueLink("https://github.com/npgsql/npgsql/issues/5972")]
+    public async Task With_schema_and_dots_in_type_name()
+    {
+        await using var adminConnection = await OpenConnectionAsync();
+        var schema = await CreateTempSchema(adminConnection);
+        var typename = "Some.Composite.with.dots";
+
+        await adminConnection.ExecuteNonQueryAsync($"CREATE TYPE {schema}.\"{typename}\" AS (x int, some_text text)");
+
+        var dataSourceBuilder = CreateDataSourceBuilder();
+        dataSourceBuilder.MapComposite<SomeComposite>($"{schema}.{typename}");
+        await using var dataSource = dataSourceBuilder.Build();
+        await using var connection = await dataSource.OpenConnectionAsync();
+
+        await AssertType(
+            connection,
+            new SomeComposite { SomeText = "foobar", X = 10 },
+            "(10,foobar)",
+            $"{schema}.\"{typename}\"",
+            npgsqlDbType: null);
+    }
+
     [Test]
     public async Task Struct()
     {