Merge branch 'master' into try-designtime-netstandard-support

Author: smoothdeveloper

.gitignore

@@ -46,7 +46,7 @@ local.properties
 *.suo
 *.user
 *.sln.docstates
-
+launchSettings.json
 # Build results
 
 [Dd]ebug/

README.md

@@ -103,3 +103,4 @@ More information can be found in the [documentation](http://fsprojects.github.io
 
 The default maintainer account for projects under "fsprojects" is [@fsprojectsgit](https://github.com/fsprojectsgit) - F# Community Project Incubation Space (repo management)
 
+Thanks Jetbrains for their open source license program and providing their tool.

RELEASE_NOTES.md

@@ -1,3 +1,9 @@
+#### 2.0.4 May 27, 2019
+
+* Issue #340 Some primitive types such as Guid weren't supported as output parameters.
+
+Contributor(s): Jérémie Chassaing (https://github.com/thinkbeforecoding)
+
 #### 2.0.3 April 15, 2019
 * Issue #332 Invalidate SqlFile type when referenced SQL file is modified.
 

src/SqlClient.DesignTime/AssemblyInfo.fs

@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("SqlClient.DesignTime")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data.SqlClient.DesignTime")>]
 [<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
-[<assembly: AssemblyVersionAttribute("2.0.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.0.3")>]
+[<assembly: AssemblyVersionAttribute("2.0.4")>]
+[<assembly: AssemblyFileVersionAttribute("2.0.4")>]
 [<assembly: InternalsVisibleToAttribute("SqlClient.Tests")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "SqlClient.DesignTime"
     let [<Literal>] AssemblyProduct = "FSharp.Data.SqlClient.DesignTime"
     let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
-    let [<Literal>] AssemblyVersion = "2.0.3"
-    let [<Literal>] AssemblyFileVersion = "2.0.3"
+    let [<Literal>] AssemblyVersion = "2.0.4"
+    let [<Literal>] AssemblyFileVersion = "2.0.4"
     let [<Literal>] InternalsVisibleTo = "SqlClient.Tests"

src/SqlClient.DesignTime/DesignTime.fs

@@ -78,7 +78,10 @@ type DesignTime private() =
 
                         if t.IsArray
                         then Expr.Value(Array.CreateInstance(t.GetElementType(), param.Size))
-                        else Expr.Value(Activator.CreateInstance(t), t)
+                        elif t.IsPrimitive then
+                            Expr.Value(Activator.CreateInstance(t), t)
+                        else
+                            Expr.DefaultValue(t)
 
                 <@@ (%%Expr.Value(param.Name) : string), %%Expr.Coerce(value, typeof<obj>) @@>
             )
@@ -100,9 +103,10 @@ type DesignTime private() =
                             if sqlParam.Direction.HasFlag( ParameterDirection.Output)
                             then 
                                 let mi = 
-                                    typeof<Mapper>
-                                        .GetMethod("SetRef")
-                                        .MakeGenericMethod( sqlParam.TypeInfo.ClrType)
+                                    ProvidedTypeBuilder.MakeGenericMethod(
+                                        typeof<Mapper>
+                                            .GetMethod("SetRef"),
+                                            [sqlParam.TypeInfo.ClrType])
                                 Expr.Call(mi, [ argExpr; Expr.Var arr; Expr.Value index ]) |> Some
                             else 
                                 None

src/SqlClient/AssemblyInfo.fs

@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("SqlClient")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data.SqlClient")>]
 [<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
-[<assembly: AssemblyVersionAttribute("2.0.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.0.3")>]
+[<assembly: AssemblyVersionAttribute("2.0.4")>]
+[<assembly: AssemblyFileVersionAttribute("2.0.4")>]
 [<assembly: InternalsVisibleToAttribute("SqlClient.Tests")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "SqlClient"
     let [<Literal>] AssemblyProduct = "FSharp.Data.SqlClient"
     let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
-    let [<Literal>] AssemblyVersion = "2.0.3"
-    let [<Literal>] AssemblyFileVersion = "2.0.3"
+    let [<Literal>] AssemblyVersion = "2.0.4"
+    let [<Literal>] AssemblyFileVersion = "2.0.4"
     let [<Literal>] InternalsVisibleTo = "SqlClient.Tests"

src/SqlClient/Shared.fs

@@ -35,7 +35,11 @@ type Mapper private() =
             mapper values
 
     static member SetRef<'t>(r : byref<'t>, arr: (string * obj)[], i) = 
-        r <- arr.[i] |> snd |> unbox
+        let value = arr.[i] |> snd
+        r <-
+            match value with
+            | :? 't as v -> v
+            | _ (* dbnull *) -> Unchecked.defaultof<'t>
 
 type Column = {
     Name: string

tests/SqlClient.Tests/ProgrammabilityTests.fs

@@ -232,6 +232,30 @@ let ResultSetAndOutParam() =
     Assert.Equal<_ list>([ Some "donkey" ], [ for x in result -> x.myName ] )
     Assert.Equal(2L, !total)
 
+// Fix #340: 
+//    The type provider cannot use Expr.Value(Activator.CreateInstance(t),t) for
+//    non primitive types, like System.Guid.
+//    It now use Expr.DefaultValue(t) for non primite types.
+//    The PassGuid SP copies the input guid to the output parameter when the boolean
+//    parameter is true, and let the out parameter uninitialized when false
+[<Fact>]
+let NonPrimitiveOutParam() =
+    let guid = Guid.NewGuid()
+    let cmd = new AdventureWorks.dbo.PassGuid()
+    let _,result = cmd.Execute(guid, true)
+    Assert.Equal(guid, result)
+
+// Fix #340: 
+//    When an output parameter has not been set, its value is DBNull which cannot
+//    be unboxed. The fix sets the parameter to defaultOf<'t>.
+//    The PassGuid SP copies the input guid to the output parameter when the boolean
+//    parameter is true, and let the out parameter uninitialized when false
+[<Fact>]
+let NonPrimitiveNullOutParam() =
+    let guid = Guid.NewGuid()
+    let cmd = new AdventureWorks.dbo.PassGuid()
+    let _,result = cmd.Execute(guid, false)
+    Assert.Equal(Guid.Empty, result)
 
 [<Fact>]
 let PassingImageAsParamDoesntGetCut() = 

tests/SqlClient.Tests/extensions.sql

@@ -7,6 +7,9 @@ USE AdventureWorks2012
 IF OBJECT_ID('dbo.AddRef') IS NOT NULL 
 	DROP PROCEDURE dbo.AddRef;
 GO
+IF OBJECT_ID('dbo.PassGuid') IS NOT NULL 
+	DROP PROCEDURE dbo.PassGuid;
+GO
 IF OBJECT_ID('dbo.MyProc') IS NOT NULL
 	DROP PROCEDURE dbo.MyProc;
 GO
@@ -169,6 +172,16 @@ BEGIN
 END
 GO
 
+CREATE PROCEDURE dbo.PassGuid @x AS UNIQUEIDENTIFIER, @b AS BIT, @result AS UNIQUEIDENTIFIER OUTPUT 
+AS
+BEGIN
+	IF (@b = 1)
+	BEGIN
+		SET @result = @x 
+	END
+END
+GO
+
 CREATE PROCEDURE dbo.MyProc @p1 dbo.MyTableType readonly AS
 BEGIN
    SELECT * from @p1 p