Skip to content

[8.0] Fix type mapping for derived tsquery parameters #4061

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 1 commit into from
Oct 20, 2026
Merged

[8.0] Fix type mapping for derived tsquery parameters #4061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 0 deletions src/EFCore.PG/Storage/Internal/NpgsqlTypeMappingSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,13 @@ public NpgsqlTypeMappingSource(
{ typeof(NpgsqlRange<DateTimeOffset>), _tstzrange },
{ typeof(NpgsqlRange<DateOnly>), _dateOnlyDaterange },
{ typeof(NpgsqlTsQuery), _tsquery },
{ typeof(NpgsqlTsQueryLexeme), _tsquery },
{ typeof(NpgsqlTsQueryNot), _tsquery },
{ typeof(NpgsqlTsQueryBinOp), _tsquery },
{ typeof(NpgsqlTsQueryAnd), _tsquery },
{ typeof(NpgsqlTsQueryOr), _tsquery },
{ typeof(NpgsqlTsQueryFollowedBy), _tsquery },
{ typeof(NpgsqlTsQueryEmpty), _tsquery },
{ typeof(NpgsqlTsVector), _tsvector },
{ typeof(NpgsqlTsRankingNormalization), _rankingNormalization },
{ typeof(LTree), _ltree }
Expand Down
23 changes: 23 additions & 0 deletions test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,29 @@ LIMIT 1
""");
}

[Theory]
[InlineData(false)]
[InlineData(true)]
public async Task Matches_with_derived_tsquery_parameter(bool async)
{
using var context = CreateContext();
var tsQuery = new NpgsqlTsQueryLexeme("firs", NpgsqlTsQueryLexeme.Weight.None, true);
var query = context.Customers
.Select(c => EF.Functions.ToTsVector("simple", "first").Matches(tsQuery));

var results = async ? await query.ToArrayAsync() : query.ToArray();

Assert.NotEmpty(results);
Assert.All(results, Assert.True);
AssertSql(
"""
@__tsQuery_1=''firs':*' (DbType = Object)

SELECT to_tsvector('simple', 'first') @@ @__tsQuery_1
FROM "Customers" AS c
""");
}

[Fact]
public void TsVector_Concat()
{
Expand Down
16 changes: 16 additions & 0 deletions test/EFCore.PG.Tests/Storage/NpgsqlTypeMappingSourceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,22 @@ public void By_ClrType(Type clrType, string expectedStoreType)
Assert.Same(clrType, mapping.ClrType);
}

[Theory]
[InlineData(typeof(NpgsqlTsQuery))]
[InlineData(typeof(NpgsqlTsQueryLexeme))]
[InlineData(typeof(NpgsqlTsQueryNot))]
[InlineData(typeof(NpgsqlTsQueryBinOp))]
[InlineData(typeof(NpgsqlTsQueryAnd))]
[InlineData(typeof(NpgsqlTsQueryOr))]
[InlineData(typeof(NpgsqlTsQueryFollowedBy))]
[InlineData(typeof(NpgsqlTsQueryEmpty))]
public void TsQuery(Type clrType)
{
var mapping = Assert.IsType<NpgsqlTsQueryTypeMapping>(CreateTypeMappingSource().FindMapping(clrType));
Assert.Equal("tsquery", mapping.StoreType);
Assert.Same(typeof(NpgsqlTsQuery), mapping.ClrType);
}

[Theory]
[InlineData(typeof(decimal), "numeric(5)")]
[InlineData(typeof(DateTime), "timestamp(5) with time zone")]
Expand Down
Loading