Skip to content
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

EF Core 9 Firebird support #2734

Merged
merged 1 commit into from
Dec 15, 2024
Merged

EF Core 9 Firebird support #2734

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
8 changes: 3 additions & 5 deletions src/Core/RevEng.Core.80/ConnectionStringResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
using System.Collections.Generic;
using System.Data.Common;
using System.IO;
using FirebirdSql.Data.FirebirdClient;
using Microsoft.Data.SqlClient;
using Microsoft.Data.Sqlite;
using MySqlConnector;
using Npgsql;
using Oracle.ManagedDataAccess.Client;
#if !CORE90
using FirebirdSql.Data.FirebirdClient;
#endif

namespace RevEng.Core
{
Expand Down Expand Up @@ -85,7 +83,7 @@ public IList<string> ResolveAlias()
{
// Ignore
}
#if !CORE90

try
{
var a = new FbConnectionStringBuilder(connectionString);
Expand All @@ -95,7 +93,7 @@ public IList<string> ResolveAlias()
{
// Ignore
}
#endif

return aliases;
}

Expand Down
6 changes: 3 additions & 3 deletions src/Core/RevEng.Core.80/ServiceProviderBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
using System.Collections.Generic;
#if !CORE90
using EFCore.Snowflake.Design.Internal;
using FirebirdSql.EntityFrameworkCore.Firebird.Design.Internal;
#endif
using EntityFrameworkCore.Scaffolding.Handlebars;
using ErikEJ.EntityFrameworkCore.SqlServer.Scaffolding;
using FirebirdSql.EntityFrameworkCore.Firebird.Design.Internal;
using Humanizer.Inflections;
using Microsoft.EntityFrameworkCore.Design;
using Microsoft.EntityFrameworkCore.Design.Internal;
Expand Down Expand Up @@ -125,12 +125,12 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti
var oracleProvider = new OracleDesignTimeServices();
oracleProvider.ConfigureDesignTimeServices(serviceCollection);
break;
#if !CORE90

case DatabaseType.Firebird:
var firebirdProvider = new FbDesignTimeServices();
firebirdProvider.ConfigureDesignTimeServices(serviceCollection);
break;

#if !CORE90
case DatabaseType.Snowflake:
var snowflakeProvider = new SnowflakeDesignTimeServices();
snowflakeProvider.ConfigureDesignTimeServices(serviceCollection);
Expand Down
2 changes: 1 addition & 1 deletion src/Core/RevEng.Core.90/RevEng.Core.90.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!--<PackageReference Include="EFCore.Snowflake" Version="8.0.8" />-->
<PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" Version="9.0.0-beta1" />
<PackageReference Include="EntityFrameworkCore.Sqlite.NodaTime" Version="9.1.0" />
<!-- <PackageReference Include="FirebirdSql.EntityFrameworkCore.Firebird" Version="11.0.0" />-->
<PackageReference Include="FirebirdSql.EntityFrameworkCore.Firebird" Version="12.0.0-alpha1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
Expand Down
3 changes: 3 additions & 0 deletions src/Core/efcpt.9/efcpt.9.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
<Content Include="..\..\GUI\lib\T4_900.zip" Link="T4_900.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\..\GUI\lib\T4_900_Split.zip" Link="T4_900_Split.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\efcpt.8\efcpt-readme.md" Link="efcpt-readme.md">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand Down