work to address feature #214 Expose an additional Table type when ResultType.DataTable is used

* add DesignTime.GetDataTableType to encapsulate creation of Table type (might make the type name a parameter in later consolidation, see note)
* when ResultType.DataTable is used, add the ProvidedType (which was already of DataTable type) as a member to SqlCommandProvider provided type
* add a simple unit test which shows that we can specify the type explicitly (I've removed importing ProgrammabilityTest as it is only needed for a single SqlProgrammabilityProvider definition, better to not couple test modules too much)

Note: I've only changed SqlCommandProvider, but I noticed there is some code duplication already for the SqlClient provider itself in handling the DataRow and DataTable types.

Author: smoothdeveloper

src/SqlClient.Tests/DataTablesTests.fs

@@ -9,15 +9,14 @@ open FSharp.Data
 open FSharp.Data.SqlClient
 open Xunit
 
-open ProgrammabilityTest
-
+type AdventureWorks = SqlProgrammabilityProvider<ConnectionStrings.AdventureWorksNamed>
 //Tables types structured as: [TypeAlias].[Namespace].Tables.[TableName]
 type ShiftTable = AdventureWorks.HumanResources.Tables.Shift
 type ProductCostHistory = AdventureWorks.Production.Tables.ProductCostHistory
 
 type GetRowCount = SqlCommandProvider<"SELECT COUNT(*) FROM HumanResources.Shift", ConnectionStrings.AdventureWorksNamed, SingleRow = true>
 type GetShiftTableData = SqlCommandProvider<"SELECT * FROM HumanResources.Shift", ConnectionStrings.AdventureWorksNamed, ResultType.DataReader>
-
+type GetArbitraryDataAsDataTable = SqlCommandProvider<"select 1 a, 2 b, 3 c", ConnectionStrings.AdventureWorksNamed, ResultType.DataTable>
 type DataTablesTests() = 
 
     do
@@ -270,3 +269,11 @@ type DataTablesTests() =
         let t = new AdventureWorks.dbo.Tables.TableHavingColumnNamesWithSpaces()
         t.AddRow()
         Assert.Equal(1, t.Update())
+
+    [<Fact>]
+    member __.``Can use Table type when ResultType = ResultType.DataTable`` () =
+      let t : GetArbitraryDataAsDataTable.Table = (new GetArbitraryDataAsDataTable()).Execute()
+      Assert.NotNull(t)
+      Assert.Equal(1, t.Rows.[0].a)
+      Assert.Equal(2, t.Rows.[0].b)
+      Assert.Equal(3, t.Rows.[0].c)

src/SqlClient/DesignTime.fs

@@ -150,7 +150,7 @@ type DesignTime private() =
         recordType.AddMember ctor
 
         recordType    
-
+    
     static member internal GetDataRowType (columns: Column list) = 
         let rowType = ProvidedTypeDefinition("Row", Some typeof<DataRow>)
 
@@ -175,6 +175,11 @@ type DesignTime private() =
 
         rowType
 
+    static member internal GetDataTableType dataRowType =
+      let tableType = ProvidedTypeBuilder.MakeGenericType(typedefof<_ DataTable>, [ dataRowType ])
+      let tableProvidedType = ProvidedTypeDefinition("Table", Some tableType)
+      tableProvidedType
+
     static member internal GetOutputTypes (outputColumns: Column list, resultType, rank: ResultRank, hasOutputParameters) =    
         if resultType = ResultType.DataReader 
         then 
@@ -185,9 +190,9 @@ type DesignTime private() =
         elif resultType = ResultType.DataTable 
         then
             let dataRowType = DesignTime.GetDataRowType outputColumns
-
+            let dataTableType = DesignTime.GetDataTableType dataRowType 
             {
-                ProvidedType = ProvidedTypeBuilder.MakeGenericType(typedefof<_ DataTable>, [ dataRowType ])
+                ProvidedType = dataTableType
                 ErasedToType = typeof<DataTable<DataRow>>
                 ProvidedRowType = Some dataRowType
                 ErasedToRowType = typeof<Void>
@@ -226,7 +231,6 @@ type DesignTime private() =
 
                     let tupleTypeName = tupleType.PartialAssemblyQualifiedName
                     None, tupleType, <@@ Microsoft.FSharp.Reflection.FSharpValue.PreComputeTupleConstructor (Type.GetType (tupleTypeName))  @@>
-                    //None, tupleType, <@@ fun values -> Type.GetType(tupleTypeName, throwOnError = true).GetConstructors().[0].Invoke(values) @@>
 
             let nullsToOptions = QuotationsFactory.MapArrayNullableItems(outputColumns, "MapArrayObjItemToOption") 
             let combineWithNullsToOptions = typeof<QuotationsFactory>.GetMethod("GetMapperWithNullsToOptions") 
@@ -241,7 +245,7 @@ type DesignTime private() =
                     Some( typedefof<_ option>), typedefof<_ option>.MakeGenericType([| erasedToRowType |])
                 else //ResultRank.ScalarValue
                     None, erasedToRowType
-                          
+
             {
                 ProvidedType = 
                     if providedRowType.IsSome && genericOutputType.IsSome
@@ -499,4 +503,4 @@ type DesignTime private() =
             if factoryMethodName.IsSome
             then 
                 yield upcast ProvidedMethod(factoryMethodName.Value, parameters2, returnType = cmdProvidedType, IsStaticMethod = true, InvokeCode = body2)
-        ]
+        ]

src/SqlClient/SqlCommandProvider.fs

@@ -141,8 +141,13 @@ type public SqlCommandProvider(config : TypeProviderConfig) as this =
         do  
             cmdProvidedType.AddMember(ProvidedProperty("ConnectionStringOrName", typeof<string>, [], IsStatic = true, GetterCode = fun _ -> <@@ connectionStringOrName @@>))
 
-        do  //Record
+        do  
+            //for ResultType.Record and ResultType.DataTable
             output.ProvidedRowType |> Option.iter cmdProvidedType.AddMember
+            
+            if resultType = ResultType.DataTable then
+                // add .Table
+                output.ProvidedType |>  cmdProvidedType.AddMember
 
         do  //ctors
             let designTimeConfig = 
@@ -218,4 +223,4 @@ type public SqlCommandProvider(config : TypeProviderConfig) as this =
                         reader.ReadToEnd())
                 if not (task.Wait(TimeSpan.FromSeconds(1.))) then failwithf "Couldn't read command from file %s" path
                 task.Result, Some watcher 
-        | _ -> commandTextOrPath, None
+        | _ -> commandTextOrPath, None