[Fix] Fix null binary rowversion and add test coverage

Porting dotnet#1688 to 3.1-servicing.
David-Engel · Aug 9, 2022 · 7103626 · 7103626
1 parent db1c825
commit 7103626
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlBuffer.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlBuffer.cs
@@ -508,6 +508,10 @@ internal SqlBinary SqlBinary
             {
                 if (StorageType.SqlBinary == _type)
                 {
+                    if (IsNull)
+                    {
+                        return SqlBinary.Null;
+                    }
                     return (SqlBinary)_object;
                 }
                 return (SqlBinary)SqlValue; // anything else we haven't thought of goes through boxing.

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBuffer.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBuffer.cs
@@ -490,6 +490,10 @@ internal SqlBinary SqlBinary
             {
                 if (StorageType.SqlBinary == _type)
                 {
+                    if (IsNull)
+                    {
+                        return SqlBinary.Null;
+                    }
                     return (SqlBinary)_object;
                 }
                 return (SqlBinary)SqlValue; // anything else we haven't thought of goes through boxing.

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -282,6 +282,14 @@ public static void CheckNullRowVersionIsBDNull()
                     Assert.IsType<DBNull>(result);
                     Assert.Equal(result, reader.GetFieldValue<DBNull>(0));
                     Assert.Throws<SqlNullValueException>(() => reader.GetFieldValue<byte[]>(0));
+
+                    SqlBinary binary = reader.GetSqlBinary(0);
+                    Assert.True(binary.IsNull);
+
+                    SqlBytes bytes = reader.GetSqlBytes(0);
+                    Assert.True(bytes.IsNull);
+                    Assert.Null(bytes.Buffer);
+
                 }
                 finally
                 {