#195 - Make connection parameter mandatory when literal connection string used at design time (#209)

* #195 - fixed

* small improvment

Author: ntr

src/SqlClient.Tests/SqlClient.Tests.NET40/Program.fs

@@ -1,6 +1,6 @@
 
 open FSharp.Data
 
-let get42 = new SqlCommandProvider<"SELECT 42", "Server=.;Integrated Security=True">()
+let get42 = new SqlCommandProvider<"SELECT 42", "Server=.;Integrated Security=True">("Server=.;Integrated Security=True")
 get42.Execute() |> Seq.toArray |> printfn "%A" 
 

src/SqlClient/Configuration.fs

@@ -79,6 +79,8 @@ type internal DesignTimeConnectionString =
                     else section.ConnectionString
             @@>
 
+    member this.IsDefinedByLiteral = match this with | Literal _ -> true | _ -> false
+
 //this is mess. Clean up later.
 type Configuration = {
     ResultsetRuntimeVerification: bool

src/SqlClient/DesignTime.fs

@@ -454,7 +454,7 @@ type DesignTime private() =
 
         ]
 
-    static member GetCommandCtors(cmdProvidedType: ProvidedTypeDefinition, designTimeConfig, designTimeConnectionString, ?factoryMethodName) = 
+    static member internal GetCommandCtors(cmdProvidedType: ProvidedTypeDefinition, designTimeConfig, (designTimeConnectionString:DesignTimeConnectionString), isHostedExecution, ?factoryMethodName) = 
         [
             let ctorImpl = typeof<``ISqlCommand Implementation``>.GetConstructor [| typeof<DesignTimeConfig>; typeof<Connection>; typeof<int> |]
 
@@ -472,20 +472,26 @@ type DesignTime private() =
             then 
                 yield upcast ProvidedMethod(factoryMethodName.Value, parameters1, returnType = cmdProvidedType, IsStaticMethod = true, InvokeCode = body1)
 
-            let parameters2 = [ 
-                ProvidedParameter("connection", typeof<SqlConnection>, optionalValue = null)
-                ProvidedParameter("transaction", typeof<SqlTransaction>, optionalValue = null) 
-                ProvidedParameter("commandTimeout", typeof<int>, optionalValue = SqlCommand.DefaultTimeout) 
-            ]
-
+            let parameters2 = 
+                    [ 
+                        ProvidedParameter(
+                            "connection", 
+                            typeof<SqlConnection>,
+                            ?optionalValue = if designTimeConnectionString.IsDefinedByLiteral then None else Some null
+                        )           
+                        ProvidedParameter("transaction", typeof<SqlTransaction>, optionalValue = null) 
+                        ProvidedParameter("commandTimeout", typeof<int>, optionalValue = SqlCommand.DefaultTimeout) 
+                    ]
+
+            let connectionStringExpr = designTimeConnectionString.RunTimeValueExpr(isHostedExecution)
             let body2 (args: _ list) =
                 let connArg = 
                     <@@ 
                         if box (%%args.[1]: SqlTransaction) <> null 
                         then Connection.Choice3Of3 %%args.[1]
                         elif box (%%args.[0]: SqlConnection) <> null 
                         then Connection.Choice2Of3 %%args.Head 
-                        else Connection.Choice1Of3( %%designTimeConnectionString)
+                        else Connection.Choice1Of3( %%connectionStringExpr)
                     @@>
                 Expr.NewObject(ctorImpl, [ designTimeConfig ; connArg; args.[2] ])
 

src/SqlClient/SqlClientProvider.fs

@@ -9,7 +9,6 @@ open System.IO
 open System.Reflection
 open System.Runtime.Caching
 open System.Data.SqlTypes
-
 open Microsoft.FSharp.Core.CompilerServices
 open Microsoft.FSharp.Quotations
 
@@ -201,7 +200,8 @@ type public SqlProgrammabilityProvider(config : TypeProviderConfig) as this =
                         yield! DesignTime.GetCommandCtors(
                             cmdProvidedType, 
                             designTimeConfig, 
-                            designTimeConnectionString.RunTimeValueExpr(config.IsHostedExecution)
+                            designTimeConnectionString,
+                            config.IsHostedExecution
                         )
 
                         let executeArgs = DesignTime.GetExecuteArgs(cmdProvidedType, parameters, uddtsPerSchema)
@@ -565,7 +565,8 @@ type public SqlProgrammabilityProvider(config : TypeProviderConfig) as this =
                         DesignTime.GetCommandCtors(
                             cmdProvidedType, 
                             designTimeConfig, 
-                            designTimeConnectionString.RunTimeValueExpr(config.IsHostedExecution),
+                            designTimeConnectionString,
+                            config.IsHostedExecution,
                             factoryMethodName = methodName
                         )
                     assert (ctorsAndFactories.Length = 4)

src/SqlClient/SqlCommandProvider.fs

@@ -167,7 +167,8 @@ type public SqlCommandProvider(config : TypeProviderConfig) as this =
                 DesignTime.GetCommandCtors(
                     cmdProvidedType, 
                     designTimeConfig, 
-                    designTimeConnectionString.RunTimeValueExpr(config.IsHostedExecution),
+                    designTimeConnectionString, 
+                    config.IsHostedExecution,
                     factoryMethodName = "Create"
                 )
                 |> cmdProvidedType.AddMembers