first go at deprecating FSharp.Data namespace usage

Author: smoothdeveloper

src/SqlClient.DesignTime/DesignTime.fs

@@ -9,7 +9,7 @@ open System.Collections.Generic
 open System.Diagnostics
 open Microsoft.FSharp.Quotations
 open ProviderImplementation.ProvidedTypes
-open FSharp.Data
+open FSharp.Data.SqlClient.Internals
 open System.Text.RegularExpressions
 
 type internal RowType = {

src/SqlClient.DesignTime/QuotationsFactory.fs

@@ -9,7 +9,7 @@ open System.Diagnostics
 
 open Microsoft.FSharp.Quotations
 
-open FSharp.Data
+open FSharp.Data.SqlClient.Internals
 
 type QuotationsFactory private() = 
 

src/SqlClient.DesignTime/SqlClientExtensions.fs

@@ -7,7 +7,7 @@ open System.Collections.Generic
 open System.IO
 open System.Threading.Tasks
 open System.Data.SqlClient
-open FSharp.Data
+open FSharp.Data.SqlClient.Internals
 open System.Diagnostics
 
 type internal TypeInfoPerConnectionStringCache() =

src/SqlClient.DesignTime/SqlClientProvider.fs

@@ -13,6 +13,7 @@ open Microsoft.FSharp.Quotations
 open ProviderImplementation.ProvidedTypes
 
 open FSharp.Data.SqlClient
+open FSharp.Data.SqlClient.Internals
 
 [<TypeProvider>]
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.", 101, IsHidden = true)>]
@@ -140,7 +141,7 @@ type SqlProgrammabilityProvider(config : TypeProviderConfig) as this =
                 //tagProvidedType rowType
     ]
 
