Skip to content

Commit 516650d

Browse files
Tom-SlobodaTom-Sloboda
committed
Fixes Firebird naming inconsistencies DLC
Corrects the spelling of "Firebird" to be consistent throughout the codebase. Missed a couple in the last commit.
1 parent d9a5094 commit 516650d

9 files changed

Lines changed: 25 additions & 59 deletions

File tree

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Please provide a description of any known workarounds.
3232
- [ ] Oracle
3333
- [ ] Odbc
3434
- [ ] Microsoft Access
35-
- [ ] FireBird
35+
- [ ] Firebird
3636
- [ ] DuckDB
3737
- [ ] Other
3838
* Operating system

‎build.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ let projects =
118118
{name="SQLProvider.DuckDb.DesignTime";summary="Type providers for DuckDb database access.";description="Type providers for DuckDb database access.";dependencies=[]};
119119
{name="SQLProvider.DuckDb.Runtime";summary="Type providers for DuckDb database access.";description="Type providers for DuckDb database access.";dependencies=[]};
120120

121-
{name="SQLProvider.FireBird.DesignTime";summary="Type providers for FireBird database access.";description="Type providers for FireBird database access.";dependencies=[]};
122-
{name="SQLProvider.FireBird.Runtime";summary="Type providers for FireBird database access.";description="Type providers for FireBird database access.";dependencies=[]};
121+
{name="SQLProvider.Firebird.DesignTime";summary="Type providers for Firebird database access.";description="Type providers for Firebird database access.";dependencies=[]};
122+
{name="SQLProvider.Firebird.Runtime";summary="Type providers for Firebird database access.";description="Type providers for Firebird database access.";dependencies=[]};
123123

124124
{name="SQLProvider.MsSql.DesignTime";summary="Type providers for Microsoft SQL Server database access.";description="Type providers for Microsoft SQL Server database access.";dependencies=[]};
125125
{name="SQLProvider.MsSql.Runtime";summary="Type providers for Microsoft SQL Server database access.";description="Type providers for Microsoft SQL Server database access.";dependencies=[]};

‎docs/content/core/netstandard.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Microsoft SQL Server | [x] | [x] | [x] | See prebuild task. |
1919
Postgres | [x] | [x] | [x] | See post-build task. |
2020
MySQL / MariaDB | [x] | [x] | [x] | See post-build task. |
2121
SQLite | [x] | | | See post-build task. Builds on Win, runs on all |
22-
FireBird | ? | ? | ? | Not tested. |
22+
Firebird | ? | ? | ? | Not tested. |
2323
Oracle | | | | No ODP.NET-driver yet. |
2424
Odbc | | | | Not supported. |
2525
Access | | | | Not supported. |

‎docs/content/index.fsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ Oracle is based on the current release (12.1.0.1.2) of the managed ODP.NET drive
4949
SQL Server SSDT is based on the current release (160.20216.14) found [here](https://www.nuget.org/packages/Microsoft.SqlServer.Management.SqlParser/).
5050
5151
| Database | Nuget Package | TypeProvider Class | NuGet Status |
52-
| ------- | ----- | -----------| ---------- |
53-
| Microsoft SQL Server | [SQLProvider.MsSql](https://www.nuget.org/packages/SQLProvider.MsSql) | FSharp.Data.Sql.MsSql.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.MsSql) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.MsSql)](https://www.nuget.org/packages/SQLProvider.MsSql)
54-
| PostgreSQL | [SQLProvider.PostgreSql](https://www.nuget.org/packages/SQLProvider.PostgreSql) | FSharp.Data.Sql.PostgreSql.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.PostgreSql) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.PostgreSql)](https://www.nuget.org/packages/SQLProvider.PostgreSql)
55-
| MySQL and MariaDB | [SQLProvider.MySqlConnector](https://www.nuget.org/packages/SQLProvider.MySqMySqlConnectorl) | FSharp.Data.Sql.MySqlConnector.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.MySqlConnector) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.MySqlConnector)](https://www.nuget.org/packages/SQLProvider.MySqMySqlConnectorl)
56-
| MySQL | [SQLProvider.MySql](https://www.nuget.org/packages/SQLProvider.MySql) | FSharp.Data.Sql.MySql.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.MySql) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.MySql)](https://www.nuget.org/packages/SQLProvider.MySql)
57-
| Oracle | [SQLProvider.Oracle](https://www.nuget.org/packages/SQLProvider.Oracle) | FSharp.Data.Sql.Oracle.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.Oracle) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.Oracle)](https://www.nuget.org/packages/SQLProvider.Oracle)
58-
| 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)
59-
| 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)
60-
| 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)
61-
| 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)
62-
| 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)
63-
| 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)
52+
| ------- | ----- | -----------| ---------- |
53+
| Microsoft SQL Server | [SQLProvider.MsSql](https://www.nuget.org/packages/SQLProvider.MsSql) | FSharp.Data.Sql.MsSql.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.MsSql) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.MsSql)](https://www.nuget.org/packages/SQLProvider.MsSql)
54+
| PostgreSQL | [SQLProvider.PostgreSql](https://www.nuget.org/packages/SQLProvider.PostgreSql) | FSharp.Data.Sql.PostgreSql.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.PostgreSql) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.PostgreSql)](https://www.nuget.org/packages/SQLProvider.PostgreSql)
55+
| MySQL and MariaDB | [SQLProvider.MySqlConnector](https://www.nuget.org/packages/SQLProvider.MySqMySqlConnectorl) | FSharp.Data.Sql.MySqlConnector.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.MySqlConnector) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.MySqlConnector)](https://www.nuget.org/packages/SQLProvider.MySqMySqlConnectorl)
56+
| MySQL | [SQLProvider.MySql](https://www.nuget.org/packages/SQLProvider.MySql) | FSharp.Data.Sql.MySql.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.MySql) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.MySql)](https://www.nuget.org/packages/SQLProvider.MySql)
57+
| Oracle | [SQLProvider.Oracle](https://www.nuget.org/packages/SQLProvider.Oracle) | FSharp.Data.Sql.Oracle.SqlDataProvider | [![Nuget](https://img.shields.io/nuget/v/SQLProvider.Oracle) ![Nuget](https://img.shields.io/nuget/dt/SQLProvider.Oracle)](https://www.nuget.org/packages/SQLProvider.Oracle)
58+
| 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)
59+
| 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)
60+
| 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)
61+
| 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)
62+
| 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)
63+
| 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)
6464
6565
<div class="row">
6666
<div class="span1"></div>

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
namespace System
33
open System.Reflection
44

