Merge pull request #391 from smoothdeveloper/issue-345-fix

Issue #345 fix

Author: smoothdeveloper

RELEASE_NOTES.md

@@ -1,3 +1,13 @@
+#### 2.0.7 November 18, 2020
+
+* Issue #345 Decimal values are trimmed when used as part of a TVP
+* Contributors: Suou Ryuu (https://github.com/suou-ryuu), Gauthier Segay (https://github.com/smoothdeveloper)
+
+#### 2.0.6 October 10, 2019
+
+* Issue #364 Fix issues in ToTraceString
+* Contributors: piaste (https://github.com/piaste)
+
 #### 2.0.5 June 11, 2019
 
 * Issue #339 Allow timeout on data table Update commands

build.fsx

@@ -159,7 +159,7 @@ Target.create "DeployTestDB" (fun _ ->
 
     do //create extra object to test corner case
         let script = File.ReadAllText(testsSourceRoot @@ "extensions.sql")
-        for batch in script.Split([|"GO"|], StringSplitOptions.RemoveEmptyEntries) do
+        for batch in script.Split([|"GO";"go"|], StringSplitOptions.RemoveEmptyEntries) do
             use cmd = new SqlCommand(batch, conn)
             cmd.ExecuteNonQuery() |> ignore
 )

src/SqlClient.DesignTime/DesignTime.fs

@@ -543,12 +543,16 @@ type DesignTime private() =
                     let param = ProvidedParameter( name, p.GetProvidedType(), ?optionalValue = if p.Nullable then Some null else None) 
                     let sqlMeta =
                         let dbType = p.TypeInfo.SqlDbType
-                        if p.TypeInfo.IsFixedLength
-                        then <@@ SqlMetaData(name, dbType) @@>
+                        let precision = byte p.Precision
+                        let scale = byte p.Scale
+                        if p.TypeInfo.IsFixedLength then
+                            if scale = 0uy then
+                                <@@ SqlMetaData(name, dbType) @@>
+                            else
+                                <@@ SqlMetaData(name, dbType, precision, scale) @@>
                         else 
-                            let maxLength = p.MaxLength
-                            <@@ SqlMetaData(name, dbType, int64 maxLength) @@>
-
+                            let maxLength = int64 p.MaxLength
+                            <@@ SqlMetaData(name, dbType, maxLength) @@>
                     yield param, sqlMeta
             ] 
 

src/SqlClient.DesignTime/SqlClientExtensions.fs

@@ -395,17 +395,20 @@ type SqlConnection with
         cmd.ExecuteQuery(fun cursor ->
             let user_type_id = cursor.TryGetValue "user_type_id"
             let system_type_id = cursor.["system_type_id"] |> unbox<int>
-
+            let precisionOrdinal = cursor.GetOrdinal("precision")
+            let scaleOrdinal = cursor.GetOrdinal("scale")
             { 
                 Column.Name       = string cursor.["name"]
                 TypeInfo          = findTypeInfoBySqlEngineTypeId (this.ConnectionString, system_type_id, user_type_id)
                 Nullable          = unbox cursor.["is_nullable"]
                 MaxLength         = cursor.["max_length"] |> unbox<int16> |> int
                 ReadOnly          = not( cursor.GetValueOrDefault("is_updateable", true))
                 Identity          = cursor.GetValueOrDefault("is_identity_column", false)
-                PartOfUniqueKey   = cursor.GetValueOrDefault( "is_part_of_unique_key", false)
+                PartOfUniqueKey   = cursor.GetValueOrDefault("is_part_of_unique_key", false)
                 DefaultConstraint = null
                 Description       = null
+                Precision         = int16 (cursor.GetByte precisionOrdinal)
+                Scale             = int16 (cursor.GetByte scaleOrdinal)
             }
         )
         |> Seq.toList 
@@ -434,6 +437,8 @@ type SqlConnection with
                         PartOfUniqueKey = false
                         DefaultConstraint = null
                         Description = null
+                        Precision = unbox row.["NumericPrecision"]
+                        Scale = unbox row.["NumericScale"]
                     }
             ]
 
