Skip to content

Fix type resolution logic #4382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roji merged 6 commits into from
May 24, 2022
Merged

Fix type resolution logic #4382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc460f0
Use DisplayName instead of Name when doing type lookup
Mar 16, 2022
560b89c
Add unit test
Apr 8, 2022
0ac9866
Fix public schema issue
Apr 19, 2022
65e8dea
Add missing import
Apr 25, 2022
9fcf555
Update after PR feedback
May 10, 2022
3045455
Make SchemaQualifiedName internal
roji May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Npgsql/PostgresTypes/PostgresType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
namespace Npgsql.PostgresTypes;
using System;
using System.Linq;

namespace Npgsql.PostgresTypes;

/// <summary>
/// Represents a PostgreSQL data type, such as int4 or text, as discovered from pg_type.
Expand Down Expand Up @@ -92,6 +95,8 @@ protected PostgresType(string ns, string name, string internalName, uint oid)

#endregion

internal string SchemaQualifiedName => Namespace is "pg_catalog" or "public" ? Name : FullName;

internal virtual string GetPartialNameWithFacets(int typeModifier) => Name;

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/Npgsql/TypeMapping/ConnectorTypeMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ internal bool TryResolveByOID(uint oid, [NotNullWhen(true)] out NpgsqlTypeHandle

lock (_writeLock)
{
if ((handler = ResolveByDataTypeName(pgType.Name, throwOnError: false)) is not null)
if ((handler = ResolveByDataTypeName(pgType.SchemaQualifiedName, throwOnError: false)) is not null)
{
_handlersByOID[oid] = handler;
return true;
Expand Down Expand Up @@ -415,7 +415,7 @@ Type GetUnderlyingType(Type t)
internal bool TryGetMapping(PostgresType pgType, [NotNullWhen(true)] out TypeMappingInfo? mapping)
{
foreach (var resolver in _resolvers)
if ((mapping = resolver.GetMappingByDataTypeName(pgType.Name)) is not null)
if ((mapping = resolver.GetMappingByDataTypeName(pgType.SchemaQualifiedName)) is not null)
return true;

switch (pgType)
Expand Down Expand Up @@ -669,7 +669,7 @@ public override void Reset()
throw new InvalidOperationException($"Couldn't find PostgreSQL type with OID {oid}");

foreach (var resolver in _resolvers)
if (resolver.GetMappingByDataTypeName(pgType.Name) is { } mapping)
if (resolver.GetMappingByDataTypeName(pgType.SchemaQualifiedName) is { } mapping)
return (mapping.NpgsqlDbType, pgType);

switch (pgType)
Expand Down
63 changes: 63 additions & 0 deletions test/Npgsql.Tests/Types/CompositeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,73 @@ struct CompositeStruct
public int X { get; set; }
public string SomeText { get; set; }
}

class ParentComposite
{
public int ID { get; set; }
public ChildComposite? Child { get; set; }
}

class ChildComposite
{
public string? Name { get; set; }
}
#pragma warning restore CS8618

#endregion

[Test, IssueLink("https://github.com/npgsql/npgsql/issues/4365")]
public async Task In_different_schemas_same_type_with_child()
{
var csb = new NpgsqlConnectionStringBuilder(ConnectionString)
{
ApplicationName = nameof(In_different_schemas_same_type_with_child), // Prevent backend type caching in TypeHandlerRegistry
Pooling = false
};

await using var conn = await OpenConnectionAsync(csb);

await using var _ = await CreateTempSchema(conn, out var firstSchemaName);
await using var __ = await CreateTempSchema(conn, out var secondSchemaName);

await conn.ExecuteNonQueryAsync($"CREATE TYPE {firstSchemaName}.child_composite AS (name text)");
await conn.ExecuteNonQueryAsync($"CREATE TYPE {firstSchemaName}.composite AS (id int, child {firstSchemaName}.child_composite)");
await conn.ExecuteNonQueryAsync($"CREATE TYPE {secondSchemaName}.child_composite AS (name text)");
await conn.ExecuteNonQueryAsync($"CREATE TYPE {secondSchemaName}.composite AS (id int, child {secondSchemaName}.child_composite)");

await conn.ExecuteNonQueryAsync(
@$"
CREATE TABLE {firstSchemaName}.composite_table (mycomposite {firstSchemaName}.composite);
INSERT INTO {firstSchemaName}.composite_table VALUES(ROW(1, ROW('1')));

CREATE TABLE {secondSchemaName}.composite_table (mycomposite {secondSchemaName}.composite);
INSERT INTO {secondSchemaName}.composite_table VALUES(ROW(2, ROW('2')));
");

conn.ReloadTypes();
conn.TypeMapper
.MapComposite<ChildComposite>($"{firstSchemaName}.child_composite")
.MapComposite<ParentComposite>($"{firstSchemaName}.composite")
.MapComposite<ChildComposite>($"{secondSchemaName}.child_composite")
.MapComposite<ParentComposite>($"{secondSchemaName}.composite");
await using var cmd = conn.CreateCommand();
cmd.CommandText = $"SELECT * FROM {firstSchemaName}.composite_table; SELECT * FROM {secondSchemaName}.composite_table";
await using var reader = await cmd.ExecuteReaderAsync();
Assert.IsTrue(await reader.ReadAsync());
Assert.That(reader.GetDataTypeName(0), Is.EqualTo($"{firstSchemaName}.composite"));
var firstParentComposite = reader.GetFieldValue<ParentComposite>(0);
Assert.That(firstParentComposite.ID, Is.EqualTo(1));
Assert.NotNull(firstParentComposite.Child);
Assert.That(firstParentComposite.Child!.Name, Is.EqualTo("1"));
Assert.IsTrue(await reader.NextResultAsync());
Assert.IsTrue(await reader.ReadAsync());
Assert.That(reader.GetDataTypeName(0), Is.EqualTo($"{secondSchemaName}.composite"));
var secondParentComposite = reader.GetFieldValue<ParentComposite>(0);
Assert.That(secondParentComposite.ID, Is.EqualTo(2));
Assert.NotNull(secondParentComposite.Child);
Assert.That(secondParentComposite.Child!.Name, Is.EqualTo("2"));
}

[Test, IssueLink("https://github.com/npgsql/npgsql/issues/1779")]
public void Composite()
{
Expand Down