Skip to content

Commit d9a5094

Browse files
Tom-SlobodaTom-Sloboda
committed
Fix Firebird provider name inconsistencies
Corrects inconsistencies in the Firebird provider's name across the project. They don't use the upper-case 'B' on their website, so went with that.
1 parent 6abce27 commit d9a5094

14 files changed

Lines changed: 148 additions & 80 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ The default maintainer account for projects under "fsprojects" is [@fsprojectsgi
8080
| Any ODBC connection | [SQLProvider.Odbc](https://www.nuget.org/packages/SQLProvider.Odbc) | FSharp.Data.Sql.Odbc.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.Odbc) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.Odbc)](https://www.nuget.org/packages/SQLProvider.Odbc)
8181
| SQLite | [SQLProvider.SQLite](https://www.nuget.org/packages/SQLProvider.SQLite) | FSharp.Data.Sql.SQLite.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.SQLite) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.SQLite)](https://www.nuget.org/packages/SQLProvider.SQLite)
8282
| Microsoft Access | [SQLProvider.MsAccess](https://www.nuget.org/packages/SQLProvider.MsAccess) | FSharp.Data.Sql.MsAccess.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.MsAccess) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.MsAccess)](https://www.nuget.org/packages/SQLProvider.MsAccess)
83-
| FireBird | [SQLProvider.FireBird](https://www.nuget.org/packages/SQLProvider.FireBird) | FSharp.Data.Sql.FireBird.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.FireBird) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.FireBird)](https://www.nuget.org/packages/SQLProvider.FireBird)
83+
| Firebird | [SQLProvider.Firebird](https://www.nuget.org/packages/SQLProvider.Firebird) | FSharp.Data.Sql.Firebird.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.Firebird) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.Firebird)](https://www.nuget.org/packages/SQLProvider.Firebird)
8484
| DuckDb | [SQLProvider.DuckDb](https://www.nuget.org/packages/SQLProvider.DuckDb) | FSharp.Data.Sql.DuckDb.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.DuckDb) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.DuckDb)](https://www.nuget.org/packages/SQLProvider.DuckDb)
8585
| General, all via manual config | [SQLProvider](https://www.nuget.org/packages/SQLProvider) | FSharp.Data.Sql.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider)](https://www.nuget.org/packages/SQLProvider)
8686

8787

88-
Depending on the used provider, the namespace of the SqlDataProvider type class varies as above.
88+
Depending on the used provider, the namespace of the SqlDataProvider type class varies as above.

‎SQLProvider.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SQLProvider.SQLite.DesignTi
3131
EndProject
3232
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SQLProvider.SQLite.Runtime", "src\SQLProvider.SQLite.Runtime\SQLProvider.SQLite.Runtime.fsproj", "{03AE8F01-38A4-12D5-FD40-0AF5CF297BD4}"
3333
EndProject
34-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SQLProvider.FireBird.DesignTime", "src\SQLProvider.FireBird.DesignTime\SQLProvider.FireBird.DesignTime.fsproj", "{82C1A507-F1DC-9E5C-6C87-DDAF37DA4BEB}"
34+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SQLProvider.Firebird.DesignTime", "src\SQLProvider.Firebird.DesignTime\SQLProvider.Firebird.DesignTime.fsproj", "{82C1A507-F1DC-9E5C-6C87-DDAF37DA4BEB}"
3535
EndProject
36-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SQLProvider.FireBird.Runtime", "src\SQLProvider.FireBird.Runtime\SQLProvider.FireBird.Runtime.fsproj", "{E7CD6210-6382-799C-1C0A-4BD675FA02AB}"
36+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SQLProvider.Firebird.Runtime", "src\SQLProvider.Firebird.Runtime\SQLProvider.Firebird.Runtime.fsproj", "{E7CD6210-6382-799C-1C0A-4BD675FA02AB}"
3737
EndProject
3838
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SQLProvider.Odbc.DesignTime", "src\SQLProvider.Odbc.DesignTime\SQLProvider.Odbc.DesignTime.fsproj", "{07F9D1E1-6D3C-1B12-9B83-69BFCFFBF219}"
3939
EndProject

‎src/SQLProvider.DesignTime/SqlDesignTime.fs‎

Lines changed: 61 additions & 61 deletions
Large diffs are not rendered by default.

‎src/SQLProvider.Firebird.DesignTime/AssemblyInfo.fs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Auto-Generated by FAKE; do not edit
2+
namespace System
3+
open System.Reflection
4+
5+
[<assembly: AssemblyTitleAttribute("SQLProvider.Firebird.DesignTime")>]
6+
[<assembly: AssemblyProductAttribute("SQLProvider")>]
7+
[<assembly: AssemblyDescriptionAttribute("Type providers for Firebird database access.")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.12")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.12")>]
10+
do ()
11+
12+
module internal AssemblyVersionInformation =
13+
let [<Literal>] AssemblyTitle = "SQLProvider.Firebird.DesignTime"
14+
let [<Literal>] AssemblyProduct = "SQLProvider"
15+
let [<Literal>] AssemblyDescription = "Type providers for Firebird database access."
16+
let [<Literal>] AssemblyVersion = "1.5.12"
17+
let [<Literal>] AssemblyFileVersion = "1.5.12"

src/SQLProvider.FireBird.DesignTime/SQLProvider.FireBird.DesignTime.fsproj renamed to src/SQLProvider.Firebird.DesignTime/SQLProvider.Firebird.DesignTime.fsproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<DefineConstants>$(DefineConstants);NO_GENERATIVE;DESIGNTIME;FIREBIRD</DefineConstants>
88
<OutputPath>..\..\bin\firebird\typeproviders\fsharp41\</OutputPath>
9-
<AssemblyName>FSharp.Data.SqlProvider.FireBird.DesignTime</AssemblyName>
10-
<Name>FSharp.Data.SqlProvider.FireBird</Name>
9+
<AssemblyName>FSharp.Data.SqlProvider.Firebird.DesignTime</AssemblyName>
10+
<Name>FSharp.Data.SqlProvider.Firebird</Name>
1111
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1212
<TargetFSharpCoreVersion>8.0.0.0</TargetFSharpCoreVersion>
1313
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -30,7 +30,7 @@
3030
<Paket>True</Paket>
3131
<Link>paket-files/ExpressionOptimizer.fs</Link>
3232
</Compile>
33-
<Compile Include="..\SQLProvider.Runtime\Providers.FireBird.fs" Link="Providers.FireBird.fs" />
33+
<Compile Include="..\SQLProvider.Runtime\Providers.Firebird.fs" Link="Providers.Firebird.fs" />
3434
<Compile Include="..\SQLProvider.Runtime\SqlRuntime.DataContext.fs" Link="SqlRuntime.DataContext.fs" />
3535
<Compile Include="..\SQLProvider.DesignTime\SqlDesignTime.fs" Link="SqlDesignTime.fs" />
3636
</ItemGroup>
@@ -43,4 +43,4 @@
4343
<ProjectReference Include="..\SQLProvider.Common\SQLProvider.Common.fsproj" />
4444
</ItemGroup>
4545
<Import Project="..\..\.paket\Paket.Restore.targets" />
46-
</Project>
46+
</Project>

src/SQLProvider.FireBird.DesignTime/paket.references renamed to src/SQLProvider.Firebird.DesignTime/paket.references

File renamed without changes.

‎src/SQLProvider.Firebird.Runtime/AssemblyInfo.fs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Auto-Generated by FAKE; do not edit
2+
namespace System
3+
open System.Reflection
4+
5+
[<assembly: AssemblyTitleAttribute("SQLProvider.FireBird.Runtime")>]
6+
[<assembly: AssemblyProductAttribute("SQLProvider")>]
7+
[<assembly: AssemblyDescriptionAttribute("Type providers for FireBird database access.")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.12")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.12")>]
10+
do ()
11+
12+
module internal AssemblyVersionInformation =
13+
let [<Literal>] AssemblyTitle = "SQLProvider.FireBird.Runtime"
14+
let [<Literal>] AssemblyProduct = "SQLProvider"
15+
let [<Literal>] AssemblyDescription = "Type providers for FireBird database access."
16+
let [<Literal>] AssemblyVersion = "1.5.12"
17+
let [<Literal>] AssemblyFileVersion = "1.5.12"

src/SQLProvider.FireBird.Runtime/SQLProvider.FireBird.Runtime.fsproj renamed to src/SQLProvider.Firebird.Runtime/SQLProvider.Firebird.Runtime.fsproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<PackageProjectUrl>https://fsprojects.github.io/SQLProvider</PackageProjectUrl>
1010
<RepositoryUrl>https://github.com/fsprojects/SQLProvider</RepositoryUrl>
1111
<OutputPath>..\..\bin\firebird\lib\</OutputPath>
12-
<AssemblyName>FSharp.Data.SqlProvider.FireBird</AssemblyName>
13-
<Name>FSharp.Data.SqlProvider.FireBird</Name>
12+
<AssemblyName>FSharp.Data.SqlProvider.Firebird</AssemblyName>
13+
<Name>FSharp.Data.SqlProvider.Firebird</Name>
1414
<PackageTags>sql, typeprovider, firebirdsql, f#, fsharp, database, dotnet</PackageTags>
1515
<PackageLicenseUrl>https://github.com/fsprojects/SQLProvider/blob/master/LICENSE.txt</PackageLicenseUrl>
1616
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -26,11 +26,11 @@
2626
<Paket>True</Paket>
2727
<Link>paket-files/ExpressionOptimizer.fs</Link>
2828
</Compile>
29-
<Compile Include="..\SQLProvider.Runtime\Providers.FireBird.fs" Link="Providers.FireBird.fs" />
29+
<Compile Include="..\SQLProvider.Runtime\Providers.Firebird.fs" Link="Providers.Firebird.fs" />
3030
<Compile Include="..\SQLProvider.Runtime\SqlRuntime.DataContext.fs" Link="SqlRuntime.DataContext.fs" />
3131
</ItemGroup>
3232
<Target Name="BeforeBuild">
33-
<MSBuild Projects="..\SQLProvider.FireBird.DesignTime\SQLProvider.FireBird.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);$(TargetFramework)" />
33+
<MSBuild Projects="..\SQLProvider.Firebird.DesignTime\SQLProvider.Firebird.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);$(TargetFramework)" />
3434
</Target>
3535
<ItemGroup>
3636
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.2" />

src/SQLProvider.FireBird.Runtime/paket.references renamed to src/SQLProvider.Firebird.Runtime/paket.references

File renamed without changes.

src/SQLProvider.FireBird.Runtime/paket.template renamed to src/SQLProvider.Firebird.Runtime/paket.template

File renamed without changes.

0 commit comments

Comments
 (0)