Skip to content

Commit cb5999a

Browse files
edwardnealedwardneal
committed
Merge identical one-line methods
1 parent 1fc570e commit cb5999a

File tree

4 files changed

+9
-74
lines changed

4 files changed

+9
-74
lines changed

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public virtual string GetDataTypeName(int ordinal)
5757
public virtual Type GetFieldType(int ordinal) => GetFieldTypeFrameworkSpecific(ordinal);
5858

5959
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetValue/*' />
60-
public virtual object GetValue(int ordinal) => GetValueFrameworkSpecific(ordinal);
60+
public virtual object GetValue(int ordinal) => ValueUtilsSmi.GetValue200(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
6161

6262
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetValues/*' />
6363
public virtual int GetValues(object[] values)
@@ -177,7 +177,7 @@ public virtual SqlMetaData GetSqlMetaData(int ordinal)
177177
public virtual Type GetSqlFieldType(int ordinal) => MetaType.GetMetaTypeFromSqlDbType(GetSqlMetaData(ordinal).SqlDbType, false).SqlType;
178178

179179
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetSqlValue/*' />
180-
public virtual object GetSqlValue(int ordinal) => GetSqlValueFrameworkSpecific(ordinal);
180+
public virtual object GetSqlValue(int ordinal) => ValueUtilsSmi.GetSqlValue200(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
181181

182182
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetSqlValues/*' />
183183
public virtual int GetSqlValues(object[] values)
@@ -200,10 +200,10 @@ public virtual int GetSqlValues(object[] values)
200200
public virtual SqlBinary GetSqlBinary(int ordinal) => ValueUtilsSmi.GetSqlBinary(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
201201

202202
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetSqlBytes/*' />
203-
public virtual SqlBytes GetSqlBytes(int ordinal) => GetSqlBytesFrameworkSpecific(ordinal);
203+
public virtual SqlBytes GetSqlBytes(int ordinal) => ValueUtilsSmi.GetSqlBytes(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
204204

205205
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetSqlXml/*' />
206-
public virtual SqlXml GetSqlXml(int ordinal) => GetSqlXmlFrameworkSpecific(ordinal);
206+
public virtual SqlXml GetSqlXml(int ordinal) => ValueUtilsSmi.GetSqlXml(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
207207

208208
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetSqlBoolean/*' />
209209
public virtual SqlBoolean GetSqlBoolean(int ordinal) => ValueUtilsSmi.GetSqlBoolean(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
@@ -212,7 +212,7 @@ public virtual int GetSqlValues(object[] values)
212212
public virtual SqlByte GetSqlByte(int ordinal) => ValueUtilsSmi.GetSqlByte(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
213213

214214
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetSqlChars/*' />
215-
public virtual SqlChars GetSqlChars(int ordinal) => GetSqlCharsFrameworkSpecific(ordinal);
215+
public virtual SqlChars GetSqlChars(int ordinal) => ValueUtilsSmi.GetSqlChars(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
216216

217217
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetSqlInt16/*' />
218218
public virtual SqlInt16 GetSqlInt16(int ordinal) => ValueUtilsSmi.GetSqlInt16(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
@@ -290,10 +290,10 @@ public virtual int GetSqlValues(object[] values)
290290
public virtual void SetDateTime(int ordinal, DateTime value) => ValueUtilsSmi.SetDateTime(_recordBuffer, ordinal, GetSmiMetaData(ordinal), value);
291291

292292
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/SetTimeSpan/*' />
293-
public virtual void SetTimeSpan(int ordinal, TimeSpan value) => SetTimeSpanFrameworkSpecific(ordinal, value);
293+
public virtual void SetTimeSpan(int ordinal, TimeSpan value) => ValueUtilsSmi.SetTimeSpan(_recordBuffer, ordinal, GetSmiMetaData(ordinal), value);
294294

295295
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/SetDateTimeOffset/*' />
296-
public virtual void SetDateTimeOffset(int ordinal, DateTimeOffset value) => SetDateTimeOffsetFrameworkSpecific(ordinal, value);
296+
public virtual void SetDateTimeOffset(int ordinal, DateTimeOffset value) => ValueUtilsSmi.SetDateTimeOffset(_recordBuffer, ordinal, GetSmiMetaData(ordinal), value);
297297

298298
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/SetDBNull/*' />
299299
public virtual void SetDBNull(int ordinal)

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.netcore.cs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ public partial class SqlDataRecord : IDataRecord
1919
private Type GetFieldTypeFrameworkSpecific(int ordinal) =>
2020
MetaType.GetMetaTypeFromSqlDbType(GetSqlMetaData(ordinal).SqlDbType, false).ClassType;
2121

22-
private object GetValueFrameworkSpecific(int ordinal) =>
23-
ValueUtilsSmi.GetValue200(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
24-
private object GetSqlValueFrameworkSpecific(int ordinal) =>
25-
ValueUtilsSmi.GetSqlValue200(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
26-
27-
private SqlBytes GetSqlBytesFrameworkSpecific(int ordinal) =>
28-
ValueUtilsSmi.GetSqlBytes(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
29-
30-
private SqlXml GetSqlXmlFrameworkSpecific(int ordinal) =>
31-
ValueUtilsSmi.GetSqlXml(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
32-
33-
private SqlChars GetSqlCharsFrameworkSpecific(int ordinal) =>
34-
ValueUtilsSmi.GetSqlChars(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
3522
private int SetValuesFrameworkSpecific(params object[] values)
3623
{
3724
if (values == null)
@@ -86,12 +73,5 @@ private void SetValueFrameworkSpecific(int ordinal, object value)
8673

8774
ValueUtilsSmi.SetCompatibleValueV200(_recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, offset: 0, peekAhead: null);
8875
}
89-
90-
private void SetTimeSpanFrameworkSpecific(int ordinal, TimeSpan value)
91-
=> ValueUtilsSmi.SetTimeSpan(_recordBuffer, ordinal, GetSmiMetaData(ordinal), value);
92-
93-
private void SetDateTimeOffsetFrameworkSpecific(int ordinal, DateTimeOffset value)
94-
=> ValueUtilsSmi.SetDateTimeOffset(_recordBuffer, ordinal, GetSmiMetaData(ordinal), value);
95-
9676
}
9777
}

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.netfx.cs

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,6 @@ private Type GetFieldTypeFrameworkSpecific(int ordinal)
2424
return MetaType.GetMetaTypeFromSqlDbType(md.SqlDbType, false).ClassType;
2525
}
2626
}
27-
28-
private object GetValueFrameworkSpecific(int ordinal)
29-
{
30-
SmiMetaData metaData = GetSmiMetaData(ordinal);
31-
return ValueUtilsSmi.GetValue200(_recordBuffer, ordinal, metaData);
32-
}
33-
34-
private object GetSqlValueFrameworkSpecific(int ordinal)
35-
{
36-
SmiMetaData metaData = GetSmiMetaData(ordinal);
37-
return ValueUtilsSmi.GetSqlValue200(_recordBuffer, ordinal, metaData);
38-
}
39-
40-
private SqlBytes GetSqlBytesFrameworkSpecific(int ordinal) =>
41-
ValueUtilsSmi.GetSqlBytes(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
42-
43-
private SqlXml GetSqlXmlFrameworkSpecific(int ordinal) =>
44-
ValueUtilsSmi.GetSqlXml(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
45-
46-
private SqlChars GetSqlCharsFrameworkSpecific(int ordinal) =>
47-
ValueUtilsSmi.GetSqlChars(_recordBuffer, ordinal, GetSmiMetaData(ordinal));
4827

4928
private int SetValuesFrameworkSpecific(params object[] values)
5029
{
@@ -112,21 +91,5 @@ private void SetValueFrameworkSpecific(int ordinal, object value)
11291
offset: 0,
11392
peekAhead: null);
11493
}
115-
116-
private void SetTimeSpanFrameworkSpecific(int ordinal, TimeSpan value) =>
117-
ValueUtilsSmi.SetTimeSpan(
118-
_recordBuffer,
119-
ordinal,
120-
GetSmiMetaData(ordinal),
121-
value,
122-
settersSupport2008DateTime: true);
123-
124-
private void SetDateTimeOffsetFrameworkSpecific(int ordinal, DateTimeOffset value) =>
125-
ValueUtilsSmi.SetDateTimeOffset(
126-
_recordBuffer,
127-
ordinal,
128-
GetSmiMetaData(ordinal),
129-
value,
130-
settersSupport2008DateTime: true);
13194
}
13295
}

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,12 +1290,8 @@ internal static void SetDateTime(ITypedSettersV3 setters, int ordinal, SmiMetaDa
12901290
SetDateTime_Checked(setters, ordinal, metaData, value);
12911291
}
12921292

1293-
internal static void SetDateTimeOffset(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DateTimeOffset value, bool settersSupport2008DateTime = true)
1293+
internal static void SetDateTimeOffset(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DateTimeOffset value)
12941294
{
1295-
if (!settersSupport2008DateTime)
1296-
{
1297-
throw ADP.InvalidCast();
1298-
}
12991295
ThrowIfInvalidSetterAccess(metaData, ExtendedClrTypeCode.DateTimeOffset);
13001296
SetDateTimeOffset_Unchecked((SmiTypedGetterSetter)setters, ordinal, value);
13011297
}
@@ -1445,12 +1441,8 @@ internal static void SetString(ITypedSettersV3 setters, int ordinal, SmiMetaData
14451441
SetString_LengthChecked(setters, ordinal, metaData, value, 0);
14461442
}
14471443

1448-
internal static void SetTimeSpan(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, TimeSpan value, bool settersSupport2008DateTime = true)
1444+
internal static void SetTimeSpan(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, TimeSpan value)
14491445
{
1450-
if (!settersSupport2008DateTime)
1451-
{
1452-
throw ADP.InvalidCast();
1453-
}
14541446
ThrowIfInvalidSetterAccess(metaData, ExtendedClrTypeCode.TimeSpan);
14551447
SetTimeSpan_Checked((SmiTypedGetterSetter)setters, ordinal, metaData, value);
14561448
}

0 commit comments

Comments
 (0)