Commit653d396

committed

Teach jsonpath string() to unwrap in lax mode

This was an ommission in commit66ea94e, and brings it into compliancewith both other methods and the standard.Per complaint from David Wheeler.Author: David Wheeler, Jeevan ChalkeReviewed-by: Chapman FlackDiscussion:https://postgr.es/m/A64AE04F-4410-42B7-A141-7A7349260F4D@justatheory.com

1 parent81d20fb commit653d396Copy full SHA for 653d396

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17792,7 +17792,10 @@ ERROR: jsonpath member accessor can only be applied to an object`
`17792`	`17792`	`methods available in <type>jsonpath</type>. Note that while the unary`
`17793`	`17793`	`operators and methods can be applied to multiple values resulting from a`
`17794`	`17794`	`preceding path step, the binary operators (addition etc.) can only be`
`17795`		`- applied to single values.`
	`17795`	`+ applied to single values. In lax mode, methods applied to an array will be`
	`17796`	`+ executed for each value in the array. The exceptions are`
	`17797`	`+ <literal>.type()</literal> and <literal>.size()</literal>, which apply to`
	`17798`	`+ the array itself.`
`17796`	`17799`	`</para>`
`17797`	`17800`
`17798`	`17801`	`<table id="functions-sqljson-op-table">`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1606,6 +1606,9 @@ executeItemOptUnwrapTarget(JsonPathExecContext cxt, JsonPathItem jsp,`
`1606`	`1606`	`JsonbValuejbv;`
`1607`	`1607`	`char*tmp=NULL;`
`1608`	`1608`
	`1609`	`+if (unwrap&&JsonbType(jb)==jbvArray)`
	`1610`	`+returnexecuteItemUnwrapTargetArray(cxt,jsp,jb,found, false);`
	`1611`	`+`
`1609`	`1612`	`switch (JsonbType(jb))`
`1610`	`1613`	`{`
`1611`	`1614`	`casejbvString:`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2525,7 +2525,10 @@ select jsonb_path_query('null', '$.string()', silent => true);`
`2525`	`2525`	`(0 rows)`
`2526`	`2526`
`2527`	`2527`	`select jsonb_path_query('[]', '$.string()');`
`2528`		`-ERROR: jsonpath item method .string() can only be applied to a bool, string, numeric, or datetime value`
	`2528`	`+ jsonb_path_query`
	`2529`	`+------------------`
	`2530`	`+(0 rows)`
	`2531`	`+`
`2529`	`2532`	`select jsonb_path_query('[]', 'strict $.string()');`
`2530`	`2533`	`ERROR: jsonpath item method .string() can only be applied to a bool, string, numeric, or datetime value`
`2531`	`2534`	`select jsonb_path_query('{}', '$.string()');`
`@@ -2576,6 +2579,13 @@ select jsonb_path_query('1234', '$.string().type()');`
`2576`	`2579`	`"string"`
`2577`	`2580`	`(1 row)`
`2578`	`2581`
	`2582`	`+select jsonb_path_query('[2, true]', '$.string()');`
	`2583`	`+ jsonb_path_query`
	`2584`	`+------------------`
	`2585`	`+ "2"`
	`2586`	`+ "true"`
	`2587`	`+(2 rows)`
	`2588`	`+`
`2579`	`2589`	`select jsonb_path_query('"2023-08-15 12:34:56 +5:30"', '$.timestamp().string()');`
`2580`	`2590`	`ERROR: cannot convert value from timestamptz to timestamp without time zone usage`
`2581`	`2591`	`HINT: Use *_tz() function for time zone support.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -586,6 +586,7 @@ select jsonb_path_query('"1.23aaa"', '$.string()');`
`586`	`586`	`select jsonb_path_query('1234','$.string()');`
`587`	`587`	`select jsonb_path_query('true','$.string()');`
`588`	`588`	`select jsonb_path_query('1234','$.string().type()');`
	`589`	`+select jsonb_path_query('[2, true]','$.string()');`
`589`	`590`	`select jsonb_path_query('"2023-08-15 12:34:56 +5:30"','$.timestamp().string()');`
`590`	`591`	`select jsonb_path_query_tz('"2023-08-15 12:34:56 +5:30"','$.timestamp().string()');-- should work`
`591`	`592`	`select jsonb_path_query_array('[1.23, "yes", false]','$[*].string()');`

Comments

(0)