Issue 420: restored TVP column ordering to, expected, column_id

Author: Chai Natan

src/SqlClient.DesignTime/SqlClientExtensions.fs

@@ -525,11 +525,11 @@ from
 select 
 	c.name, c.system_type_id, c.user_type_id, c.is_nullable, c.max_length, c.is_identity, c.is_computed, tt.user_type_id table_type_user_type_id, 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
-order by 
-	tt.user_type_id
-	, c.user_type_id
-	, c.column_id
+    inner join sys.columns as c on tt.type_table_object_id = c.object_id
+order by
+      c.column_id
+    , tt.user_type_id
+    , c.user_type_id
 """
                 , this)   
               use reader = cmd.ExecuteReader()

tests/SqlClient.Tests/TVPTests.fs

@@ -222,4 +222,20 @@ let ``Using Fixed Length Binary TVP``() =
     ]
     |> Seq.map (fun d -> FixedLengthBinaryTVP.FixedLengthBinaryTVPTest (Some d))
     |> cmd.Execute
+    |> ignore
+
+
+type TestTVPColumnOrder = SqlCommandProvider<"EXEC [dbo].[TestTVPColumnOrder] @tvp", ConnectionStrings.AdventureWorksLiteral>
+[<Fact>]
+let ``User Defined Table Types should list columns orderd by Column Id (i.e. the order in which they appear in the declared type)`` () =
+    use cmd = new TestTVPColumnOrder(ConnectionStrings.AdventureWorksLiteral)
+
+    [
+        (1, "some string",        true)
+        (2, "some other string",  false)
+        (3, "yet another string", true)
+    ]
+    |> Seq.map (fun (i, s, b) -> TestTVPColumnOrder.TVPColumnOrder(i, s, b))
+    |> Seq.toList
+    |> cmd.Execute
     |> ignore

tests/SqlClient.Tests/extensions.sql

@@ -61,6 +61,9 @@ GO
 IF OBJECT_ID('dbo.FixedLengthBinaryTVPTestProc') IS NOT NULL
 	DROP PROCEDURE [dbo].[FixedLengthBinaryTVPTestProc]
 GO
+IF OBJECT_ID('dbo.TestTVPColumnOrder') IS NOT NULL
+	DROP PROCEDURE [dbo].[TestTVPColumnOrder]
+GO
 IF OBJECT_ID('Sales.GetUKSalesOrders') IS NOT NULL
 	DROP FUNCTION Sales.GetUKSalesOrders;
 GO
@@ -127,6 +130,10 @@ IF TYPE_ID(N'dbo.FixedLengthBinaryTVPTest') IS NOT NULL
 	DROP TYPE [dbo].[FixedLengthBinaryTVPTest]
 GO
 
+IF TYPE_ID(N'dbo.TVPColumnOrder') IS NOT NULL
+	DROP TYPE [dbo].[TVPColumnOrder]
+GO
+
 
 CREATE TYPE dbo.MyTableType AS TABLE (myId int not null, myName nvarchar(30) null)
 GO
@@ -154,6 +161,13 @@ CREATE TYPE [dbo].[FixedLengthBinaryTVPTest] AS TABLE (
 )
 GO
 
+CREATE TYPE [dbo].[TVPColumnOrder] AS TABLE(
+	[Param1] INT NOT NULL,
+	[Param2] NVARCHAR(100) NOT NULL,
+	[Param3] BIT NOT NULL
+)
+GO
+
 --TABLES
 
 CREATE TABLE dbo.TableHavingColumnNamesWithSpaces (
@@ -269,6 +283,14 @@ BEGIN
 END
 GO
 
+CREATE PROCEDURE [dbo].[TestTVPColumnOrder](
+	@tvpColumnOrder [dbo].[TVPColumnOrder] READONLY
+)
+AS
+	SELECT *
+	FROM   @tvpColumnOrder
+GO
+
 
 CREATE FUNCTION dbo.ufnGetStock2(@ProductID [int] = NULL)
 RETURNS [int]