Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix SqlDataReader.IsDBNull() for json #2830

Merged
merged 3 commits into from
Sep 4, 2024
Merged

Fix SqlDataReader.IsDBNull() for json #2830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0405003
fix SqlDataReader.IsDBNull() for json
deepaksa1 Sep 2, 2024
3990a7e
add testcase
deepaksa1 Sep 3, 2024
f0033e7
resolve PR commits
deepaksa1 Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5825,6 +5825,10 @@ internal static object GetNullSqlValue(SqlBuffer nullVal, SqlMetaDataPriv md, Sq
}
break;

case SqlDbTypeExtensions.Json:
nullVal.SetToNullOfType(SqlBuffer.StorageType.Json);
break;

default:
Debug.Fail("unknown null sqlType!" + md.type.ToString());
break;
Expand Down
4 changes: 4 additions & 0 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6670,6 +6670,10 @@ internal static object GetNullSqlValue(
}
break;

case SqlDbTypeExtensions.Json:
nullVal.SetToNullOfType(SqlBuffer.StorageType.Json);
break;

default:
Debug.Fail("unknown null sqlType!" + md.type.ToString());
break;
Expand Down
43 changes: 43 additions & 0 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@ private void ValidateSchema(SqlDataReader reader)
}
}

private void ValidateNullJson(SqlDataReader reader)
{
while (reader.Read())
{
bool IsNull = reader.IsDBNull(0);
_output.WriteLine(IsNull ? "null" : "not null");
Assert.True(IsNull);
}
}

[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
public void TestJsonWrite()
{
Expand Down Expand Up @@ -286,5 +296,38 @@ public async Task TestJsonReadAsync()
}
}
}

[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
public void TestNullJson()
{
string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");

string tableCreate = "CREATE TABLE " + tableName + " (Data json)";
string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
string tableRead = "SELECT * FROM " + tableName;

using SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString);
connection.Open();
using SqlCommand command = connection.CreateCommand();

//Create Table
command.CommandText = tableCreate;
command.ExecuteNonQuery();

//Insert Null value
command.CommandText = tableInsert;
var parameter = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
parameter.Value = DBNull.Value;
command.Parameters.Add(parameter);
command.ExecuteNonQuery();

//Query the table
command.CommandText = tableRead;
var reader = command.ExecuteReader();
ValidateNullJson(reader);

reader.Close();
DataTestUtility.DropTable(connection, tableName);
}
}
}