db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-09-16 09:06:18 +02:00
Code Issues Releases Activity

Add int rendering to jsonFromVar().

Browse Source
This commit is contained in:
David Steele
2019-07-24 19:45:35 -04:00
parent 615735e7ee
commit 54ec8f151e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -984,6 +984,10 @@ jsonFromVar(const Variant *var, unsigned int indent)
{ {
strCat(jsonStr, strPtr(jsonFromVar(varSub, indent))); strCat(jsonStr, strPtr(jsonFromVar(varSub, indent)));
} }
else if (varType(varSub) == varTypeInt)
{
strCat(jsonStr, strPtr(jsonFromInt(varInt(varSub))));
}
else if (varType(varSub) == varTypeInt64) else if (varType(varSub) == varTypeInt64)
{ {
strCat(jsonStr, strPtr(jsonFromInt64(varInt64(varSub)))); strCat(jsonStr, strPtr(jsonFromInt64(varInt64(varSub))));

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

@@ -289,6 +289,7 @@ testRun(void)
TEST_ASSIGN(varListOuter, varNewVarLst(varLstNew()), "new variant list with keyValues"); TEST_ASSIGN(varListOuter, varNewVarLst(varLstNew()), "new variant list with keyValues");
varLstAdd(varVarLst(varListOuter), varNewStrZ("ASTRING")); varLstAdd(varVarLst(varListOuter), varNewStrZ("ASTRING"));
varLstAdd(varVarLst(varListOuter), varNewInt64(9223372036854775807LL)); varLstAdd(varVarLst(varListOuter), varNewInt64(9223372036854775807LL));
varLstAdd(varVarLst(varListOuter), varNewInt(2147483647));
varLstAdd(varVarLst(varListOuter), varNewBool(true)); varLstAdd(varVarLst(varListOuter), varNewBool(true));
varLstAdd(varVarLst(varListOuter), varNewVarLst(varLstNew())); varLstAdd(varVarLst(varListOuter), varNewVarLst(varLstNew()));
varLstAdd(varVarLst(varListOuter), NULL); varLstAdd(varVarLst(varListOuter), NULL);
@@ -296,7 +297,7 @@ testRun(void)
TEST_ASSIGN(json, jsonFromVar(varListOuter, 0), "VariantList - no indent"); TEST_ASSIGN(json, jsonFromVar(varListOuter, 0), "VariantList - no indent");
TEST_RESULT_STR(strPtr(json), TEST_RESULT_STR(strPtr(json),
"[\"ASTRING\",9223372036854775807,true,[],null,{\"backup-info-size-delta\":1982702," "[\"ASTRING\",9223372036854775807,2147483647,true,[],null,{\"backup-info-size-delta\":1982702,"
"\"backup-prior\":\"20161219-212741F_20161219-212803I\"," "\"backup-prior\":\"20161219-212741F_20161219-212803I\","
"\"backup-reference\":[\"20161219-212741F\",\"20161219-212741F_20161219-212803I\",null]," "\"backup-reference\":[\"20161219-212741F\",\"20161219-212741F_20161219-212803I\",null],"
"\"backup-timestamp-start\":1482182951,\"checksum-page-error\":[1]," "\"backup-timestamp-start\":1482182951,\"checksum-page-error\":[1],"
@@ -308,7 +309,7 @@ testRun(void)
TEST_ASSIGN(json, jsonFromVar(varListOuter, 0), "VariantList - no indent - multiple elements"); TEST_ASSIGN(json, jsonFromVar(varListOuter, 0), "VariantList - no indent - multiple elements");
TEST_RESULT_STR(strPtr(json), TEST_RESULT_STR(strPtr(json),
"[\"ASTRING\",9223372036854775807,true,[],null,{\"backup-info-size-delta\":1982702," "[\"ASTRING\",9223372036854775807,2147483647,true,[],null,{\"backup-info-size-delta\":1982702,"
"\"backup-prior\":\"20161219-212741F_20161219-212803I\"," "\"backup-prior\":\"20161219-212741F_20161219-212803I\","
"\"backup-reference\":[\"20161219-212741F\",\"20161219-212741F_20161219-212803I\",null]," "\"backup-reference\":[\"20161219-212741F\",\"20161219-212741F_20161219-212803I\",null],"
"\"backup-timestamp-start\":1482182951,\"checksum-page-error\":[1]," "\"backup-timestamp-start\":1482182951,\"checksum-page-error\":[1],"
@@ -324,6 +325,7 @@ testRun(void)
"[\n" "[\n"
" \"ASTRING\",\n" " \"ASTRING\",\n"
" 9223372036854775807,\n" " 9223372036854775807,\n"
" 2147483647,\n"
" true,\n" " true,\n"
" []\n,\n" " []\n,\n"
" null,\n" " null,\n"