From e01ab9165da351f29ccc88b4ba7a12457228d3f7 Mon Sep 17 00:00:00 2001 From: Wraith2 Date: Thu, 8 Apr 2021 01:50:22 +0100 Subject: [PATCH 1/4] sync doc comments --- .../Data/SqlClient/Server/SqlDataRecord.cs | 167 +++++++++--------- 1 file changed, 83 insertions(+), 84 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs index 5ef71004c9..4afaec58dd 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs @@ -11,7 +11,7 @@ namespace Microsoft.Data.SqlClient.Server { - /// + /// public class SqlDataRecord : IDataRecord { SmiRecordBuffer _recordBuffer; @@ -29,7 +29,7 @@ public class SqlDataRecord : IDataRecord SmiMetaData.DefaultNVarChar.CompareOptions, null); - /// + /// public virtual int FieldCount { get @@ -39,14 +39,14 @@ public virtual int FieldCount } } - /// + /// public virtual String GetName(int ordinal) { EnsureSubclassOverride(); return GetSqlMetaData(ordinal).Name; } - /// + /// public virtual String GetDataTypeName(int ordinal) { EnsureSubclassOverride(); @@ -61,7 +61,7 @@ public virtual String GetDataTypeName(int ordinal) } } - /// + /// public virtual Type GetFieldType(int ordinal) { EnsureSubclassOverride(); @@ -76,7 +76,7 @@ public virtual Type GetFieldType(int ordinal) } } - /// + /// public virtual Object GetValue(int ordinal) { EnsureSubclassOverride(); @@ -104,7 +104,7 @@ public virtual Object GetValue(int ordinal) } } - /// + /// public virtual int GetValues(object[] values) { EnsureSubclassOverride(); @@ -122,7 +122,7 @@ public virtual int GetValues(object[] values) return copyLength; } - /// + /// public virtual int GetOrdinal(string name) { EnsureSubclassOverride(); @@ -140,7 +140,7 @@ public virtual int GetOrdinal(string name) return _fieldNameLookup.GetOrdinal(name); } - /// + /// public virtual object this[int ordinal] { get @@ -150,7 +150,7 @@ public virtual object this[int ordinal] } } - /// + /// public virtual object this[String name] { get @@ -160,84 +160,84 @@ public virtual object this[String name] } } - /// + /// public virtual bool GetBoolean(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetBoolean(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual byte GetByte(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetByte(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual long GetBytes(int ordinal, long fieldOffset, byte[] buffer, int bufferOffset, int length) { EnsureSubclassOverride(); return ValueUtilsSmi.GetBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), fieldOffset, buffer, bufferOffset, length, true); } - /// + /// public virtual char GetChar(int ordinal) { EnsureSubclassOverride(); throw ADP.NotSupported(); } - /// + /// public virtual long GetChars(int ordinal, long fieldOffset, char[] buffer, int bufferOffset, int length) { EnsureSubclassOverride(); return ValueUtilsSmi.GetChars(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), fieldOffset, buffer, bufferOffset, length); } - /// + /// public virtual Guid GetGuid(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetGuid(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual Int16 GetInt16(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetInt16(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual Int32 GetInt32(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetInt32(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual Int64 GetInt64(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetInt64(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual float GetFloat(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSingle(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual double GetDouble(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetDouble(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual string GetString(int ordinal) { EnsureSubclassOverride(); @@ -252,28 +252,28 @@ public virtual string GetString(int ordinal) } } - /// + /// public virtual Decimal GetDecimal(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetDecimal(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual DateTime GetDateTime(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetDateTime(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual DateTimeOffset GetDateTimeOffset(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetDateTimeOffset(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual TimeSpan GetTimeSpan(int ordinal) { EnsureSubclassOverride(); @@ -287,7 +287,7 @@ IDataReader IDataRecord.GetData(int ordinal) throw ADP.NotSupported(); } - /// + /// public virtual bool IsDBNull(int ordinal) { EnsureSubclassOverride(); @@ -295,7 +295,7 @@ public virtual bool IsDBNull(int ordinal) return ValueUtilsSmi.IsDBNull(_eventSink, _recordBuffer, ordinal); } - /// + /// // ISqlRecord implementation public virtual SqlMetaData GetSqlMetaData(int ordinal) { @@ -303,7 +303,7 @@ public virtual SqlMetaData GetSqlMetaData(int ordinal) return _columnMetaData[ordinal]; } - /// + /// public virtual Type GetSqlFieldType(int ordinal) { EnsureSubclassOverride(); @@ -311,7 +311,7 @@ public virtual Type GetSqlFieldType(int ordinal) return MetaType.GetMetaTypeFromSqlDbType(md.SqlDbType, false).SqlType; } - /// + /// public virtual object GetSqlValue(int ordinal) { EnsureSubclassOverride(); @@ -323,7 +323,7 @@ public virtual object GetSqlValue(int ordinal) return ValueUtilsSmi.GetSqlValue(_eventSink, _recordBuffer, ordinal, metaData, _recordContext); } - /// + /// public virtual int GetSqlValues(object[] values) { EnsureSubclassOverride(); @@ -342,119 +342,119 @@ public virtual int GetSqlValues(object[] values) return copyLength; } - /// + /// public virtual SqlBinary GetSqlBinary(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlBinary(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlBytes GetSqlBytes(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), _recordContext); } - /// + /// public virtual SqlXml GetSqlXml(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlXml(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), _recordContext); } - /// + /// public virtual SqlBoolean GetSqlBoolean(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlBoolean(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlByte GetSqlByte(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlByte(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlChars GetSqlChars(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlChars(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), _recordContext); } - /// + /// public virtual SqlInt16 GetSqlInt16(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlInt16(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlInt32 GetSqlInt32(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlInt32(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlInt64 GetSqlInt64(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlInt64(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlSingle GetSqlSingle(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlSingle(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlDouble GetSqlDouble(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlDouble(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlMoney GetSqlMoney(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlMoney(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlDateTime GetSqlDateTime(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlDateTime(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlDecimal GetSqlDecimal(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlDecimal(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlString GetSqlString(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlString(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// public virtual SqlGuid GetSqlGuid(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetSqlGuid(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// + /// // ISqlUpdateableRecord Implementation public virtual int SetValues(params object[] values) { @@ -498,7 +498,7 @@ public virtual int SetValues(params object[] values) return copyLength; } - /// + /// public virtual void SetValue(int ordinal, object value) { EnsureSubclassOverride(); @@ -520,231 +520,230 @@ public virtual void SetValue(int ordinal, object value) } } - /// + /// public virtual void SetBoolean(int ordinal, bool value) { EnsureSubclassOverride(); ValueUtilsSmi.SetBoolean(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetByte(int ordinal, byte value) { EnsureSubclassOverride(); ValueUtilsSmi.SetByte(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetBytes(int ordinal, long fieldOffset, byte[] buffer, int bufferOffset, int length) { EnsureSubclassOverride(); ValueUtilsSmi.SetBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), fieldOffset, buffer, bufferOffset, length); } - /// + /// public virtual void SetChar(int ordinal, char value) { EnsureSubclassOverride(); throw ADP.NotSupported(); } - /// + /// public virtual void SetChars(int ordinal, long fieldOffset, char[] buffer, int bufferOffset, int length) { EnsureSubclassOverride(); ValueUtilsSmi.SetChars(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), fieldOffset, buffer, bufferOffset, length); } - /// + /// public virtual void SetInt16(int ordinal, System.Int16 value) { EnsureSubclassOverride(); ValueUtilsSmi.SetInt16(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetInt32(int ordinal, System.Int32 value) { EnsureSubclassOverride(); ValueUtilsSmi.SetInt32(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetInt64(int ordinal, System.Int64 value) { EnsureSubclassOverride(); ValueUtilsSmi.SetInt64(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetFloat(int ordinal, float value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSingle(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - - /// + /// public virtual void SetDouble(int ordinal, double value) { EnsureSubclassOverride(); ValueUtilsSmi.SetDouble(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetString(int ordinal, string value) { EnsureSubclassOverride(); ValueUtilsSmi.SetString(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetDecimal(int ordinal, Decimal value) { EnsureSubclassOverride(); ValueUtilsSmi.SetDecimal(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetDateTime(int ordinal, DateTime value) { EnsureSubclassOverride(); ValueUtilsSmi.SetDateTime(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetTimeSpan(int ordinal, TimeSpan value) { EnsureSubclassOverride(); ValueUtilsSmi.SetTimeSpan(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, SmiVersion >= SmiContextFactory.KatmaiVersion); } - /// + /// public virtual void SetDateTimeOffset(int ordinal, DateTimeOffset value) { EnsureSubclassOverride(); ValueUtilsSmi.SetDateTimeOffset(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, SmiVersion >= SmiContextFactory.KatmaiVersion); } - /// + /// public virtual void SetDBNull(int ordinal) { EnsureSubclassOverride(); ValueUtilsSmi.SetDBNull(_eventSink, _recordBuffer, ordinal, true); } - /// + /// public virtual void SetGuid(int ordinal, Guid value) { EnsureSubclassOverride(); ValueUtilsSmi.SetGuid(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlBoolean(int ordinal, SqlBoolean value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlBoolean(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlByte(int ordinal, SqlByte value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlByte(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlInt16(int ordinal, SqlInt16 value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlInt16(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlInt32(int ordinal, SqlInt32 value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlInt32(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlInt64(int ordinal, SqlInt64 value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlInt64(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlSingle(int ordinal, SqlSingle value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlSingle(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlDouble(int ordinal, SqlDouble value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlDouble(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlMoney(int ordinal, SqlMoney value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlMoney(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlDateTime(int ordinal, SqlDateTime value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlDateTime(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlXml(int ordinal, SqlXml value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlXml(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlDecimal(int ordinal, SqlDecimal value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlDecimal(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlString(int ordinal, SqlString value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlString(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlBinary(int ordinal, SqlBinary value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlBinary(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlGuid(int ordinal, SqlGuid value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlGuid(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlChars(int ordinal, SqlChars value) { EnsureSubclassOverride(); ValueUtilsSmi.SetSqlChars(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } - /// + /// public virtual void SetSqlBytes(int ordinal, SqlBytes value) { EnsureSubclassOverride(); @@ -752,7 +751,7 @@ public virtual void SetSqlBytes(int ordinal, SqlBytes value) } // SqlDataRecord public API - /// + /// public SqlDataRecord(params SqlMetaData[] metaData) { // Initial consistency check From 12c2f017852f9f3206dbe21eab032f8a6da305b7 Mon Sep 17 00:00:00 2001 From: Wraith2 Date: Thu, 8 Apr 2021 01:54:21 +0100 Subject: [PATCH 2/4] sync trivial syle differences --- .../Data/SqlClient/Server/SqlDataRecord.cs | 1 + .../Data/SqlClient/Server/SqlDataRecord.cs | 51 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs index bd939993aa..e24bddece0 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs @@ -550,6 +550,7 @@ public virtual void SetString(int ordinal, string value) EnsureSubclassOverride(); ValueUtilsSmi.SetString(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } + /// public virtual void SetDecimal(int ordinal, decimal value) { diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs index 4afaec58dd..7eb394ae29 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs @@ -40,14 +40,14 @@ public virtual int FieldCount } /// - public virtual String GetName(int ordinal) + public virtual string GetName(int ordinal) { EnsureSubclassOverride(); return GetSqlMetaData(ordinal).Name; } /// - public virtual String GetDataTypeName(int ordinal) + public virtual string GetDataTypeName(int ordinal) { EnsureSubclassOverride(); SqlMetaData metaData = GetSqlMetaData(ordinal); @@ -77,7 +77,7 @@ public virtual Type GetFieldType(int ordinal) } /// - public virtual Object GetValue(int ordinal) + public virtual object GetValue(int ordinal) { EnsureSubclassOverride(); SmiMetaData metaData = GetSmiMetaData(ordinal); @@ -110,7 +110,7 @@ public virtual int GetValues(object[] values) EnsureSubclassOverride(); if (null == values) { - throw ADP.ArgumentNull("values"); + throw ADP.ArgumentNull(nameof(values)); } int copyLength = (values.Length < FieldCount) ? values.Length : FieldCount; @@ -134,7 +134,7 @@ public virtual int GetOrdinal(string name) names[i] = GetSqlMetaData(i).Name; } - _fieldNameLookup = new FieldNameLookup(names, -1); // UNDONE: is this correct LCID? + _fieldNameLookup = new FieldNameLookup(names, -1); } return _fieldNameLookup.GetOrdinal(name); @@ -151,7 +151,7 @@ public virtual object this[int ordinal] } /// - public virtual object this[String name] + public virtual object this[string name] { get { @@ -203,21 +203,21 @@ public virtual Guid GetGuid(int ordinal) } /// - public virtual Int16 GetInt16(int ordinal) + public virtual short GetInt16(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetInt16(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } /// - public virtual Int32 GetInt32(int ordinal) + public virtual int GetInt32(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetInt32(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } /// - public virtual Int64 GetInt64(int ordinal) + public virtual long GetInt64(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetInt64(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); @@ -253,7 +253,7 @@ public virtual string GetString(int ordinal) } /// - public virtual Decimal GetDecimal(int ordinal) + public virtual decimal GetDecimal(int ordinal) { EnsureSubclassOverride(); return ValueUtilsSmi.GetDecimal(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); @@ -280,13 +280,6 @@ public virtual TimeSpan GetTimeSpan(int ordinal) return ValueUtilsSmi.GetTimeSpan(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal)); } - /// - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] // MDAC 69508 - IDataReader IDataRecord.GetData(int ordinal) - { - throw ADP.NotSupported(); - } - /// public virtual bool IsDBNull(int ordinal) { @@ -329,7 +322,7 @@ public virtual int GetSqlValues(object[] values) EnsureSubclassOverride(); if (null == values) { - throw ADP.ArgumentNull("values"); + throw ADP.ArgumentNull(nameof(values)); } @@ -461,10 +454,10 @@ public virtual int SetValues(params object[] values) EnsureSubclassOverride(); if (null == values) { - throw ADP.ArgumentNull("values"); + throw ADP.ArgumentNull(nameof(values)); } - // SQLBUDT #346883 Allow values array longer than FieldCount, just ignore the extra cells. + // Allow values array longer than FieldCount, just ignore the extra cells. int copyLength = (values.Length > FieldCount) ? FieldCount : values.Length; ExtendedClrTypeCode[] typeCodes = new ExtendedClrTypeCode[copyLength]; @@ -556,21 +549,21 @@ public virtual void SetChars(int ordinal, long fieldOffset, char[] buffer, int b } /// - public virtual void SetInt16(int ordinal, System.Int16 value) + public virtual void SetInt16(int ordinal, short value) { EnsureSubclassOverride(); ValueUtilsSmi.SetInt16(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } /// - public virtual void SetInt32(int ordinal, System.Int32 value) + public virtual void SetInt32(int ordinal, int value) { EnsureSubclassOverride(); ValueUtilsSmi.SetInt32(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); } /// - public virtual void SetInt64(int ordinal, System.Int64 value) + public virtual void SetInt64(int ordinal, long value) { EnsureSubclassOverride(); ValueUtilsSmi.SetInt64(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); @@ -597,7 +590,7 @@ public virtual void SetString(int ordinal, string value) } /// - public virtual void SetDecimal(int ordinal, Decimal value) + public virtual void SetDecimal(int ordinal, decimal value) { EnsureSubclassOverride(); ValueUtilsSmi.SetDecimal(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value); @@ -757,7 +750,7 @@ public SqlDataRecord(params SqlMetaData[] metaData) // Initial consistency check if (null == metaData) { - throw ADP.ArgumentNull("metadata"); + throw ADP.ArgumentNull(nameof(metaData)); } _columnMetaData = new SqlMetaData[metaData.Length]; @@ -767,7 +760,7 @@ public SqlDataRecord(params SqlMetaData[] metaData) { if (null == metaData[i]) { - throw ADP.ArgumentNull("metadata[" + i + "]"); + throw ADP.ArgumentNull($"{nameof(metaData)}[{i}]"); } _columnMetaData[i] = metaData[i]; _columnSmiMetaData[i] = MetaDataUtilsSmi.SqlMetaDataToSmiExtendedMetaData(_columnMetaData[i]); @@ -877,6 +870,12 @@ private void EnsureSubclassOverride() throw SQL.SubclassMustOverride(); } } + + /// + IDataReader System.Data.IDataRecord.GetData(int ordinal) + { + throw ADP.NotSupported(); + } } } From ff5987ead3188fb0f6a5f8becd4ee482ce4bdd3a Mon Sep 17 00:00:00 2001 From: Wraith2 Date: Thu, 8 Apr 2021 02:22:10 +0100 Subject: [PATCH 3/4] sync names param hints and general cleanup --- .../Data/SqlClient/Server/SqlDataRecord.cs | 76 ++++++------- .../Data/SqlClient/Server/SqlDataRecord.cs | 102 +++++++++--------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs index e24bddece0..5f8281cf2d 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs @@ -21,12 +21,15 @@ public class SqlDataRecord : IDataRecord private FieldNameLookup _fieldNameLookup; private bool _usesStringStorageForXml; - private static readonly SmiMetaData s_maxNVarCharForXml = new SmiMetaData(SqlDbType.NVarChar, SmiMetaData.UnlimitedMaxLengthIndicator, - SmiMetaData.DefaultNVarChar_NoCollation.Precision, - SmiMetaData.DefaultNVarChar_NoCollation.Scale, - SmiMetaData.DefaultNVarChar.LocaleId, - SmiMetaData.DefaultNVarChar.CompareOptions, - null); + private static readonly SmiMetaData s_maxNVarCharForXml = new SmiMetaData( + SqlDbType.NVarChar, + SmiMetaData.UnlimitedMaxLengthIndicator, + SmiMetaData.DefaultNVarChar_NoCollation.Precision, + SmiMetaData.DefaultNVarChar_NoCollation.Scale, + SmiMetaData.DefaultNVarChar.LocaleId, + SmiMetaData.DefaultNVarChar.CompareOptions, + userDefinedType: null + ); /// public virtual int FieldCount @@ -50,7 +53,7 @@ public virtual string GetDataTypeName(int ordinal) { EnsureSubclassOverride(); SqlMetaData metaData = GetSqlMetaData(ordinal); - if (SqlDbType.Udt == metaData.SqlDbType) + if (metaData.SqlDbType == SqlDbType.Udt) { return metaData.UdtTypeName; } @@ -64,10 +67,8 @@ public virtual string GetDataTypeName(int ordinal) public virtual Type GetFieldType(int ordinal) { EnsureSubclassOverride(); - { - SqlMetaData md = GetSqlMetaData(ordinal); - return MetaType.GetMetaTypeFromSqlDbType(md.SqlDbType, false).ClassType; - } + SqlMetaData md = GetSqlMetaData(ordinal); + return MetaType.GetMetaTypeFromSqlDbType(md.SqlDbType, false).ClassType; } /// @@ -75,20 +76,14 @@ public virtual object GetValue(int ordinal) { EnsureSubclassOverride(); SmiMetaData metaData = GetSmiMetaData(ordinal); - - return ValueUtilsSmi.GetValue200( - _eventSink, - _recordBuffer, - ordinal, - metaData - ); + return ValueUtilsSmi.GetValue200(_eventSink, _recordBuffer, ordinal, metaData); } /// public virtual int GetValues(object[] values) { EnsureSubclassOverride(); - if (null == values) + if (values == null) { throw ADP.ArgumentNull(nameof(values)); } @@ -158,7 +153,7 @@ public virtual byte GetByte(int ordinal) public virtual long GetBytes(int ordinal, long fieldOffset, byte[] buffer, int bufferOffset, int length) { EnsureSubclassOverride(); - return ValueUtilsSmi.GetBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), fieldOffset, buffer, bufferOffset, length, true); + return ValueUtilsSmi.GetBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), fieldOffset, buffer, bufferOffset, length, throwOnNull: true); } /// @@ -222,7 +217,7 @@ public virtual string GetString(int ordinal) { EnsureSubclassOverride(); SmiMetaData colMeta = GetSmiMetaData(ordinal); - if (_usesStringStorageForXml && SqlDbType.Xml == colMeta.SqlDbType) + if (_usesStringStorageForXml && colMeta.SqlDbType == SqlDbType.Xml) { return ValueUtilsSmi.GetString(_eventSink, _recordBuffer, ordinal, s_maxNVarCharForXml); } @@ -296,12 +291,11 @@ public virtual object GetSqlValue(int ordinal) public virtual int GetSqlValues(object[] values) { EnsureSubclassOverride(); - if (null == values) + if (values == null) { throw ADP.ArgumentNull(nameof(values)); } - int copyLength = (values.Length < FieldCount) ? values.Length : FieldCount; for (int i = 0; i < copyLength; i++) { @@ -428,7 +422,7 @@ public virtual SqlGuid GetSqlGuid(int ordinal) public virtual int SetValues(params object[] values) { EnsureSubclassOverride(); - if (null == values) + if (values == null) { throw ADP.ArgumentNull(nameof(values)); } @@ -443,8 +437,12 @@ public virtual int SetValues(params object[] values) { SqlMetaData metaData = GetSqlMetaData(i); typeCodes[i] = MetaDataUtilsSmi.DetermineExtendedTypeCodeForUseWithSqlDbType( - metaData.SqlDbType, false /* isMultiValued */, values[i], metaData.Type); - if (ExtendedClrTypeCode.Invalid == typeCodes[i]) + metaData.SqlDbType, + isMultiValued: false, + values[i], + metaData.Type + ); + if (typeCodes[i] == ExtendedClrTypeCode.Invalid) { throw ADP.InvalidCast(); } @@ -454,7 +452,7 @@ public virtual int SetValues(params object[] values) // the validation loop and here, or if an invalid UDT was sent). for (int i = 0; i < copyLength; i++) { - ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], 0, 0, null); + ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], offset: 0, length: 0, peekAhead: null); } return copyLength; @@ -466,13 +464,17 @@ public virtual void SetValue(int ordinal, object value) EnsureSubclassOverride(); SqlMetaData metaData = GetSqlMetaData(ordinal); ExtendedClrTypeCode typeCode = MetaDataUtilsSmi.DetermineExtendedTypeCodeForUseWithSqlDbType( - metaData.SqlDbType, false /* isMultiValued */, value, metaData.Type); - if (ExtendedClrTypeCode.Invalid == typeCode) + metaData.SqlDbType, + isMultiValued: false, + value, + metaData.Type + ); + if (typeCode == ExtendedClrTypeCode.Invalid) { throw ADP.InvalidCast(); } - ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, 0, 0, null); + ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, offset: 0, length: 0, peekAhead: null); } /// @@ -710,7 +712,7 @@ public virtual void SetSqlBytes(int ordinal, SqlBytes value) public SqlDataRecord(params SqlMetaData[] metaData) { // Initial consistency check - if (null == metaData) + if (metaData == null) { throw ADP.ArgumentNull(nameof(metaData)); } @@ -719,7 +721,7 @@ public SqlDataRecord(params SqlMetaData[] metaData) _columnSmiMetaData = new SmiExtendedMetaData[metaData.Length]; for (int i = 0; i < _columnSmiMetaData.Length; i++) { - if (null == metaData[i]) + if (metaData[i] == null) { throw ADP.ArgumentNull($"{nameof(metaData)}[{i}]"); } @@ -728,7 +730,6 @@ public SqlDataRecord(params SqlMetaData[] metaData) } _eventSink = new SmiEventSink_Default(); - _recordBuffer = new MemoryRecordBuffer(_columnSmiMetaData); _usesStringStorageForXml = true; _eventSink.ProcessMessagesAndThrow(); @@ -736,8 +737,8 @@ public SqlDataRecord(params SqlMetaData[] metaData) internal SqlDataRecord(SmiRecordBuffer recordBuffer, params SmiExtendedMetaData[] metaData) { - Debug.Assert(null != recordBuffer, "invalid attempt to instantiate SqlDataRecord with null SmiRecordBuffer"); - Debug.Assert(null != metaData, "invalid attempt to instantiate SqlDataRecord with null SmiExtendedMetaData[]"); + Debug.Assert(recordBuffer != null, "invalid attempt to instantiate SqlDataRecord with null SmiRecordBuffer"); + Debug.Assert(metaData != null, "invalid attempt to instantiate SqlDataRecord with null SmiExtendedMetaData[]"); _columnMetaData = new SqlMetaData[metaData.Length]; _columnSmiMetaData = new SmiExtendedMetaData[metaData.Length]; @@ -748,7 +749,6 @@ internal SqlDataRecord(SmiRecordBuffer recordBuffer, params SmiExtendedMetaData[ } _eventSink = new SmiEventSink_Default(); - _recordBuffer = recordBuffer; _eventSink.ProcessMessagesAndThrow(); } @@ -764,7 +764,6 @@ internal SmiRecordBuffer RecordBuffer } } - internal SqlMetaData[] InternalGetMetaData() { return _columnMetaData; @@ -787,9 +786,10 @@ internal void ThrowIfInvalidOrdinal(int ordinal) throw ADP.IndexOutOfRange(ordinal); } } + private void EnsureSubclassOverride() { - if (null == _recordBuffer) + if (_recordBuffer == null) { throw SQL.SubclassMustOverride(); } diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs index 7eb394ae29..792db1e4e8 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs @@ -14,20 +14,23 @@ namespace Microsoft.Data.SqlClient.Server /// public class SqlDataRecord : IDataRecord { - SmiRecordBuffer _recordBuffer; - SmiContext _recordContext; - SmiExtendedMetaData[] _columnSmiMetaData; - SmiEventSink_Default _eventSink; - SqlMetaData[] _columnMetaData; - FieldNameLookup _fieldNameLookup; - bool _usesStringStorageForXml; - - static readonly SmiMetaData __maxNVarCharForXml = new SmiMetaData(SqlDbType.NVarChar, SmiMetaData.UnlimitedMaxLengthIndicator, - SmiMetaData.DefaultNVarChar_NoCollation.Precision, - SmiMetaData.DefaultNVarChar_NoCollation.Scale, - SmiMetaData.DefaultNVarChar.LocaleId, - SmiMetaData.DefaultNVarChar.CompareOptions, - null); + private SmiRecordBuffer _recordBuffer; + private SmiContext _recordContext; + private SmiExtendedMetaData[] _columnSmiMetaData; + private SmiEventSink_Default _eventSink; + private SqlMetaData[] _columnMetaData; + private FieldNameLookup _fieldNameLookup; + private bool _usesStringStorageForXml; + + static readonly SmiMetaData s_maxNVarCharForXml = new SmiMetaData( + SqlDbType.NVarChar, + SmiMetaData.UnlimitedMaxLengthIndicator, + SmiMetaData.DefaultNVarChar_NoCollation.Precision, + SmiMetaData.DefaultNVarChar_NoCollation.Scale, + SmiMetaData.DefaultNVarChar.LocaleId, + SmiMetaData.DefaultNVarChar.CompareOptions, + userDefinedType: null + ); /// public virtual int FieldCount @@ -51,7 +54,7 @@ public virtual string GetDataTypeName(int ordinal) { EnsureSubclassOverride(); SqlMetaData metaData = GetSqlMetaData(ordinal); - if (SqlDbType.Udt == metaData.SqlDbType) + if (metaData.SqlDbType == SqlDbType.Udt) { return metaData.UdtTypeName; } @@ -65,7 +68,7 @@ public virtual string GetDataTypeName(int ordinal) public virtual Type GetFieldType(int ordinal) { EnsureSubclassOverride(); - if (SqlDbType.Udt == GetSqlMetaData(ordinal).SqlDbType) + if (GetSqlMetaData(ordinal).SqlDbType == SqlDbType.Udt) { return GetSqlMetaData(ordinal).Type; } @@ -84,23 +87,11 @@ public virtual object GetValue(int ordinal) if (SmiVersion >= SmiContextFactory.KatmaiVersion) { - return ValueUtilsSmi.GetValue200( - _eventSink, - _recordBuffer, - ordinal, - metaData, - _recordContext - ); + return ValueUtilsSmi.GetValue200(_eventSink, _recordBuffer, ordinal, metaData, _recordContext); } else { - return ValueUtilsSmi.GetValue( - _eventSink, - (ITypedGettersV3)_recordBuffer, - ordinal, - metaData, - _recordContext - ); + return ValueUtilsSmi.GetValue(_eventSink, _recordBuffer, ordinal, metaData, _recordContext); } } @@ -108,7 +99,7 @@ public virtual object GetValue(int ordinal) public virtual int GetValues(object[] values) { EnsureSubclassOverride(); - if (null == values) + if (values == null) { throw ADP.ArgumentNull(nameof(values)); } @@ -178,7 +169,7 @@ public virtual byte GetByte(int ordinal) public virtual long GetBytes(int ordinal, long fieldOffset, byte[] buffer, int bufferOffset, int length) { EnsureSubclassOverride(); - return ValueUtilsSmi.GetBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), fieldOffset, buffer, bufferOffset, length, true); + return ValueUtilsSmi.GetBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), fieldOffset, buffer, bufferOffset, length, throwOnNull: true); } /// @@ -242,9 +233,9 @@ public virtual string GetString(int ordinal) { EnsureSubclassOverride(); SmiMetaData colMeta = GetSmiMetaData(ordinal); - if (_usesStringStorageForXml && SqlDbType.Xml == colMeta.SqlDbType) + if (_usesStringStorageForXml && colMeta.SqlDbType == SqlDbType.Xml) { - return ValueUtilsSmi.GetString(_eventSink, _recordBuffer, ordinal, __maxNVarCharForXml); + return ValueUtilsSmi.GetString(_eventSink, _recordBuffer, ordinal, s_maxNVarCharForXml); } else { @@ -320,12 +311,11 @@ public virtual object GetSqlValue(int ordinal) public virtual int GetSqlValues(object[] values) { EnsureSubclassOverride(); - if (null == values) + if (values == null) { throw ADP.ArgumentNull(nameof(values)); } - int copyLength = (values.Length < FieldCount) ? values.Length : FieldCount; for (int i = 0; i < copyLength; i++) { @@ -452,7 +442,7 @@ public virtual SqlGuid GetSqlGuid(int ordinal) public virtual int SetValues(params object[] values) { EnsureSubclassOverride(); - if (null == values) + if (values == null) { throw ADP.ArgumentNull(nameof(values)); } @@ -467,8 +457,13 @@ public virtual int SetValues(params object[] values) { SqlMetaData metaData = GetSqlMetaData(i); typeCodes[i] = MetaDataUtilsSmi.DetermineExtendedTypeCodeForUseWithSqlDbType( - metaData.SqlDbType, false /* isMultiValued */, values[i], metaData.Type, SmiVersion); - if (ExtendedClrTypeCode.Invalid == typeCodes[i]) + metaData.SqlDbType, + isMultiValued: false, + values[i], + metaData.Type, + SmiVersion + ); + if (typeCodes[i] == ExtendedClrTypeCode.Invalid) { throw ADP.InvalidCast(); } @@ -480,11 +475,11 @@ public virtual int SetValues(params object[] values) { if (SmiVersion >= SmiContextFactory.KatmaiVersion) { - ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], 0, 0, null); + ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], offset: 0, length: 0, peekAhead: null); } else { - ValueUtilsSmi.SetCompatibleValue(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], 0); + ValueUtilsSmi.SetCompatibleValue(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], offset: 0); } } @@ -497,19 +492,24 @@ public virtual void SetValue(int ordinal, object value) EnsureSubclassOverride(); SqlMetaData metaData = GetSqlMetaData(ordinal); ExtendedClrTypeCode typeCode = MetaDataUtilsSmi.DetermineExtendedTypeCodeForUseWithSqlDbType( - metaData.SqlDbType, false /* isMultiValued */, value, metaData.Type, SmiVersion); - if (ExtendedClrTypeCode.Invalid == typeCode) + metaData.SqlDbType, + isMultiValued:false, + value, + metaData.Type, + SmiVersion + ); + if (typeCode == ExtendedClrTypeCode.Invalid) { throw ADP.InvalidCast(); } if (SmiVersion >= SmiContextFactory.KatmaiVersion) { - ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, 0, 0, null); + ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, offset: 0, length: 0, peekAhead: null); } else { - ValueUtilsSmi.SetCompatibleValue(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, 0); + ValueUtilsSmi.SetCompatibleValue(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, offset: 0); } } @@ -748,7 +748,7 @@ public virtual void SetSqlBytes(int ordinal, SqlBytes value) public SqlDataRecord(params SqlMetaData[] metaData) { // Initial consistency check - if (null == metaData) + if (metaData == null) { throw ADP.ArgumentNull(nameof(metaData)); } @@ -758,7 +758,7 @@ public SqlDataRecord(params SqlMetaData[] metaData) ulong smiVersion = SmiVersion; for (int i = 0; i < _columnSmiMetaData.Length; i++) { - if (null == metaData[i]) + if (metaData[i] == null) { throw ADP.ArgumentNull($"{nameof(metaData)}[{i}]"); } @@ -789,8 +789,8 @@ public SqlDataRecord(params SqlMetaData[] metaData) internal SqlDataRecord(SmiRecordBuffer recordBuffer, params SmiExtendedMetaData[] metaData) { - Debug.Assert(null != recordBuffer, "invalid attempt to instantiate SqlDataRecord with null SmiRecordBuffer"); - Debug.Assert(null != metaData, "invalid attempt to instantiate SqlDataRecord with null SmiExtendedMetaData[]"); + Debug.Assert(recordBuffer != null, "invalid attempt to instantiate SqlDataRecord with null SmiRecordBuffer"); + Debug.Assert(metaData != null, "invalid attempt to instantiate SqlDataRecord with null SmiExtendedMetaData[]"); _columnMetaData = new SqlMetaData[metaData.Length]; _columnSmiMetaData = new SmiExtendedMetaData[metaData.Length]; @@ -801,7 +801,6 @@ internal SqlDataRecord(SmiRecordBuffer recordBuffer, params SmiExtendedMetaData[ } _eventSink = new SmiEventSink_Default(); - if (InOutOfProcHelper.InProc) { _recordContext = SmiContextFactory.Instance.GetCurrentContext(); @@ -863,9 +862,10 @@ internal void ThrowIfInvalidOrdinal(int ordinal) throw ADP.IndexOutOfRange(ordinal); } } + private void EnsureSubclassOverride() { - if (null == _recordBuffer) + if (_recordBuffer == null) { throw SQL.SubclassMustOverride(); } From 8aee3c5260fae871f300ccd7d5b6590343df77ff Mon Sep 17 00:00:00 2001 From: Wraith2 Date: Wed, 16 Jun 2021 20:28:35 +0100 Subject: [PATCH 4/4] address feedback --- doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml | 2 +- .../src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs | 1 + .../netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml index cb89fe35a0..a2481e9363 100644 --- a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml +++ b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml @@ -2,7 +2,7 @@ - Represents a single row of data and its metadata. This class cannot be inherited. + Represents a single row of data and its metadata. + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] IDataReader System.Data.IDataRecord.GetData(int ordinal) { throw ADP.NotSupported(); diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs index 792db1e4e8..763469c004 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs @@ -872,6 +872,7 @@ private void EnsureSubclassOverride() } /// + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] IDataReader System.Data.IDataRecord.GetData(int ordinal) { throw ADP.NotSupported();