Skip to content

Fix/custom types #53

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
tom-wolfe merged 2 commits into from
Jul 24, 2026
Merged

Fix/custom types #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
968e07c
fix: don't fully-qualify pg_catalog types.
tom-wolfe Jul 24, 2026
62c45a6
build: bump version.
tom-wolfe Jul 24, 2026
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
2 changes: 1 addition & 1 deletion src/NSchema.Postgres/NSchema.Postgres.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Version>5.0.0-alpha.6</Version>
<Version>5.0.0-alpha.7</Version>
<AssemblyVersion>$(Version.Split('-')[0])</AssemblyVersion>
<FileVersion>$(Version.Split('-')[0])</FileVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
5 changes: 3 additions & 2 deletions src/NSchema.Postgres/Sql/PostgresDatabaseIntrospector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,8 +1831,9 @@ private static SqlType MapSqlType(string dataType, string udtName, string? udtSc
"uuid" => SqlType.Guid,
"bytea" => SqlType.VarBinary(),
// A user-defined type (enum, composite, …): preserve its schema so the type round-trips, collapsing
// the default schema the same way a domain does.
_ => udtSchema is null or "public" ? SqlType.Custom(udtName) : SqlType.Custom(udtSchema, udtName),
// the default schema the same way a domain does. Built-ins outside the switch (jsonb, inet, …)
// also land here with udt_schema = pg_catalog, so collapse that too.
_ => udtSchema is null or "public" or "pg_catalog" ? SqlType.Custom(udtName) : SqlType.Custom(udtSchema, udtName),
};
}

Expand Down
15 changes: 15 additions & 0 deletions tests/NSchema.Postgres.Tests/Sql/PostgresDatabaseIntrospectorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,21 @@ await Exec($"""
column.Type.ShouldBe(SqlType.Custom(_schema, "order_status"));
}

[Fact]
public async Task GetDatabase_BuiltInFallthroughColumn_MappedUnqualified()
{
// Arrange — jsonb also hits MapSqlType's fall-through, but its pg_catalog udt_schema
// must collapse so the type reads as declared.
await Exec($"""CREATE TABLE "{_schema}".events (payload jsonb NOT NULL);""");

// Act
var column = (await Introspect(_schema))
.Schemas[0].Tables.ShouldHaveSingleItem().Columns.ShouldHaveSingleItem();

// Assert
column.Type.ShouldBe(SqlType.Custom("jsonb"));
}

// ── Sequences ─────────────────────────────────────────────────────────────

[Fact]
Expand Down