Commit9c3d25e

committed

Fix JSON_OBJECTAGG uniquefying bug

Commitf4fb45d contained a bug in removing items with null values whenunique keys are required, where the leading items that are sortedcontained such values. Fix that and add a test for it.Discussion:https://postgr.es/m/CAJA4AWQ_XbSmsNbW226UqNyRLJ+wb=iQkQMj77cQyoNkqtf=2Q@mail.gmail.com

1 parent5c854e7 commit9c3d25eCopy full SHA for 9c3d25e

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1959,8 +1959,18 @@ uniqueifyJsonbObject(JsonbValue *object, bool unique_keys, bool skip_nulls)`
`1959`	`1959`
`1960`	`1960`	`if (hasNonUniq\|\|skip_nulls)`
`1961`	`1961`	`{`
`1962`		`-JsonbPair*ptr=object->val.object.pairs+1,`
`1963`		`-*res=object->val.object.pairs;`
	`1962`	`+JsonbPairptr,res;`
	`1963`	`+`
	`1964`	`+while (skip_nulls&&object->val.object.nPairs>0&&`
	`1965`	`+object->val.object.pairs->value.type==jbvNull)`
	`1966`	`+{`
	`1967`	`+/* If skip_nulls is true, remove leading items with null */`
	`1968`	`+object->val.object.pairs++;`
	`1969`	`+object->val.object.nPairs--;`
	`1970`	`+}`
	`1971`	`+`
	`1972`	`+ptr=object->val.object.pairs+1;`
	`1973`	`+res=object->val.object.pairs;`
`1964`	`1974`
`1965`	`1975`	`while (ptr-object->val.object.pairs<object->val.object.nPairs)`
`1966`	`1976`	`{`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -944,6 +944,13 @@ ERROR: duplicate JSON object key value`
`944`	`944`	`SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS RETURNING jsonb)`
`945`	`945`	`FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);`
`946`	`946`	`ERROR: duplicate JSON object key value`
	`947`	`+SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS RETURNING jsonb)`
	`948`	`+FROM (VALUES (1, 1), (0, NULL),(4, null), (5, null),(6, null),(2, 2)) foo(k, v);`
	`949`	`+ json_objectagg`
	`950`	`+------------------`
	`951`	`+ {"1": 1, "2": 2}`
	`952`	`+(1 row)`
	`953`	`+`
`947`	`954`	`-- Test JSON_OBJECT deparsing`
`948`	`955`	`EXPLAIN (VERBOSE, COSTS OFF)`
`949`	`956`	`SELECT JSON_OBJECT('foo' : '1' FORMAT JSON, 'bar' : 'baz' RETURNING json);`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,9 @@ FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);`
`281`	`281`	`SELECT JSON_OBJECTAGG(k: v ABSENTONNULL WITH UNIQUE KEYS RETURNING jsonb)`
`282`	`282`	`FROM (VALUES (1,1), (1,NULL), (2,2)) foo(k, v);`
`283`	`283`
	`284`	`+SELECT JSON_OBJECTAGG(k: v ABSENTONNULL WITH UNIQUE KEYS RETURNING jsonb)`
	`285`	`+FROM (VALUES (1,1), (0,NULL),(4,null), (5,null),(6,null),(2,2)) foo(k, v);`
	`286`	`+`
`284`	`287`	`-- Test JSON_OBJECT deparsing`
`285`	`288`	`EXPLAIN (VERBOSE, COSTS OFF)`
`286`	`289`	`SELECT JSON_OBJECT('foo' :'1' FORMAT JSON,'bar' :'baz' RETURNING json);`

Comments

(0)