db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-12 10:04:14 +02:00
Code Issues Releases Activity

Add bool rendering to jsonFromVar().

Browse Source
This commit is contained in:
David Steele 2019-08-17 17:47:13 -04:00
parent 8fc1d3883b
commit d0dee2e260
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/type/json.c
View File

@ -935,6 +935,10 @@ jsonFromVar(const Variant *var, unsigned int indent)
{
strCat(jsonStr, strPtr(NULL_STR));
}
else if (varType(var) == varTypeBool)
{
strCat(jsonStr, strPtr(jsonFromBool(varBool(var))));
}
else if (varType(var) == varTypeUInt)
{
strCat(jsonStr, strPtr(jsonFromUInt(varUInt(var))));

3
test/src/module/common/typeJsonTest.c
View File

@ -219,7 +219,7 @@ testRun(void)
// *****************************************************************************************************************************
if (testBegin("jsonFromVar()"))
{
TEST_ERROR(jsonFromVar(varNewBool(true), 0), JsonFormatError, "variant type is invalid");
TEST_ERROR(jsonFromVar(varNewInt(1), 0), JsonFormatError, "variant type is invalid");
String *json = NULL;
Variant *keyValue = NULL;
@ -378,6 +378,7 @@ testRun(void)
//--------------------------------------------------------------------------------------------------------------------------
TEST_RESULT_STR(strPtr(jsonFromVar(NULL, 0)), "null", "null variant");
TEST_RESULT_STR(strPtr(jsonFromVar(varNewBool(true), 0)), "true", "bool variant");
TEST_RESULT_STR(strPtr(jsonFromVar(varNewUInt(66), 0)), "66", "uint variant");
TEST_RESULT_STR(strPtr(jsonFromVar(varNewUInt64(10000000001), 0)), "10000000001", "uint64 variant");
TEST_RESULT_STR(strPtr(jsonFromVar(varNewStrZ("test \" string"), 0)), "\"test \\\" string\"", "string variant");