Skip to content

Commit f207531

Browse files
ThoriumThorium
committed
reverted connection changes to previous version
1 parent 3fb2bfe commit f207531

28 files changed

Lines changed: 128 additions & 105 deletions

File tree

‎.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>

‎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.15 - 09.09.2025
1+
### 1.5.16 - 09.09.2025
22
* XML documentation updates
33
* Minor memory and performance improvements
44

‎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.15")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.15")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.16")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.16")>]
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.15"
17-
let [<Literal>] AssemblyFileVersion = "1.5.15"
16+
let [<Literal>] AssemblyVersion = "1.5.16"
17+
let [<Literal>] AssemblyFileVersion = "1.5.16"

‎src/SQLProvider.Common/Utils.fs‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,21 +743,39 @@ module Sql =
743743
let dbUnboxWithDefault<'a> def (v:obj) : 'a =
744744
if Convert.IsDBNull(v) then def else unbox v
745745

746+
/// Note: SQLProvider reuses the connection through multiple instances, so you can't dispose it here.
747+
/// Instead it's created with ISQLProvider's CreateConnection method, and that is having always "use" to ensure it is disposed properly on "finally".
746748
let connect (con:IDbConnection) f =
749+
if con.State <> ConnectionState.Open then con.Open()
750+
let result = f con
751+
con.Close(); result
752+
753+
/// Note: SQLProvider reuses the connection through multiple instances, so you can't dispose it here.
754+
/// Instead it's created with ISQLProvider's CreateConnection method, and that is having always "use" to ensure it is disposed properly on "finally".
755+
let connectAsync (con:System.Data.Common.DbConnection) (f: System.Data.Common.DbConnection -> System.Threading.Tasks.Task<'a>) =
756+
task {
757+
if con.State <> ConnectionState.Open then
758+
do! con.OpenAsync()
759+
let result = f con
760+
con.Close()
761+
return result
762+
}
763+
764+
let connectAndClose (con:IDbConnection) f =
747765
use connection = con
748766
try
749767
if connection.State <> ConnectionState.Open then connection.Open()
750768
f connection
751769
finally
752770
if connection.State = ConnectionState.Open then connection.Close()
753771

754-
let connectAsync (con:System.Data.Common.DbConnection) f =
772+
let connectAndCloseAsync (con:System.Data.Common.DbConnection) (f: System.Data.Common.DbConnection -> System.Threading.Tasks.Task<'a>) =
755773
task {
756774
use connection = con
757775
try
758776
if connection.State <> ConnectionState.Open then
759777
do! connection.OpenAsync()
760-
f connection
778+
return! f connection
761779
finally
762780
if connection.State = ConnectionState.Open then connection.Close()
763781
}

‎src/SQLProvider.DesignTime/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.DesignTime")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type providers for any SQL database access.")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.15")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.15")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.16")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.16")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.DesignTime"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type providers for any SQL database access."
16-
let [<Literal>] AssemblyVersion = "1.5.15"
17-
let [<Literal>] AssemblyFileVersion = "1.5.15"
16+
let [<Literal>] AssemblyVersion = "1.5.16"
17+
let [<Literal>] AssemblyFileVersion = "1.5.16"

‎src/SQLProvider.DuckDb.DesignTime/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.DuckDb.DesignTime")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type providers for DuckDb database access.")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.15")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.15")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.16")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.16")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.DuckDb.DesignTime"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type providers for DuckDb database access."
16-
let [<Literal>] AssemblyVersion = "1.5.15"
17-
let [<Literal>] AssemblyFileVersion = "1.5.15"
16+
let [<Literal>] AssemblyVersion = "1.5.16"
17+
let [<Literal>] AssemblyFileVersion = "1.5.16"

‎src/SQLProvider.DuckDb.Runtime/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.DuckDb.Runtime")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type providers for DuckDb database access.")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.15")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.15")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.16")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.16")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.DuckDb.Runtime"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type providers for DuckDb database access."
16-
let [<Literal>] AssemblyVersion = "1.5.15"
17-
let [<Literal>] AssemblyFileVersion = "1.5.15"
16+
let [<Literal>] AssemblyVersion = "1.5.16"
17+
let [<Literal>] AssemblyFileVersion = "1.5.16"

‎src/SQLProvider.Firebird.DesignTime/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.Firebird.DesignTime")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type providers for Firebird database access.")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.15")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.15")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.16")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.16")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.Firebird.DesignTime"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type providers for Firebird database access."
16-
let [<Literal>] AssemblyVersion = "1.5.15"
17-
let [<Literal>] AssemblyFileVersion = "1.5.15"
16+
let [<Literal>] AssemblyVersion = "1.5.16"
17+
let [<Literal>] AssemblyFileVersion = "1.5.16"

‎src/SQLProvider.Firebird.Runtime/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.Firebird.Runtime")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type providers for Firebird database access.")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.15")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.15")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.16")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.16")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.Firebird.Runtime"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type providers for Firebird database access."
16-
let [<Literal>] AssemblyVersion = "1.5.15"
17-
let [<Literal>] AssemblyFileVersion = "1.5.15"
16+
let [<Literal>] AssemblyVersion = "1.5.16"
17+
let [<Literal>] AssemblyFileVersion = "1.5.16"

‎src/SQLProvider.MsAccess.DesignTime/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.MsAccess.DesignTime")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type providers for Microsoft Access database access.")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.15")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.15")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.16")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.16")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.MsAccess.DesignTime"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type providers for Microsoft Access database access."
16-
let [<Literal>] AssemblyVersion = "1.5.15"
17-
let [<Literal>] AssemblyFileVersion = "1.5.15"
16+
let [<Literal>] AssemblyVersion = "1.5.16"
17+
let [<Literal>] AssemblyFileVersion = "1.5.16"

0 commit comments

Comments
 (0)