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.

diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
index 93bb148232e140d357c0fb60aac04beddc03d43c..04f35bfffc99beb50a635dd00538217fbd502064 100644 (file)
--- 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);