Skip to content

Commit ce3a2b2

Browse files
adjust aliases for SqlMetaData and SqlDataRecord, makes all test compile
1 parent 2ac723a commit ce3a2b2

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/SqlClient.DesignTime/DesignTime.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ open System.Reflection
55
open System.Data
66
#if SYSTEM_DATA_SQLCLIENT
77
open System.Data.SqlClient
8+
type SqlMetaData = Microsoft.SqlServer.Server.SqlMetaData
89
#endif
910
#if MICROSOFT_DATA_SQLCLIENT
1011
open Microsoft.Data.SqlClient
1112
type SqlMetaData = Microsoft.Data.SqlClient.Server.SqlMetaData
1213
#endif
13-
open Microsoft.SqlServer.Server
14+
1415
open System.Collections.Generic
1516
open System.Diagnostics
1617
open Microsoft.FSharp.Quotations

tests/SqlClient.Tests/TVPTests.fs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,11 @@ let TwoTVPParameterOfSameUDTT() =
109109

110110
#if SYSTEM_DATA_SQLCLIENT
111111
open System.Data.SqlClient
112+
type SqlDataRecord = Microsoft.SqlServer.Server.SqlDataRecord
112113
#endif
113114
#if MICROSOFT_DATA_SQLCLIENT
114115
open Microsoft.Data.SqlClient
116+
type SqlDataRecord = Microsoft.Data.SqlClient.Server.SqlDataRecord
115117
#endif
116118

117119
[<Fact>]
@@ -123,7 +125,7 @@ let ReuseTVPTypeForDynamicADONET() =
123125
p.Value <- [
124126
MyTableType(myId = 1, myName = Some "monkey")
125127
MyTableType(myId = 2, myName = Some "donkey")
126-
] |> Seq.cast<Microsoft.SqlServer.Server.SqlDataRecord>
128+
] |> Seq.cast<SqlDataRecord>
127129
conn.Open()
128130
let expected = [ 1, "monkey"; 2, "donkey" ]
129131
let actual = [

0 commit comments

Comments
 (0)