ISqlCommand Implementation.Dispose disposes cmd.Connection if it's created in the ctor

target .NET 4.6.2
reference FSharp.Core and FSharp.Compiler.Tools via NuGet

Author: Vasily Kirichenko

src/SqlClient/DesignTime.fs

@@ -10,6 +10,7 @@ open System.Diagnostics
 open Microsoft.FSharp.Quotations
 open ProviderImplementation.ProvidedTypes
 open FSharp.Data
+open FSharp.Data.SqlClient.Extensions
 
 type internal RowType = {
     Provided: Type

src/SqlClient/ISqlCommand.fs

@@ -58,6 +58,7 @@ type internal Connection = Choice<string, SqlConnection, SqlTransaction>
 type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connection, commandTimeout) = 
 
     let cmd = new SqlCommand(cfg.SqlStatement, CommandTimeout = commandTimeout)
+    
     let manageConnection = 
         match connection with
         | Choice1Of3 connectionString -> 
@@ -73,7 +74,7 @@ type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connectio
 
     do
         cmd.CommandType <- if cfg.IsStoredProcedure then CommandType.StoredProcedure else CommandType.Text
-        cmd.Parameters.AddRange( cfg.Parameters)
+        cmd.Parameters.AddRange(cfg.Parameters)
 
     let getReaderBehavior() = 
         seq {
@@ -169,6 +170,8 @@ type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connectio
 
     interface IDisposable with
         member this.Dispose() =
+            if manageConnection then
+                cmd.Connection.Dispose()
             cmd.Dispose()
 
     static member internal SetParameters(cmd: SqlCommand, parameters: (string * obj)[]) = 
@@ -305,9 +308,9 @@ type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connectio
             assert (rank = ResultRank.Sequence)
             box xs 
 
-    static member internal ExecuteNonQuery manageConnection (cmd, _, parameters, _) = 
+    static member internal ExecuteNonQuery (manageConnection: bool) (cmd, _, parameters, _) = 
         ``ISqlCommand Implementation``.SetParameters(cmd, parameters)  
-        use openedConnection = cmd.Connection.UseLocally(manageConnection )
+        use openedConnection = cmd.Connection.UseLocally(manageConnection)
         let recordsAffected = cmd.ExecuteNonQuery() 
         for i = 0 to parameters.Length - 1 do
             let name, _ = parameters.[i]

src/SqlClient/ProvidedTypes.fs

@@ -494,7 +494,7 @@ module internal Misc =
                             else
                             Some (args.[1], args.[1])
                         )
-                        |> Seq.nth (n - 1)
+                        |> Seq.item (n - 1)
 
                     let adaptMethod = getFastFuncType args resultType
                     let adapted = E.Call(adaptMethod, [loop applicable])

src/SqlClient/SqlClient.fsproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\FSharp.Compiler.Tools.10.0.1\build\FSharp.Compiler.Tools.props" Condition="Exists('..\..\packages\FSharp.Compiler.Tools.10.0.1\build\FSharp.Compiler.Tools.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SqlCommandTypeProvider</RootNamespace>
     <AssemblyName>FSharp.Data.SqlClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <Name>SqlClient</Name>
     <TargetFrameworkProfile />
     <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
@@ -51,7 +52,8 @@
     <OtherFlags>--warnon:1182</OtherFlags>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="FSharp.Core, Version=4.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom">
@@ -114,6 +116,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\..\packages\FSharp.Compiler.Tools.10.0.1\build\FSharp.Compiler.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\FSharp.Compiler.Tools.10.0.1\build\FSharp.Compiler.Tools.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/SqlClient/packages.config

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="FSharp.Compiler.Tools" version="10.0.1" targetFramework="net462" />
+  <package id="FSharp.Core" version="4.3.4" targetFramework="net462" />
   <package id="FSharp.TypeProviders.StarterPack" version="1.1.3.72" targetFramework="net40" />
 </packages>