-     static member internal UnitsOfMeasure( connStr, schema, sqlDataTypesForConnection: FSharp.Data.TypeInfo array) = [
+     static member internal UnitsOfMeasure( connStr, schema, sqlDataTypesForConnection: TypeInfo array) = [
         for t in sqlDataTypesForConnection do
             if t.Schema = schema && t.IsUnitOfMeasure
             then 
@@ -465,6 +466,9 @@ type SqlProgrammabilityProvider(config : TypeProviderConfig) as this =
 
             let getMethodImpl = 
                 lazy 
+                    // was hitting assert of datatypesmap not being loaded for connection
+                    let _ = conn.LoadDataTypesMap()
+                    
                     let sqlStatement, resultType, singleRow, allParametersOptional, typename = 
                         unbox args.[0], unbox args.[1], unbox args.[2], unbox args.[3], unbox args.[4]
 

src/SqlClient.DesignTime/SqlCommandProvider.fs

@@ -10,6 +10,7 @@ open Microsoft.FSharp.Core.CompilerServices
 open Microsoft.FSharp.Quotations
 
 open FSharp.Data.SqlClient
+open FSharp.Data.SqlClient.Internals
 
 open ProviderImplementation.ProvidedTypes
 

src/SqlClient.Samples/WebApi/Global.asax.cs

@@ -11,7 +11,7 @@ namespace WebApi
 {
     public class Global : System.Web.HttpApplication
     {
-
+    
         protected void Application_Start(object sender, EventArgs e)
         {
             GlobalConfiguration.Configuration.Routes.MapHttpRoute("DefaultAPI", "{controller}/{id}", new { controller = "Home", id = RouteParameter.Optional });

src/SqlClient/Configuration.fs

@@ -1,19 +1,37 @@
-namespace FSharp.Data.SqlClient
+namespace FSharp.Data.SqlClient.Internals
 
 //this is mess. Clean up later.
-type Configuration = {
+type FsharpDataSqlClientConfiguration = {
     ResultsetRuntimeVerification: bool
-}   
-
-namespace FSharp.Data
+}
 
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 [<AutoOpen>]
 module Configuration = 
-    let private guard = obj()
-    let mutable private current = { SqlClient.Configuration.ResultsetRuntimeVerification = false }
+    let internal guard = obj()
+    let mutable internal current = { FsharpDataSqlClientConfiguration.ResultsetRuntimeVerification = false }
 
-    type SqlClient.Configuration with
+    type FsharpDataSqlClientConfiguration with
         static member Current 
             with get() = lock guard <| fun() -> current
             and set value = lock guard <| fun() -> current <- value
+
+#if WITH_LEGACY_NAMESPACE
+namespace FSharp.Data.SqlClient
+open System
+[<Obsolete("use 'FSharp.Data.SqlClient.Internals.FsharpDataSqlClientConfiguration' instead");AutoOpen>]
+type Configuration = FSharp.Data.SqlClient.Internals.FsharpDataSqlClientConfiguration
+namespace FSharp.Data
+open System
+open FSharp.Data.SqlClient.Internals
+open FSharp.Data.SqlClient.Internals.Configuration
+[<Obsolete("use open 'FSharp.Data.SqlClient.Internals' namespace instead")>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<AutoOpen>]
+module Configuration = 
+    type FsharpDataSqlClientConfiguration with
+       static member Current 
+           with get() = lock Configuration.guard <| fun() -> Configuration.current
+           and set value = lock Configuration.guard <| fun() -> Configuration.current <- value
+
+#endif

src/SqlClient/DataTable.fs

@@ -1,9 +1,10 @@
-namespace FSharp.Data
+namespace FSharp.Data.SqlClient
 
 open System
 open System.Data
 open System.Data.SqlClient
 open System.Collections.Generic
+open FSharp.Data.SqlClient.Internals
 
 [<Sealed>]
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.", 101, IsHidden = true)>]
@@ -111,3 +112,10 @@ type DataTable<'T when 'T :> DataRow>(selectCommand: SqlCommand, ?connectionStri
         timeout |> Option.iter (fun x -> bulkCopy.BulkCopyTimeout <- int x.TotalSeconds)
         bulkCopy.WriteToServer this
 
+#if WITH_LEGACY_NAMESPACE
+namespace FSharp.Data
+open System
+open System.Data
+[<Obsolete("use 'FSharp.Data.SqlClient.DataTable' instead");AutoOpen>]
+type DataTable<'T when 'T :> DataRow> = FSharp.Data.SqlClient.DataTable<'T>
+#endif

src/SqlClient/Extensions.fs

@@ -1,4 +1,4 @@
-namespace FSharp.Data
+namespace FSharp.Data.SqlClient.Internals
 
 open System
 open System.Data
@@ -65,3 +65,12 @@ module Extensions =
             assert (this.State = ConnectionState.Open)
             use cmd = new SqlCommand("SELECT SERVERPROPERTY('edition')", this)
             cmd.ExecuteScalar().Equals("SQL Azure")
+
+
+#if WITH_LEGACY_NAMESPACE
+namespace FSharp.Data
+open System
+[<Obsolete("use open 'FSharp.Data.SqlClient.Internals' namespace instead");AutoOpen>]
+module ObsoleteExtensions = 
+  module Extensions = FSharp.Data.SqlClient.Internals.Extensions
+#endif

src/SqlClient/ISqlCommand.fs

@@ -1,11 +1,11 @@
-namespace FSharp.Data
+namespace FSharp.Data.SqlClient.Internals
 
 open System
 open System.Data
 open System.Data.SqlClient
 open System.Reflection
-
 open FSharp.Data.SqlClient
+open FSharp.Data.SqlClient.Internals
 open System.Linq
 
 
@@ -245,7 +245,7 @@ type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connectio
     //Execute/AsyncExecute versions
 
     static member internal VerifyResultsetColumns(cursor: SqlDataReader, expected) = 
-        if Configuration.Current.ResultsetRuntimeVerification
+        if FsharpDataSqlClientConfiguration.Current.ResultsetRuntimeVerification
         then 
             if cursor.FieldCount < Array.length expected
             then 
@@ -278,14 +278,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 DataTable<DataRow>(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 DataTable<DataRow>(cmd)
             result.Load(reader)
             return result
         }
@@ -370,3 +370,15 @@ type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connectio
             use _ = cmd.Connection.UseLocally(manageConnection )
             return! cmd.AsyncExecuteNonQuery() 
         }
+
+#if WITH_LEGACY_NAMESPACE
+namespace FSharp.Data
+open System
+open System.Data
+[<Obsolete("use 'FSharp.Data.SqlClient.Internals.``ISqlCommand Implementation``' instead");AutoOpen>]
+type ``ISqlCommand Implementation`` = FSharp.Data.SqlClient.Internals.``ISqlCommand Implementation``
+[<Obsolete("use 'FSharp.Data.SqlClient.Internals.ISqlCommand' instead");AutoOpen>]
+type ISqlCommand = FSharp.Data.SqlClient.Internals.ISqlCommand
+[<Obsolete("use 'FSharp.Data.SqlClient.Internals.DesignTimeConfig' instead");AutoOpen>]
+type DesignTimeConfig = FSharp.Data.SqlClient.Internals.DesignTimeConfig
+#endif