5-
[<assembly: AssemblyTitleAttribute("SQLProvider.FireBird.Runtime")>]
5+
[<assembly: AssemblyTitleAttribute("SQLProvider.Firebird.Runtime")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
7-
[<assembly: AssemblyDescriptionAttribute("Type providers for FireBird database access.")>]
7+
[<assembly: AssemblyDescriptionAttribute("Type providers for Firebird database access.")>]
88
[<assembly: AssemblyVersionAttribute("1.5.12")>]
99
[<assembly: AssemblyFileVersionAttribute("1.5.12")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
13-
let [<Literal>] AssemblyTitle = "SQLProvider.FireBird.Runtime"
13+
let [<Literal>] AssemblyTitle = "SQLProvider.Firebird.Runtime"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
15-
let [<Literal>] AssemblyDescription = "Type providers for FireBird database access."
15+
let [<Literal>] AssemblyDescription = "Type providers for Firebird database access."
1616
let [<Literal>] AssemblyVersion = "1.5.12"
1717
let [<Literal>] AssemblyFileVersion = "1.5.12"

‎src/SQLProvider.Firebird.Runtime/paket.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
type file
22
id
3-
SQLProvider.FireBird
3+
SQLProvider.Firebird
44
title
5-
SQLProvider.FireBird
5+
SQLProvider.Firebird
66
owners
77
"Ross McKinlay, Colin Bull, Tuomas Hietanen"
88
authors
@@ -32,7 +32,7 @@ files
3232
../../bin/firebird/typeproviders/fsharp41/netstandard2.0/**/*.dll ==> typeproviders/fsharp41/netstandard2.0
3333
references
3434
FSharp.Data.SqlProvider.Common.dll
35-
FSharp.Data.SqlProvider.FireBird.dll
35+
FSharp.Data.SqlProvider.Firebird.dll
3636
dependencies
3737
FSharp.Core >= 8.0.301
3838
Newtonsoft.Json >= 13.0.1

‎tests/SqlProvider.Tests/scripts/FirebirdTests.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ let connectionString3 = @" Data Source=localhost; port=" + port + ";initial cata
1919
[<Literal>]
2020
let resolutionPath = __SOURCE_DIRECTORY__ + "/../../../packages/tests/FirebirdSql.Data.FirebirdClient/lib/net452"
2121

22-
type HR = FSharp.Data.Sql.FireBird.SqlDataProvider<Common.DatabaseProviderTypes.FIREBIRD, connectionString1>
22+
type HR = FSharp.Data.Sql.Firebird.SqlDataProvider<Common.DatabaseProviderTypes.FIREBIRD, connectionString1>
2323
let ctx = HR.GetDataContext()
2424
FSharp.Data.Sql.Common.QueryEvents.SqlQueryEvent |> Event.add (printfn "Executing SQL: %O")
2525

2626
let processId = System.Diagnostics.Process.GetCurrentProcess().Id;
2727

2828
//*************** quoted table names ***********
2929
//just get the single existing record
30-
type HRCamelCase = FSharp.Data.Sql.FireBird.SqlDataProvider<Common.DatabaseProviderTypes.FIREBIRD, connectionString3, OdbcQuote = OdbcQuoteCharacter.DOUBLE_QUOTES>
30+
type HRCamelCase = FSharp.Data.Sql.Firebird.SqlDataProvider<Common.DatabaseProviderTypes.FIREBIRD, connectionString3, OdbcQuote = OdbcQuoteCharacter.DOUBLE_QUOTES>
3131

3232
let ctxCamelCase = HRCamelCase.GetDataContext()
3333
let cc = query {

0 commit comments

Comments
 (0)