Skip to content

Commit 55d2cea

Browse files
committed
Sync to 9.0.0-preview.3.24172.4
* Implement quoting for custom SqlExpressions * Type mapping visitor changes * React to SqlConstantExpression changes
1 parent 17fa8de commit 55d2cea

36 files changed

Lines changed: 602 additions & 597 deletions

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
pull_request:
1212

1313
env:
14-
dotnet_sdk_version: '8.0.100'
14+
dotnet_sdk_version: '9.0.100-preview.3.24204.13'
1515
postgis_version: 3
1616
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1717

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
- cron: '30 22 * * 6'
2828

2929
env:
30-
dotnet_sdk_version: '8.0.100'
30+
dotnet_sdk_version: '9.0.100-preview.3.24204.13'
3131

3232
jobs:
3333
analyze:

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ImplicitUsings>true</ImplicitUsings>
1313
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1414

15-
<Copyright>Copyright 2023 © The Npgsql Development Team</Copyright>
15+
<Copyright>Copyright 2024 © The Npgsql Development Team</Copyright>
1616
<Company>Npgsql</Company>
1717
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1818
<PackageLicenseExpression>PostgreSQL</PackageLicenseExpression>

Directory.Packages.props

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<EFCoreVersion>9.0.0-preview.2.24128.4</EFCoreVersion>
4-
<MicrosoftExtensionsVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsVersion>
3+
<EFCoreVersion>9.0.0-preview.3.24172.4</EFCoreVersion>
4+
<MicrosoftExtensionsVersion>9.0.0-preview.3.24172.9</MicrosoftExtensionsVersion>
55
<NpgsqlVersion>8.0.2</NpgsqlVersion>
66
</PropertyGroup>
77

@@ -23,8 +23,12 @@
2323

2424
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2525
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
26-
<PackageVersion Include="xunit" Version="2.6.1" />
27-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
26+
<!-- <PackageVersion Include="xunit" Version="2.6.7-pre.5" />-->
27+
<!-- <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7-pre.8" />-->
28+
<PackageVersion Include="xunit" Version="2.7.1" />
29+
<PackageVersion Include="xunit.assert" Version="2.7.1" />
30+
<PackageVersion Include="xunit.core" Version="2.7.1" />
31+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
2832
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
2933
</ItemGroup>
3034
</Project>

EFCore.PG.sln.DotSettings

Lines changed: 1 addition & 206 deletions
Large diffs are not rendered by default.

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-rc.2.23502.2",
3+
"version": "9.0.100-preview.3.24204.13",
44
"rollForward": "latestMajor",
5-
"allowPrerelease": "true"
5+
"allowPrerelease": true
66
}
77
}

src/EFCore.PG.NodaTime/Query/Internal/PendingDateTimeZoneProviderExpression.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ private PendingDateTimeZoneProviderExpression()
99
{
1010
}
1111

12+
public override Expression Quote()
13+
=> throw new UnreachableException("PendingDateTimeZoneProviderExpression is a temporary tree representation and should never be quoted");
14+
1215
protected override void Print(ExpressionPrinter expressionPrinter)
1316
=> expressionPrinter.Append("TZDB");
1417
}

src/EFCore.PG.NodaTime/Query/Internal/PendingZonedDateTimeExpression.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ internal PendingZonedDateTimeExpression(SqlExpression operand, SqlExpression tim
1212

1313
internal SqlExpression TimeZoneId { get; }
1414

15+
public override Expression Quote()
16+
=> throw new UnreachableException("PendingDateTimeZoneProviderExpression is a temporary tree representation and should never be quoted");
17+
1518
protected override void Print(ExpressionPrinter expressionPrinter)
1619
{
1720
expressionPrinter.Visit(Operand);

src/EFCore.PG/EFCore.PG.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<Description>PostgreSQL/Npgsql provider for Entity Framework Core.</Description>
1010
<PackageTags>npgsql;postgresql;postgres;Entity Framework Core;entity-framework-core;ef;efcore;orm;sql</PackageTags>
1111
<PackageReadmeFile>README.md</PackageReadmeFile>
12+
<NoWarn>EF1003</NoWarn> <!-- Precompiled query is experimental -->
1213
</PropertyGroup>
1314

1415
<ItemGroup>

src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlObjectToStringTranslator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public NpgsqlObjectToStringTranslator(IRelationalTypeMappingSource typeMappingSo
7878
_sqlExpressionFactory.Equal(instance, _sqlExpressionFactory.Constant(true)),
7979
_sqlExpressionFactory.Constant(true.ToString()))
8080
},
81-
_sqlExpressionFactory.Constant(null))
81+
_sqlExpressionFactory.Constant(null, typeof(string)))
8282
: _sqlExpressionFactory.Case(
8383
new[]
8484
{

0 commit comments

Comments
 (0)