More agressive datareader closings

Thorium · Thorium · commit 4b269766c7b7 · 2025-09-13T18:55:00.000+01:00
diff --git a/src/SQLProvider.Common/SqlRuntime.Linq.fs b/src/SQLProvider.Common/SqlRuntime.Linq.fs
@@ -302,6 +302,7 @@ module internal QueryImplementation =
         if con.State <> ConnectionState.Open then con.Open()
         use reader = cmd.ExecuteReader()
         let results = dc.ReadEntities(baseTable.FullName, columns, reader)
+        reader.Close()
         if provider.CloseConnectionAfterQuery && con.State <> ConnectionState.Closed then con.Close() //else get 'COM object that has been separated from its underlying RCW cannot be used.'
         if not isGroypBy then
             invokeEntitiesListAvoidingDynamicInvoke results projector
@@ -326,6 +327,7 @@ module internal QueryImplementation =
                 con.Open()
            use! reader = cmd.ExecuteReaderAsync() 
            let! results = dc.ReadEntitiesAsync(baseTable.FullName, columns, reader)
+           reader.Close()
            if provider.CloseConnectionAfterQuery then con.Close() //else get 'COM object that has been separated from its underlying RCW cannot be used.'
            return
                if not isGroypBy then
diff --git a/src/SQLProvider.Common/Utils.fs b/src/SQLProvider.Common/Utils.fs
@@ -756,7 +756,7 @@ module Sql =
     open System
     open System.Data
 
-    let private collectfunc(reader:IDataReader) = 
+    let inline private collectfunc(reader:IDataReader) = 
         [|
             for i = 0 to reader.FieldCount - 1 do
                 let v = reader.GetValue i // if we would like to swallow unknown types errors: try reader.GetValue(i) with | :? System.IO.FileNotFoundException as ex -> box ex
@@ -780,10 +780,10 @@ module Sql =
             return res |> Seq.toArray
         }
 
-    let dbUnbox<'a> (v:obj) : 'a = 
+    let inline dbUnbox<'a> (v:obj) : 'a = 
         if Convert.IsDBNull(v) then Unchecked.defaultof<'a> else unbox v
     
-    let dbUnboxWithDefault<'a> def (v:obj) : 'a = 
+    let inline dbUnboxWithDefault<'a> def (v:obj) : 'a = 
         if Convert.IsDBNull(v) then def else unbox v
 
     /// Note: SQLProvider reuses the connection through multiple instances, so you can't dispose it here.
diff --git a/src/SQLProvider.DesignTime/SqlDesignTime.fs b/src/SQLProvider.DesignTime/SqlDesignTime.fs
@@ -177,6 +177,7 @@ module DesignTimeUtils =
                                 if con.State <> ConnectionState.Open then con.Open()
                                 use reader = com.ExecuteReader()
                                 let ret = (dcDone :> ISqlDataContext).ReadEntities(table.FullName+"_"+pkName, columns, reader)
+                                reader.Close()
                                 if (dbVendor <> DatabaseProviderTypes.MSACCESS) then con.Close()
                                 let mapped = ret |> Array.choose(fun e ->
                                         match (e :> IColumnHolder).GetColumn pkName with
diff --git a/src/SQLProvider.Runtime/Providers.DuckDb.fs b/src/SQLProvider.Runtime/Providers.DuckDb.fs
@@ -347,12 +347,13 @@ module DuckDb =
             | [||] -> let! r = com.ExecuteNonQueryAsync()
                       return Unit
             | [|retCol|] ->
-                use! reader = com.ExecuteReaderAsync()
                 match retCol.TypeMapping.ProviderTypeName with
                 | ValueSome "cursor" ->
+                    use! reader = com.ExecuteReaderAsync()
                     let! r = Sql.dataReaderToArrayAsync reader
                     let result = SingleResultSet(retCol.Name, r)
                     let! _ = reader.NextResultAsync()
+                    if not reader.IsClosed then reader.Close()
                     return result
                 | _ ->
                     match outps |> Array.tryFind (fun (_,p) -> p.ParameterName = retCol.Name) with
@@ -361,6 +362,7 @@ module DuckDb =
             | cols ->
                 use! reader = com.ExecuteReaderAsync()
                 let! r = cols |> Array.toList |> Sql.evaluateOneByOne (processReturnColumnAsync reader outps)
+                if not reader.IsClosed then reader.Close()
                 return Set(r)
         }
 
