Merge branch 'BABEL_5_X_DEV__PG_17_X' into jira-babel-5957

lohia-shalini · lohia-shalini · commit bb2824aafa2f · 2025-10-01T05:16:42.000Z
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -1395,6 +1395,7 @@ heap_create_with_catalog(const char *relname,
 		strncpy(enr->md.name, relname, strlen(relname) + 1);
 		enr->md.reliddesc = relid;
 		enr->md.enrtype = ENR_TSQL_TEMP;
+		enr->md.parent_oid = InvalidOid;
 		register_ENR(currentQueryEnv, enr);
 		MemoryContextSwitchTo(oldcontext);
 	}
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
@@ -1014,6 +1014,7 @@ index_create(Relation heapRelation,
 		strncpy(enr->md.name, indexRelationName, strlen(indexRelationName) + 1);
 		enr->md.reliddesc = indexRelationId;
 		enr->md.enrtype = ENR_TSQL_TEMP;
+		enr->md.parent_oid = heapRelationId;
 		register_ENR(currentQueryEnv, enr);
 		MemoryContextSwitchTo(oldcontext);
 	}
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
@@ -2362,7 +2362,7 @@ ExecuteCallStmt(CallStmt *stmt, ParamListInfo params, bool atomic, DestReceiver
 	Assert(IsA(fexpr, FuncExpr));
 
 	if (ExecFuncProc_AclCheck_hook)
-		aclresult = ExecFuncProc_AclCheck_hook(fexpr->funcid);
+		aclresult = ExecFuncProc_AclCheck_hook(fexpr->funcid, (Expr *)fexpr);
 	else
 		aclresult = object_aclcheck(ProcedureRelationId, fexpr->funcid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
@@ -2639,7 +2639,7 @@ ExecInitFunc(ExprEvalStep *scratch, Expr *node, List *args, Oid funcid,
 
 	/* Check permission to call function */
 	if (ExecFuncProc_AclCheck_hook)
-		aclresult = ExecFuncProc_AclCheck_hook(funcid);
+		aclresult = ExecFuncProc_AclCheck_hook(funcid, node);
 	else
 		aclresult = object_aclcheck(ProcedureRelationId, funcid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
diff --git a/src/backend/executor/execSRF.c b/src/backend/executor/execSRF.c
@@ -703,7 +703,7 @@ init_sexpr(Oid foid, Oid input_collation, Expr *node,
 
 	/* Check permission to call function */
 	if (ExecFuncProc_AclCheck_hook)
-		aclresult = ExecFuncProc_AclCheck_hook(foid);
+		aclresult = ExecFuncProc_AclCheck_hook(foid, node);
 	else
 		aclresult = object_aclcheck(ProcedureRelationId, foid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
@@ -3430,6 +3430,7 @@ SPI_register_trigger_data(TriggerData *tdata)
 		enr->md.enrtype = ENR_NAMED_TUPLESTORE;
 		enr->md.enrtuples = tuplestore_tuple_count(tdata->tg_newtable);
 		enr->reldata = tdata->tg_newtable;
+		enr->md.parent_oid = InvalidOid;
 		rc = SPI_register_relation(enr);
 		if (rc != SPI_OK_REL_REGISTER)
 			return rc;
@@ -3447,6 +3448,7 @@ SPI_register_trigger_data(TriggerData *tdata)
 		enr->md.enrtype = ENR_NAMED_TUPLESTORE;
 		enr->md.enrtuples = tuplestore_tuple_count(tdata->tg_oldtable);
 		enr->reldata = tdata->tg_oldtable;
+		enr->md.parent_oid = InvalidOid;
 		rc = SPI_register_relation(enr);
 		if (rc != SPI_OK_REL_REGISTER)
 			return rc;
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
@@ -90,8 +90,9 @@ pre_transform_setop_sort_clause_hook_type pre_transform_setop_sort_clause_hook =
 /* Hook to transform TSQL pivot clause in select stmt */
 transform_pivot_clause_hook_type transform_pivot_clause_hook = NULL;
 
-/* Hook to transform TSQL unpivot clauses in select stmt */
-transform_unpivot_clause_hook_type transform_unpivot_clause_hook = NULL;
+/* Hook to transform TSQL unpivot, top N percent clauses in select stmt */
+transform_tsql_select_stmt_hook_type transform_tsql_select_stmt_hook = NULL;
+
 
 static Query *transformOptionalSelectInto(ParseState *pstate, Node *parseTree);
 static Query *transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt);
@@ -1441,10 +1442,10 @@ transformSelectStmt(ParseState *pstate, SelectStmt *stmt)
 
 	qry->commandType = CMD_SELECT;
 
-	/* Unpack and process TSQL UNPIVOT nodes in stmt->fromClause, if present */
-	if(transform_unpivot_clause_hook)
+	/* Unpack and process TSQL UNPIVOT nodes in stmt->fromClause, Process Top N Percent, if present */
+	if(transform_tsql_select_stmt_hook)
 	{
-		(*transform_unpivot_clause_hook)(pstate, stmt);
+		(*transform_tsql_select_stmt_hook)(pstate, stmt);
 	}
 
 	/* process the WITH clause independently of all else */
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
@@ -56,6 +56,8 @@ sortby_nulls_hook_type  sortby_nulls_hook = NULL;
 
 optimize_explicit_cast_hook_type optimize_explicit_cast_hook = NULL;
 
+pre_transform_openxml_columns_hook_type pre_transform_openxml_columns_hook = NULL;
+
 static int	extractRemainingColumns(ParseState *pstate,
 									ParseNamespaceColumn *src_nscolumns,
 									List *src_colnames,
@@ -711,6 +713,13 @@ transformRangeTableFunc(ParseState *pstate, RangeTableFunc *rtf)
 	constructName = "XMLTABLE";
 	docType = XMLOID;
 
+	/*
+	 * Hook to allow extensions to pre-process OPENXML column definitions
+	 * before standard XMLTABLE transformation.
+	 */
+	if (pre_transform_openxml_columns_hook && tf->functype == TFT_XMLTABLE)
+		pre_transform_openxml_columns_hook(pstate, rtf);
+
 	/*
 	 * We make lateral_only names of this level visible, whether or not the
 	 * RangeTableFunc is explicitly marked LATERAL.  This is needed for SQL
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
@@ -232,6 +232,10 @@ const TableFuncRoutine XmlTableRoutine =
 	.DestroyOpaque = XmlTableDestroyOpaque
 };
 
+#ifdef USE_LIBXML
+openxml_set_namespaces_hook_type openxml_set_namespaces_hook = NULL;
+#endif
+
 #define NO_XML_SUPPORT() \
 	ereport(ERROR, \
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), \
@@ -4797,6 +4801,10 @@ XmlTableSetNamespace(TableFuncScanState *state, const char *name, const char *ur
 				 errmsg("DEFAULT namespace is not supported")));
 	xtCxt = GetXmlTableBuilderPrivateData(state, "XmlTableSetNamespace");
 
+	/* For TSQL OPENXML, following hook will fetch and register namespaces in Xpath context. */
+	if (openxml_set_namespaces_hook)
+        return openxml_set_namespaces_hook(xtCxt->xpathcxt, xtCxt->xmlerrcxt, uri);
+
 	if (xmlXPathRegisterNs(xtCxt->xpathcxt,
 						   pg_xmlCharStrndup(name, strlen(name)),
 						   pg_xmlCharStrndup(uri, strlen(uri))))
@@ -5116,3 +5124,28 @@ XmlTableDestroyOpaque(TableFuncScanState *state)
 	NO_XML_SUPPORT();
 #endif							/* not USE_LIBXML */
 }
+
+#ifdef USE_LIBXML
+xmlDocPtr
+xml_parse_wrapper(text *data, XmlOptionType xmloption_arg,
+		  bool preserve_whitespace, int encoding,
+		  XmlOptionType *parsed_xmloptiontype, xmlNodePtr *parsed_nodes,
+		  Node *escontext)
+{
+	return xml_parse(data, xmloption_arg, preserve_whitespace,
+					encoding, parsed_xmloptiontype, parsed_nodes, escontext);
+}
+
+xmlChar *
+pg_xmlCharStrndup_wrapper(const char *str, size_t len)
+{
+	return pg_xmlCharStrndup(str, len);
+}
+
+int
+parse_xml_decl_wrapper(const xmlChar *str, size_t *lenp,
+						   xmlChar **version, xmlChar **encoding, int *standalone)
+{
+	return parse_xml_decl(str, lenp, version, encoding, standalone);
+}
+#endif							/* USE_LIBXML */
diff --git a/src/backend/utils/misc/queryenvironment.c b/src/backend/utils/misc/queryenvironment.c
@@ -212,10 +212,30 @@ register_ENR(QueryEnvironment *queryEnv, EphemeralNamedRelation enr)
 	Assert(enr != NULL);
 	Assert(get_ENR(queryEnv, enr->md.name, false) == NULL);
 
-	if (enr->md.name[0] == '#')
-		enr->md.is_bbf_temp_table = true;
-	else
-		enr->md.is_bbf_temp_table = false;
+	if (enr->md.parent_oid != InvalidOid)
+	{
+		/*
+		 * This is an index on a ENR temp object. We mark the flag by checking 
+		 * the parent relations flag.
+		 * If it is an implicit index over tsql table variable, it gets marked 
+		 * as false, same as parent since table variable don't follow transactional
+		 * semantics.
+		 */
+		EphemeralNamedRelation parent_enr = GetENRTempTableWithOid(enr->md.parent_oid);
+		if(parent_enr)
+			enr->md.is_bbf_temp_table = parent_enr->md.is_bbf_temp_table;
+		else
+			enr->md.is_bbf_temp_table = false;
+	} else {
+		/*
+		 * This is a table or some parent entity. If the name of this table
+		 * starts with '#', this is a tsql temp table.
+		 */
+		if (enr->md.name[0] == '#')
+			enr->md.is_bbf_temp_table = true;
+		else
+			enr->md.is_bbf_temp_table = false;
+	}
 
 	if (enr->md.is_bbf_temp_table && GetCurrentSubTransactionId() != InvalidSubTransactionId)
 		enr->md.created_subid = GetCurrentSubTransactionId();
diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h
@@ -46,7 +46,7 @@ typedef bool (*ExecEvalBoolSubroutine) (ExprState *state,
  * Helpful in cases when permissions need to be checked against
  * a different user instead of current user.
  */
-typedef AclResult (*ExecFuncProc_AclCheck_hook_type) (Oid funcid);
+typedef AclResult (*ExecFuncProc_AclCheck_hook_type) (Oid funcid, Expr *fexpr);
 extern PGDLLIMPORT ExecFuncProc_AclCheck_hook_type ExecFuncProc_AclCheck_hook;
 
 /* ExprEvalSteps that cache a composite type's tupdesc need one of these */
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
@@ -429,6 +429,7 @@ typedef enum LimitOption
 {
 	LIMIT_OPTION_COUNT,			/* FETCH FIRST... ONLY */
 	LIMIT_OPTION_WITH_TIES,		/* FETCH FIRST... WITH TIES */
+	LIMIT_OPTION_PERCENT,		/* FETCH FIRST... PERCENT FOR TSQL */
 } LimitOption;
 
 #endif							/* NODES_H */
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h
@@ -69,8 +69,9 @@ typedef void (*transform_pivot_clause_hook_type)(ParseState *pstate, SelectStmt
 extern PGDLLEXPORT transform_pivot_clause_hook_type transform_pivot_clause_hook;
 
 /* Hook for transform unpivot clause in tsql select stmt */
-typedef void (*transform_unpivot_clause_hook_type)(ParseState *pstate, SelectStmt *stmt);
-extern PGDLLEXPORT transform_unpivot_clause_hook_type transform_unpivot_clause_hook;
+typedef void (*transform_tsql_select_stmt_hook_type)(ParseState *pstate, SelectStmt *stmt);
+extern PGDLLEXPORT transform_tsql_select_stmt_hook_type transform_tsql_select_stmt_hook;
+
 
 extern Query *parse_analyze_fixedparams(RawStmt *parseTree, const char *sourceText,
 										const Oid *paramTypes, int numParams, QueryEnvironment *queryEnv);
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
@@ -62,4 +62,8 @@ extern PGDLLEXPORT optimize_explicit_cast_hook_type optimize_explicit_cast_hook;
 /* functions in parse_jsontable.c */
 extern ParseNamespaceItem *transformJsonTable(ParseState *pstate, JsonTable *jt);
 
+/* Hook for preprocessing OPENXML column definitions before XMLTABLE transformation */
+typedef void (*pre_transform_openxml_columns_hook_type) (ParseState *pstate, RangeTableFunc *rtf);
+extern PGDLLIMPORT pre_transform_openxml_columns_hook_type pre_transform_openxml_columns_hook;
+
 #endif							/* PARSE_CLAUSE_H */
diff --git a/src/include/utils/queryenvironment.h b/src/include/utils/queryenvironment.h
@@ -100,6 +100,8 @@ typedef struct EphemeralNamedRelationMetadataData
 	SubTransactionId dropped_subid;
 	/* List of uncommitted tuples. They must be processed on ROLLBACK, or cleared on commit. */
 	List		*uncommitted_cattups[ENR_CATTUP_END];
+	/* Maintain parent oid for tracking if child objects should follow transactional semantics based on parent nature */
+	Oid			parent_oid;
 } EphemeralNamedRelationMetadataData;
 
 typedef EphemeralNamedRelationMetadataData *EphemeralNamedRelationMetadata;
diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h
@@ -19,6 +19,10 @@
 #include "fmgr.h"
 #include "nodes/execnodes.h"
 #include "nodes/primnodes.h"
+#ifdef USE_LIBXML
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+#endif
 
 typedef struct varlena xmltype;
 
@@ -85,6 +89,20 @@ extern char *map_sql_identifier_to_xml_name(const char *ident, bool fully_escape
 extern char *map_xml_name_to_sql_identifier(const char *name);
 extern char *map_sql_value_to_xml_value(Datum value, Oid type, bool xml_escape_strings);
 
+#ifdef USE_LIBXML
+extern xmlDocPtr xml_parse_wrapper(text *data, XmlOptionType xmloption_arg,
+							bool preserve_whitespace, int encoding,
+							XmlOptionType *parsed_xmloptiontype, xmlNodePtr *parsed_nodes,
+							Node *escontext);
+extern xmlChar *pg_xmlCharStrndup_wrapper(const char *str, size_t len);
+extern int parse_xml_decl_wrapper(const xmlChar *str, size_t *lenp,
+						   xmlChar **version, xmlChar **encoding, int *standalone);
+						   
+/* Hook function type for TSQL OPENXML namespace handling */
+typedef void (*openxml_set_namespaces_hook_type) (xmlXPathContext *xpathctx, PgXmlErrorContext *xmlerrcxt, char *doc_id_str);
+extern PGDLLIMPORT openxml_set_namespaces_hook_type openxml_set_namespaces_hook;
+#endif							/* USE_LIBXML */
+
 extern PGDLLIMPORT int xmlbinary;	/* XmlBinaryType, but int for guc enum */
 
 extern PGDLLIMPORT int xmloption;	/* XmlOptionType, but int for guc enum */

Original file line number	Diff line number	Diff line change
`@@ -1395,6 +1395,7 @@ heap_create_with_catalog(const char *relname,`
`1395`	`1395`	`strncpy(enr->md.name, relname, strlen(relname) + 1);`
`1396`	`1396`	`enr->md.reliddesc = relid;`
`1397`	`1397`	`enr->md.enrtype = ENR_TSQL_TEMP;`
	`1398`	`+ enr->md.parent_oid = InvalidOid;`
`1398`	`1399`	`register_ENR(currentQueryEnv, enr);`
`1399`	`1400`	`MemoryContextSwitchTo(oldcontext);`
`1400`	`1401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1014,6 +1014,7 @@ index_create(Relation heapRelation,`
`1014`	`1014`	`strncpy(enr->md.name, indexRelationName, strlen(indexRelationName) + 1);`
`1015`	`1015`	`enr->md.reliddesc = indexRelationId;`
`1016`	`1016`	`enr->md.enrtype = ENR_TSQL_TEMP;`
	`1017`	`+ enr->md.parent_oid = heapRelationId;`
`1017`	`1018`	`register_ENR(currentQueryEnv, enr);`
`1018`	`1019`	`MemoryContextSwitchTo(oldcontext);`
`1019`	`1020`	`}`