From 960661980beb50c5d21e4b2855ae109e9a130326 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Wed, 18 Jun 2014 19:28:20 -0400 Subject: Remove unnecessary check for jbvBinary in convertJsonbValue. The check was confusing and is a condition that should never in fact happen. Per gripe from Dmitry Dolgov. --- src/backend/utils/adt/jsonb_util.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/backend/utils/adt/jsonb_util.c') diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c index 93bb148232e..04f35bfffc9 100644 --- a/src/backend/utils/adt/jsonb_util.c +++ b/src/backend/utils/adt/jsonb_util.c @@ -1314,7 +1314,14 @@ convertJsonbValue(StringInfo buffer, JEntry *header, JsonbValue *val, int level) if (!val) return; - if (IsAJsonbScalar(val) || val->type == jbvBinary) + /* + * A JsonbValue passed as val should never have a type of jbvBinary, + * and neither should any of its sub-components. Those values will be + * produced by convertJsonbArray and convertJsonbObject, the results of + * which will not be passed back to this function as an argument. + */ + + if (IsAJsonbScalar(val)) convertJsonbScalar(buffer, header, val); else if (val->type == jbvArray) convertJsonbArray(buffer, header, val, level); -- cgit v1.2.3