Skip to content

Commit 7c65d88

Browse files
remove GetValue SetValue from provided DataColumns
1 parent 9a8a546 commit 7c65d88

2 files changed

Lines changed: 1 addition & 74 deletions

File tree

src/SqlClient.Tests/DataTablesTests.fs

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -294,36 +294,6 @@ type DataTablesTests() =
294294
// getting value same way as a plain datatable still yields DBNull
295295
Assert.Equal(DBNull.Value, r.[t.Columns.d] :?> DBNull)
296296

297-
[<Fact>]
298-
member __.``Can use datacolumns GetValue and SetValue methods`` () =
299-
let t = (new GetArbitraryDataAsDataTable()).Execute()
300-
let r = t.Rows.[0]
301-
let a, b, c, d =
302-
t.Columns.a.GetValue(r)
303-
, t.Columns.b.GetValue(r)
304-
, t.Columns.c.GetValue(r)
305-
, t.Columns.d.GetValue(r)
306-
307-
Assert.Equal(r.a, a)
308-
Assert.Equal(r.b, b)
309-
Assert.Equal(r.c, c)
310-
Assert.Equal(r.d, d)
311-
312-
// need to make column readonly = false in order to use SetValue from the DataColumn
313-
t.Columns.a.ReadOnly <- false
314-
t.Columns.b.ReadOnly <- false
315-
t.Columns.c.ReadOnly <- false
316-
t.Columns.d.ReadOnly <- false
317-
318-
t.Columns.a.SetValue(r, 108)
319-
t.Columns.b.SetValue(r, 108)
320-
t.Columns.c.SetValue(r, 108)
321-
t.Columns.d.SetValue(r, Some 108)
322-
323-
Assert.Equal(r.a, 108)
324-
Assert.Equal(r.b, 108)
325-
Assert.Equal(r.c, 108)
326-
Assert.Equal(r.d, Some 108)
327297

328298
[<Fact>]
329299
member __.``Can use DataColumnCollection`` () =
@@ -345,19 +315,8 @@ type DataTablesTests() =
345315
let products = AdventureWorks.Production.Tables.Product()
346316

347317
let product = products.NewRow()
348-
349-
// can use SetValue
350-
let newName = "foo"
351-
products.Columns.Name.SetValue(product, newName)
352-
Assert.True(product.Name = newName)
318+
product.Name <- "foo"
353319

354320
// use as plain DataColumns
355321
let name = product.[products.Columns.Name] :?> string
356322
Assert.True(product.Name = name)
357-
358-
// can use GetValue
359-
product.FinishedGoodsFlag <- true
360-
let finishedGoodsFlag = products.Columns.FinishedGoodsFlag.GetValue(product)
361-
Assert.Equal(product.FinishedGoodsFlag, finishedGoodsFlag)
362-
363-

src/SqlClient/DesignTime.fs

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -222,38 +222,6 @@ type DesignTime private() =
222222
column
223223
@@>
224224

225-
let getValueMethod =
226-
ProvidedMethod(
227-
"GetValue"
228-
, [ProvidedParameter("row", dataRowType)]
229-
, column.ClrTypeConsideringNullable
230-
)
231-
232-
let getter, setter = DesignTime.GetDataRowPropertyGetterAndSetterCode(column)
233-
234-
getValueMethod.InvokeCode <-
235-
fun args ->
236-
// we don't care of args.[0] (the DataColumn) because getter code is already made for that column
237-
getter args.Tail
238-
239-
let setValueMethod =
240-
ProvidedMethod(
241-
"SetValue"
242-
, [
243-
ProvidedParameter("row", dataRowType)
244-
ProvidedParameter("value", column.ClrTypeConsideringNullable)
245-
]
246-
, typeof<unit>
247-
)
248-
249-
setValueMethod.InvokeCode <-
250-
fun args ->
251-
// we don't care of args.[0] (the DataColumn) because setter code is already made for that column
252-
setter args.Tail
253-
254-
propertyType.AddMember getValueMethod
255-
propertyType.AddMember setValueMethod
256-
257225
columnsType.AddMember property
258226
columnsType.AddMember propertyType
259227

0 commit comments

Comments
 (0)