diff --git a/src/SQLProvider.Runtime/Providers.Firebird.fs b/src/SQLProvider.Runtime/Providers.Firebird.fs
@@ -442,12 +442,13 @@ module Firebird =
             | [||] -> let! r = com.ExecuteNonQueryAsync()
                       return Unit
             | [|retCol|] ->
-                use! reader = com.ExecuteReaderAsync()
                 match retCol.TypeMapping.ProviderTypeName with
                 | ValueSome "cursor" ->
+                    use! reader = com.ExecuteReaderAsync()
                     let! r = Sql.dataReaderToArrayAsync reader
                     let result = SingleResultSet(retCol.Name, r)
                     let! _ = reader.NextResultAsync()
+                    if not reader.IsClosed then reader.Close()
                     return result
                 | _ ->
                     match outps |> Array.tryFind (fun (_,p) -> p.ParameterName = retCol.Name) with
@@ -456,6 +457,7 @@ module Firebird =
             | cols ->
                 use! reader = com.ExecuteReaderAsync()
                 let! r = cols |> Array.toList |> Sql.evaluateOneByOne (processReturnColumnAsync reader outps)
+                if not reader.IsClosed then reader.Close()
                 return Set(r)
         }
 
diff --git a/src/SQLProvider.Runtime/Providers.MsSqlServer.Dynamic.fs b/src/SQLProvider.Runtime/Providers.MsSqlServer.Dynamic.fs
@@ -420,6 +420,7 @@ module MSSqlServerDynamic =
                     let! r = Sql.dataReaderToArrayAsync reader
                     let result = SingleResultSet(retCol.Name, r)
                     let! _ = reader.NextResultAsync()
+                    if not reader.IsClosed then reader.Close()
                     return result
                 | _ ->
                     let! r = com.ExecuteNonQueryAsync()
@@ -429,6 +430,7 @@ module MSSqlServerDynamic =
             | cols ->
                 use! reader = com.ExecuteReaderAsync()
                 let! r = cols |> Array.toList |> Sql.evaluateOneByOne (processReturnColumnAsync com reader)
+                if not reader.IsClosed then reader.Close()
                 return Set(r |> List.toArray)
         }
 
diff --git a/src/SQLProvider.Runtime/Providers.MsSqlServer.fs b/src/SQLProvider.Runtime/Providers.MsSqlServer.fs
@@ -347,6 +347,7 @@ module MSSqlServer =
                     let! r = Sql.dataReaderToArrayAsync reader
                     let result = SingleResultSet(retCol.Name, r)
                     let! _ = reader.NextResultAsync()
+                    if not reader.IsClosed then reader.Close()
                     return result
                 | _ ->
                     let! r = com.ExecuteNonQueryAsync()
@@ -356,6 +357,7 @@ module MSSqlServer =
             | cols ->
                 use! reader = com.ExecuteReaderAsync()
                 let! r = cols |> Array.toList |> Sql.evaluateOneByOne (processReturnColumnAsync com reader)
+                if not reader.IsClosed then reader.Close()
                 return Set(r |> List.toArray)
         }
 
diff --git a/src/SQLProvider.Runtime/Providers.MySql.fs b/src/SQLProvider.Runtime/Providers.MySql.fs
@@ -391,12 +391,13 @@ module MySql =
             | [||] -> let! r = com.ExecuteNonQueryAsync()
                       return Unit
             | [|retCol|] ->
-                use! reader = com.ExecuteReaderAsync()
                 match retCol.TypeMapping.ProviderTypeName with
                 | ValueSome "cursor" ->
