Skip to content

Commit 78701ae

Browse files
ThoriumThorium
authored
Merge pull request #853 from Tom-Sloboda/make-Firebird-hav-consistent-case
Release 1.5.13: Fix Linux build - rename all mentions of Firebird to have consistent case
2 parents 6b4cd32 + 42d1f44 commit 78701ae

30 files changed

Lines changed: 197 additions & 158 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

‎.paket/Paket.Restore.targets‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,15 @@
235235
<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
236236
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
237237
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
238+
<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
238239
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
239240
<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
240241
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
241242
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
242243
<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
243244
</PaketReferencesFileLinesInfo>
244-
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
245-
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
245+
<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
246+
<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
246247
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
247248
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
248249
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
@@ -252,6 +253,10 @@
252253
<AllowExplicitVersion>true</AllowExplicitVersion>
253254

254255
</PackageReference>
256+
257+
<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
258+
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
259+
</PackageVersion>
255260
</ItemGroup>
256261

257262
<PropertyGroup>

‎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

‎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/RELEASE_NOTES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### 1.5.12 - 21.07.2025
1+
### 1.5.13 - 21.07.2025
22
* MapTo fix on special cases where database is missing fields of MapTo FSharp record target.
33

44
### 1.5.11 - 24.06.2025

‎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.Common/AssemblyInfo.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("SQLProvider.Common")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type provider for SQL database access, common library")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.12")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.12")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.13")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.13")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.Common"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type provider for SQL database access, common library"
16-
let [<Literal>] AssemblyVersion = "1.5.12"
17-
let [<Literal>] AssemblyFileVersion = "1.5.12"
16+
let [<Literal>] AssemblyVersion = "1.5.13"
17+
let [<Literal>] AssemblyFileVersion = "1.5.13"

0 commit comments

Comments
 (0)