@@ -480,7 +485,7 @@ type SqlConnection with
                             then
                                 [|
                                     use cmd = new SqlCommand("
-                                        SELECT c.name, c.system_type_id, c.user_type_id, c.is_nullable, c.max_length, c.is_identity, c.is_computed
+                                        SELECT c.name, c.system_type_id, c.user_type_id, c.is_nullable, c.max_length, c.is_identity, c.is_computed, c.[precision], c.scale
                                         FROM sys.table_types AS tt
                                         INNER JOIN sys.columns AS c ON tt.type_table_object_id = c.object_id
                                         WHERE tt.user_type_id = @user_type_id
@@ -490,6 +495,8 @@ type SqlConnection with
                                     cmd.Connection <- this
                                     use reader = cmd.ExecuteReader()
                                     while reader.Read() do 
+                                        let precisionOrdinal = reader.GetOrdinal "precision"
+                                        let scaleOrdinal = reader.GetOrdinal "scale"
                                         let user_type_id = reader.TryGetValue "user_type_id"
                                         let stid = reader.["system_type_id"] |> unbox<byte> |> int
                                         yield {
@@ -502,6 +509,8 @@ type SqlConnection with
                                             PartOfUniqueKey = false
                                             DefaultConstraint = null
                                             Description = null
+                                            Precision = int16 (reader.GetByte precisionOrdinal)
+                                            Scale = int16 (reader.GetByte scaleOrdinal)
                                         }
                                 |] 
                             else

src/SqlClient.DesignTime/SqlClientProvider.fs

@@ -259,6 +259,8 @@ type SqlProgrammabilityProvider(config : TypeProviderConfig) as this =
 	                        ,is_part_of_unique_key = CONVERT(BIT, CASE WHEN index_columns.object_id IS NULL THEN 0 ELSE 1 END)
 	                        ,default_constraint = ISNULL(OBJECT_DEFINITION(default_object_id), '')
 	                        ,description = ISNULL(XProp.Value, '')
+                          , columns.precision
+                          , columns.scale
                         FROM 
 	                        sys.schemas 
 	                        JOIN sys.tables ON 

src/SqlClient/Shared.fs

@@ -51,6 +51,8 @@ type Column = {
     PartOfUniqueKey: bool
     DefaultConstraint: string
     Description: string
+    Precision: int16
+    Scale: int16
 }   with
     member this.ErasedToType = 
         if this.Nullable
@@ -77,7 +79,10 @@ type Column = {
     member this.HasDefaultConstraint = this.DefaultConstraint <> ""
     member this.NullableParameter = this.Nullable || this.HasDefaultConstraint
 
-    static member Parse(cursor: SqlDataReader, typeLookup: int * int option -> TypeInfo, ?defaultValue, ?description) = {
+    static member Parse(cursor: SqlDataReader, typeLookup: int * int option -> TypeInfo, ?defaultValue, ?description) = 
+      let precisionOrdinal = cursor.GetOrdinal "precision"
+      let scaleOrdinal = cursor.GetOrdinal "scale"
+      {
         Name = unbox cursor.["name"]
         TypeInfo = 
             let system_type_id = unbox<byte> cursor.["system_type_id"] |> int
@@ -90,7 +95,9 @@ type Column = {
         PartOfUniqueKey = unbox cursor.["is_part_of_unique_key"]
         DefaultConstraint = defaultArg defaultValue ""
         Description = defaultArg description ""
-    }
+        Precision = int16 (cursor.GetByte precisionOrdinal)
+        Scale = int16 (cursor.GetByte scaleOrdinal)
+      }
 
     override this.ToString() = 
         sprintf "%s\t%s\t%b\t%i\t%b\t%b\t%b\t%s\t%s" 

tests/SqlClient.Tests/TVPTests.fs

@@ -185,3 +185,12 @@ let UsingMappedTVPFixedInQuery() =
         |> Seq.toList
 
     Assert.Equal<_ list>(expected, actual)
+
+type AdventureWorks = SqlProgrammabilityProvider<ConnectionStrings.AdventureWorksNamed>
+[<Fact>]
+let ``issue #345 decimal in TVP gets rounded`` () =
+    let value = Some 1.2345M
+    let tvp = [AdventureWorks.dbo.``User-Defined Table Types``.decimal_test_tvp(value)]
+    use cmd = new AdventureWorks.dbo.decimal_test(ConnectionStrings.AdventureWorksLiteral)
+    let resultvalue = cmd.Execute(tvp) |> Seq.head
+    Assert.Equal(value, resultvalue)

tests/SqlClient.Tests/extensions.sql

@@ -352,3 +352,20 @@ GO
 CREATE SYNONYM dbo.HRShift FOR HumanResources.Shift
 GO
 
+
+-- issue #345
+if object_id('dbo.decimal_test') is not null
+	drop procedure dbo.decimal_test
+go
+if type_id('dbo.decimal_test_tvp') is not null
+	drop type dbo.decimal_test_tvp
+go
+create type dbo.decimal_test_tvp as table(quantity decimal(22,8) null)
+go
+create procedure dbo.decimal_test (@tvp dbo.decimal_test_tvp readonly)
+as
+begin
+    select quantity from @tvp
+end
+go
+