+                    use! reader = com.ExecuteReaderAsync()
                     let! r = Sql.dataReaderToArrayAsync reader
                     let result = SingleResultSet(retCol.Name, r)
                     let! _ = reader.NextResultAsync()
+                    if not reader.IsClosed then reader.Close()
                     return result
                 | _ ->
                     match outps |> Array.tryFind (fun (_,p) -> p.ParameterName = retCol.Name) with
@@ -405,6 +406,7 @@ module MySql =
             | cols ->
                 use! reader = com.ExecuteReaderAsync()
                 let! r = cols |> Array.toList |> Sql.evaluateOneByOne (processReturnColumnAsync reader outps)
+                if not reader.IsClosed then reader.Close()
                 return Set(r)
         }
 
diff --git a/src/SQLProvider.Runtime/Providers.Oracle.fs b/src/SQLProvider.Runtime/Providers.Oracle.fs
@@ -559,10 +559,11 @@ module internal Oracle =
             | [||] -> let! r = com.ExecuteNonQueryAsync()
                       return Unit
             | [|col|] ->
-                use! reader = com.ExecuteReaderAsync()
                 match col.TypeMapping.ProviderTypeName with
                 | ValueSome "REF CURSOR" -> 
+                    use! reader = com.ExecuteReaderAsync()
                     let! r = Sql.dataReaderToArrayAsync reader
+                    if not reader.IsClosed then reader.Close()
                     return SingleResultSet(col.Name, r)
                 | _ ->
                     match outps |> Array.tryFind (fun (_,p) -> p.ParameterName = col.Name) with
diff --git a/src/SQLProvider.Runtime/Providers.Postgresql.fs b/src/SQLProvider.Runtime/Providers.Postgresql.fs
@@ -431,6 +431,7 @@ module PostgreSQL =
                         task {
                             use! reader = com.ExecuteReaderAsync()
                             let! r = Sql.dataReaderToArrayAsync reader
+                            if not reader.IsClosed then reader.Close()
                             return SingleResultSet(col.Name, r)
                         }
                     | ValueSome "refcursor" ->
@@ -442,6 +443,7 @@ module PostgreSQL =
                                 com.CommandType <- CommandType.Text
                             use! reader = com.ExecuteReaderAsync()
                             let! r = Sql.dataReaderToArrayAsync reader
+                            if not reader.IsClosed then reader.Close()
                             return SingleResultSet(col.Name, r)
                         }
                     | ValueSome "SETOF refcursor" ->
@@ -454,6 +456,7 @@ module PostgreSQL =
                                 let! r = Sql.dataReaderToArrayAsync reader
                                 results := ResultSet("ReturnValue" + (string !i), r) :: !results
                                 incr(i)
+                            if not reader.IsClosed then reader.Close()
                             return Set(!results)
                         }
                     | _ ->
diff --git a/src/SQLProvider.Runtime/Providers.SQLite.fs b/src/SQLProvider.Runtime/Providers.SQLite.fs
@@ -498,6 +498,7 @@ type internal SQLiteProvider(resolutionPath, contextSchemaPath, referencedAssemb
                             return result
                         }
                     let! r = cols |> Seq.toList |> Sql.evaluateOneByOne (processReturnColumnAsync)
+                    if not reader.IsClosed then reader.Close()
                     return Set(r |> List.toArray)
             }
 
diff --git a/src/SQLProvider.Runtime/SqlRuntime.DataContext.fs b/src/SQLProvider.Runtime/SqlRuntime.DataContext.fs
@@ -232,6 +232,7 @@ type public SqlDataContext (typeName, connectionString:string, providerType:Data
             if con.State <> ConnectionState.Open then con.Open()
             use reader = com.ExecuteReader()
             let entity = (this :> ISqlDataContext).ReadEntities(table.FullName, columns, reader) |> Seq.exactlyOne
+            reader.Close()
             if provider.CloseConnectionAfterQuery then con.Close()
             entity
 
