* fix assembly replacement map given to TypeProviderForNamespaces constructors

* fix remaining naked references to System.Data.SqlClient namespaces in tests

Author: smoothdeveloper

src/SqlClient.DesignTime/SingleRootTypeProvider.fs

@@ -8,7 +8,16 @@ open System
 [<AbstractClass>]
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.", 101, IsHidden = true)>]
 type SingleRootTypeProvider(config: TypeProviderConfig, providerName, parameters, ?isErased) as this = 
-    inherit TypeProviderForNamespaces (config, assemblyReplacementMap=[("FSharp.Data.SqlClient.DesignTime", "FSharp.Data.SqlClient")], addDefaultProbingLocation=true)
+    inherit TypeProviderForNamespaces (
+      config
+      #if MICROSOFT_DATA_SQLCLIENT
+      , assemblyReplacementMap=[("FSharp.Data.MicrosoftSqlClient.DesignTime", "FSharp.Data.MicrosoftSqlClient")]
+      #endif
+      #if SYSTEM_DATA_SQLCLIENT
+      , assemblyReplacementMap=[("FSharp.Data.SqlClient.DesignTime", "FSharp.Data.SqlClient")]
+      #endif
+      , addDefaultProbingLocation=true
+    )
 
     let cache = new Cache<ProvidedTypeDefinition>()
     do

src/SqlClient.DesignTime/SqlClientProvider.fs

@@ -24,7 +24,16 @@ 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)>]
 type SqlProgrammabilityProvider(config : TypeProviderConfig) as this = 
-    inherit TypeProviderForNamespaces (config, assemblyReplacementMap=[("FSharp.Data.SqlClient.DesignTime", "FSharp.Data.SqlClient")], addDefaultProbingLocation=true)
+    inherit TypeProviderForNamespaces (
+      config
+      #if MICROSOFT_DATA_SQLCLIENT
+      , assemblyReplacementMap=[("FSharp.Data.MicrosoftSqlClient.DesignTime", "FSharp.Data.MicrosoftSqlClient")]
+      #endif
+      #if SYSTEM_DATA_SQLCLIENT
+      , assemblyReplacementMap=[("FSharp.Data.SqlClient.DesignTime", "FSharp.Data.SqlClient")]
+      #endif
+      , addDefaultProbingLocation=true
+    )
 
     let assembly = Assembly.GetExecutingAssembly()
     let nameSpace = this.GetType().Namespace

src/SqlClient.DesignTime/SqlCommandProvider.fs

@@ -37,7 +37,16 @@ module X =
 [<TypeProvider>]
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.", 101, IsHidden = true)>]
 type SqlCommandProvider(config : TypeProviderConfig) as this = 
-    inherit TypeProviderForNamespaces (config, assemblyReplacementMap=[("FSharp.Data.SqlClient.DesignTime", "FSharp.Data.SqlClient")], addDefaultProbingLocation=true)
+    inherit TypeProviderForNamespaces (
+      config
+      #if MICROSOFT_DATA_SQLCLIENT
+      , assemblyReplacementMap=[("FSharp.Data.MicrosoftSqlClient.DesignTime", "FSharp.Data.MicrosoftSqlClient")]
+      #endif
+      #if SYSTEM_DATA_SQLCLIENT
+      , assemblyReplacementMap=[("FSharp.Data.SqlClient.DesignTime", "FSharp.Data.SqlClient")]
+      #endif
+      , addDefaultProbingLocation=true
+    )
 
     let nameSpace = this.GetType().Namespace
     let assembly = Assembly.GetExecutingAssembly()

src/SqlClient.DesignTime/SqlEnumProvider.fs

@@ -17,7 +17,16 @@ open FSharp.Data.SqlClient
 [<TypeProvider>]
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.", 101, IsHidden = true)>]
 type SqlEnumProvider(config : TypeProviderConfig) as this = 
-    inherit TypeProviderForNamespaces (config, assemblyReplacementMap=[("FSharp.Data.SqlClient.DesignTime", "FSharp.Data.SqlClient")], addDefaultProbingLocation=true)
+    inherit TypeProviderForNamespaces (
+      config
+      #if MICROSOFT_DATA_SQLCLIENT
+      , assemblyReplacementMap=[("FSharp.Data.MicrosoftSqlClient.DesignTime", "FSharp.Data.MicrosoftSqlClient")]
+      #endif
+      #if SYSTEM_DATA_SQLCLIENT
+      , assemblyReplacementMap=[("FSharp.Data.SqlClient.DesignTime", "FSharp.Data.SqlClient")]
+      #endif
+      , addDefaultProbingLocation=true
+    )
 
     let nameSpace = this.GetType().Namespace
     let assembly = Assembly.GetExecutingAssembly()

tests/SqlClient.Tests/CreateCommand.fs

@@ -141,11 +141,18 @@ module TraceTests =
         let expected = sprintf "exec sp_executesql N'SELECT CAST(@Value AS NVARCHAR(20))',N'@Value NVarChar(20)',@Value=NULL"
         Assert.Equal<string>(expected, actual = DB.CreateCommand<"SELECT CAST(@Value AS NVARCHAR(20))">().ToTraceString(Unchecked.defaultof<string>))
 
+#if SYSTEM_DATA_SQLCLIENT
+open System.Data.SqlClient
+#endif
+#if MICROSOFT_DATA_SQLCLIENT
+open Microsoft.Data.SqlClient
+#endif
+
 [<Fact>]
 let resultSetMapping() =
     let cmd = DB.CreateCommand<"SELECT * FROM (VALUES ('F#', 2005), ('Scala', 2003), ('foo bar',NULL))  AS T(lang, DOB)", ResultType.DataReader>()
 
-    let readToMap(reader : System.Data.SqlClient.SqlDataReader) = 
+    let readToMap(reader : SqlDataReader) = 
         seq {
             try 
                 while(reader.Read()) do
@@ -182,7 +189,6 @@ let ``Runtime column names``() =
     use cmd = DB.CreateCommand<"exec dbo.[Get]", ResultType.DataReader>()
     Assert.False( cmd.Execute().NextResult())
 
-open System.Data.SqlClient
 type SqlDataReader with
     member this.ToRecords<'T>() = 
         seq {
@@ -199,7 +205,7 @@ let CreareDynamicRecords() =
     use cmd = DB.CreateCommand<getDatesQuery, TypeName = "GetDatesQuery">()
     use conn = new SqlConnection(ConnectionStrings.AdventureWorksLiteral)
     conn.Open()
-    let cmd = new System.Data.SqlClient.SqlCommand(getDatesQuery, conn)
+    let cmd = new SqlCommand(getDatesQuery, conn)
 
     cmd.ExecuteReader().ToRecords<DB.Commands.GetDatesQuery.Record>() 
     |> Seq.toArray

tests/SqlClient.Tests/ProgrammabilityTests.fs

@@ -4,7 +4,12 @@ open FSharp.Data.SqlClient
 open FSharp.Data.SqlClient.Tests
 
 open System
+#if SYSTEM_DATA_SQLCLIENT
 open System.Data.SqlClient
+#endif
+#if MICROSOFT_DATA_SQLCLIENT
+open Microsoft.Data.SqlClient
+#endif
 open Xunit
 
 type AdventureWorks = SqlProgrammabilityProvider<ConnectionStrings.AdventureWorksNamed>