refactoring - getting rid of datatable constructors mess

Author: ntr

src/SqlClient/DataTable.fs

@@ -8,31 +8,28 @@ open FSharp.Data.SqlClient
 
 [<Sealed>]
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.", 101, IsHidden = true)>]
-type DataTable<'T when 'T :> DataRow> private (tableName, knownSelectCommand, getDesignTimeConnection:Lazy<_>) = 
-    inherit DataTable(tableName)
+type DataTable<'T when 'T :> DataRow> (knownSelectCommandOrDesignTimeInfo) = 
+    inherit DataTable(match knownSelectCommandOrDesignTimeInfo with | Choice1Of2 (tableName, _) -> tableName | _ -> null)
 
+    let tableName = base.TableName
     let rows = base.Rows
     let getSelectCommand maybeRuntimeConnection maybeRuntimeTransaction =
         let makeSelectCommand connection = 
             let selectCommand = new SqlCommand("SELECT * FROM " + tableName)
             selectCommand.Connection <- connection
             selectCommand
 
-        if Option.isSome knownSelectCommand
-        then 
-            knownSelectCommand.Value
-        else
+        match knownSelectCommandOrDesignTimeInfo with
+        | Choice1Of2 (_, (getDesignTimeConnection:Lazy<_>)) ->
             match maybeRuntimeTransaction, maybeRuntimeConnection with
             | Some (tran:SqlTransaction), _ -> 
                 let command = makeSelectCommand tran.Connection
                 command.Transaction <- tran
                 command
             | None, Some connection ->  
-                makeSelectCommand connection
+                makeSelectCommand connection 
             | _ -> makeSelectCommand (getDesignTimeConnection.Value)
-
-    new (tableName, getDesignTimeConnection) = new DataTable<'T>(tableName, None, getDesignTimeConnection)
-    new (createCommand) = new DataTable<'T>(null, Some createCommand, lazy(createCommand.Connection))
+        | Choice2Of2 knownSelectCommand -> knownSelectCommand
 
     member __.Rows : IList<'T> = {
         new IList<'T> with

src/SqlClient/ISqlCommand.fs

@@ -227,14 +227,14 @@ type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connectio
 
     static member internal ExecuteDataTable(cmd, getReaderBehavior, parameters, expectedDataReaderColumns) = 
         use cursor = ``ISqlCommand Implementation``.ExecuteReader(cmd, getReaderBehavior, parameters, expectedDataReaderColumns) 
-        let result = new FSharp.Data.DataTable<DataRow>(cmd)
+        let result = new FSharp.Data.DataTable<DataRow>(Choice2Of2 cmd)
         result.Load(cursor)
         result
 
     static member internal AsyncExecuteDataTable(cmd, getReaderBehavior, parameters, expectedDataReaderColumns) = 
         async {
             use! reader = ``ISqlCommand Implementation``.AsyncExecuteReader(cmd, getReaderBehavior, parameters, expectedDataReaderColumns) 
-            let result = new FSharp.Data.DataTable<DataRow>(cmd)
+            let result = new FSharp.Data.DataTable<DataRow>(Choice2Of2 cmd)
             result.Load(reader)
             return result
         }

src/SqlClient/SqlClient.fsproj

@@ -84,7 +84,7 @@
     <Compile Include="SqlCommandProvider.fs" />
     <Compile Include="SqlClientProvider.fs" />
     <Compile Include="SqlEnumProvider.fs" />
-    <Compile Include="Scripts\Scratchpad.fsx" />
+    <None Include="Scripts\Scratchpad.fsx" />
     <None Include="Scripts\XE.fsx" />
     <None Include="packages.config" />
   </ItemGroup>

src/SqlClient/SqlClientProvider.fs

@@ -372,7 +372,7 @@ type public SqlProgrammabilityProvider(config : TypeProviderConfig) as this =
 
                             let connection = lazy 
                                                  new SqlConnection( %%connectionString.RunTimeValueExpr(config.IsHostedExecution))
-                            let table = new DataTable<DataRow>(twoPartTableName, connection)
+                            let table = new DataTable<DataRow>(Choice1Of2( twoPartTableName, connection))
 
                             let primaryKey = ResizeArray()
                             for line in serializedSchema.Split('\n') do