Skip to content

Commit ddb0daf

Browse files
fix more naked references to System.Data.SqlClient in tests
1 parent f6f7b70 commit ddb0daf

3 files changed

Lines changed: 15 additions & 2 deletions

File tree

tests/SqlClient.Tests/ResultTypeTests.fs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@ let command = "SELECT * FROM (VALUES ('F#', 2005), ('Scala', 2003), ('foo bar',N
1414

1515
type ResultTypeReader = SqlCommandProvider<command, ConnectionStrings.AdventureWorksNamed, ResultType = ResultType.DataReader>
1616

17-
let ReadToMaps(reader : System.Data.SqlClient.SqlDataReader) =
17+
#if SYSTEM_DATA_SQLCLIENT
18+
open System.Data.SqlClient
19+
#endif
20+
#if MICROSOFT_DATA_SQLCLIENT
21+
open Microsoft.Data.SqlClient
22+
#endif
23+
24+
let ReadToMaps(reader : SqlDataReader) =
1825
seq {
1926
try
2027
while(reader.Read()) do

tests/SqlClient.Tests/TVPTests.fs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,13 @@ let TwoTVPParameterOfSameUDTT() =
106106
let expected = [ for id, name in xs @ ys -> MyFunc.Record(id, name) ]
107107
Assert.Equal<_ list>(expected, cmd.Execute(xs', ys') |> Seq.toList)
108108

109+
110+
#if SYSTEM_DATA_SQLCLIENT
109111
open System.Data.SqlClient
112+
#endif
113+
#if MICROSOFT_DATA_SQLCLIENT
114+
open Microsoft.Data.SqlClient
115+
#endif
110116

111117
[<Fact>]
112118
let ReuseTVPTypeForDynamicADONET() =

tests/SqlClient.Tests/TypeProviderTest.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ let ToTraceString() =
110110
let runScalarQuery query =
111111
use conn = new SqlConnection(ConnectionStrings.AdventureWorks)
112112
conn.Open()
113-
use cmd = new System.Data.SqlClient.SqlCommand()
113+
use cmd = new SqlCommand()
114114
cmd.Connection <- conn
115115
cmd.CommandText <- query
116116
cmd.ExecuteScalar()

0 commit comments

Comments
 (0)