Fix regression in FOR JSON AUTO with nested queries. (#3125)

* Fix regression in FOR JSON AUTO with nested queries. The previous implementation of nested FOR JSON AUTO relied on the happy accident that the enum T_JsonArrayQueryConstructor happened to have the same value as the typid for the json type, 114. In PG17 the enum value for T_JsonArrayQueryConstructor changed to 130, leading to errors when trying to evaluate nested FOR JSON AUTO queries. Fix this by properly using the typid for json. Task: BABEL-5398 Signed-off-by: Jason Teng <[email protected]>
babelfish-for-postgresql · Nov 15, 2024 · e47fa84 · e47fa84
1 parent 81de5b9
commit e47fa84
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/contrib/babelfishpg_tsql/src/pl_handler.c b/contrib/babelfishpg_tsql/src/pl_handler.c
@@ -1563,7 +1563,7 @@ static void modifyColumnEntries(List* targetList, forjson_table **tableInfoArr,
 				if(handleForJsonAuto(castNode(Query, sl->subselect), tableInfoArr, numTables)) {
 					CoerceViaIO *iocoerce = makeNode(CoerceViaIO);
 					iocoerce->arg = (Expr*) sl;
-					iocoerce->resulttype = T_JsonArrayQueryConstructor;
+					iocoerce->resulttype = TypenameGetTypid("json");
 					iocoerce->resultcollid = 0;
 					iocoerce->coerceformat = COERCE_EXPLICIT_CAST;
 					buildJsonEntry(1, "temp", te);

diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule
@@ -487,9 +487,6 @@ ignore#!#pgr_select
 ignore#!#pgr_zzz_clean_up
 
 # Ignoring some test temporarily to get clean tests
-ignore#!#forjsonauto-vu-prepare
-ignore#!#forjsonauto-vu-verify
-ignore#!#forjsonauto-vu-cleanup
 ignore#!#BABEL-3292
 ignore#!#BABEL-3512
 ignore#!#BABEL-4046-vu-prepare

diff --git a/test/JDBC/upgrade/16_5/schedule b/test/JDBC/upgrade/16_5/schedule
@@ -220,7 +220,7 @@ forjson
 forjson-datatypes
 forjson-subquery
 forjson-nesting
-# forjsonauto - TODO JIRA - BABEL-5398
+forjsonauto
 format
 format-dep
 forxml

diff --git a/test/JDBC/upgrade/latest/schedule b/test/JDBC/upgrade/latest/schedule
@@ -220,7 +220,7 @@ forjson
 forjson-datatypes
 forjson-subquery
 forjson-nesting
-# forjsonauto - TODO JIRA - BABEL-5398
+forjsonauto
 format
 format-dep
 forxml