Add support for OPENXML with WITH clause

contrib/babelfishpg_tsql/runtime/functions.c

@@ -243,7 +243,6 @@ extern bool inited_ht_tsql_cast_info;
 extern bool inited_ht_tsql_datatype_precedence_info;
 extern PLtsql_execstate *get_outermost_tsql_estate(int *nestlevel);
 extern char *replace_special_chars_fts_impl(char *input_str);
-extern void get_xml_data_and_namespace_data(int document_id, xmltype **xml_data, xmltype **ns_data);
 
 #ifdef USE_LIBXML
 HTAB	     *ht_xmlNode2Id = NULL;
@@ -5183,7 +5182,7 @@ get_bbf_pivot_tuplestore(const char 	*sourcetext,
  * The count of extracted namespaces is stored in ns_count. If no namespaces are found, 
  * ns_names and ns_uris are set to NULL and ns_count to 0.
  */
-static void
+void
 extract_namespaces_from_xml(xmltype *ns_data, char ***ns_names, char ***ns_uris, int *ns_count)
 {
     xmlDocPtr	doc;

contrib/babelfishpg_tsql/sql/sys_function_helpers.sql

@@ -3022,32 +3022,6 @@ $BODY$
 LANGUAGE plpgsql
 STABLE;
 
-CREATE OR REPLACE FUNCTION sys.babelfish_openxml(IN DocHandle BIGINT)
-   RETURNS TABLE (XmlData XML)
-AS
-$BODY$
-DECLARE
-   XmlDocument$data XML;
-BEGIN
-
-    SELECT t.XmlData
-	  INTO STRICT XmlDocument$data
-	  FROM sys$openxml t
-	 WHERE t.DocID = DocHandle;
-
-   RETURN QUERY SELECT XmlDocument$data;
-
-   EXCEPTION
-	  WHEN SQLSTATE '42P01' OR SQLSTATE 'P0002' THEN
-	      RAISE EXCEPTION '%','Could not find prepared statement with handle '||CASE
-                                                                              WHEN DocHandle IS NULL THEN 'null'
-                                                                                ELSE DocHandle::TEXT
-                                                                             END;
-END;
-$BODY$
-LANGUAGE  plpgsql
-STABLE;
-
 CREATE OR REPLACE FUNCTION sys.babelfish_parse_to_date(IN p_datestring TEXT,
                                                            IN p_culture TEXT DEFAULT '')
 RETURNS DATE

contrib/babelfishpg_tsql/sql/sys_functions.sql

@@ -4152,6 +4152,18 @@ CREATE OR REPLACE FUNCTION sys.openjson_with(json_string text, path text, VARIAD
 RETURNS SETOF RECORD
 AS 'babelfishpg_tsql', 'tsql_openjson_with' LANGUAGE C STRICT IMMUTABLE PARALLEL SAFE;
 
+/* Function to retrieve XML doc from temp table using doc_id (for openxml) */
+CREATE OR REPLACE FUNCTION sys.tsql_openxml_get_xmldoc(int)
+RETURNS xml
+AS 'babelfishpg_tsql', 'tsql_openxml_get_xmldoc'
+LANGUAGE C STRICT;
+
+/* This function generates XPath expressions for OPENXML columns */
+CREATE OR REPLACE FUNCTION sys.tsql_openxml_get_colpattern(text,int)
+RETURNS sys.nvarchar
+AS 'babelfishpg_tsql', 'tsql_openxml_get_colpattern'
+LANGUAGE C STRICT;
+
 CREATE OR REPLACE FUNCTION sys.sp_datatype_info_helper(
     IN odbcVer smallint,
     IN is_100 bool,

contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--5.3.0--5.4.0.sql

@@ -223,6 +223,16 @@ GRANT EXECUTE ON PROCEDURE sys.sp_xml_removedocument(
 	IN INTEGER
 ) TO PUBLIC;
 
+CREATE OR REPLACE FUNCTION sys.tsql_openxml_get_xmldoc(int)
+RETURNS xml
+AS 'babelfishpg_tsql', 'tsql_openxml_get_xmldoc'
+LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION sys.tsql_openxml_get_colpattern(text,int)
+RETURNS sys.nvarchar
+AS 'babelfishpg_tsql', 'tsql_openxml_get_colpattern'
+LANGUAGE C STRICT;
+
 CREATE OR REPLACE FUNCTION sys.openxml_simple(document_id INT, 
                                        rowpattern TEXT, 
                                        flags INTEGER DEFAULT 0)
@@ -283,6 +293,20 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
 
+DO $$
+DECLARE
+    exception_message text;
+BEGIN
+    ALTER FUNCTION sys.babelfish_openxml RENAME TO babelfish_openxml_deprecated_in_5_4_0;
+EXCEPTION WHEN OTHERS THEN
+    GET STACKED DIAGNOSTICS
+    exception_message = MESSAGE_TEXT;
+    RAISE WARNING '%', exception_message;
+END;
+$$;
+
+CALL sys.babelfish_drop_deprecated_object('function', 'sys', 'babelfish_openxml_deprecated_in_5_4_0');
+
 -- Drops the temporary procedure used by the upgrade script.
 -- Please have this be one of the last statements executed in this upgrade script.
 DROP PROCEDURE sys.babelfish_drop_deprecated_object(varchar, varchar, varchar);

contrib/babelfishpg_tsql/src/backend_parser/gram-tsql-decl.y

@@ -42,6 +42,8 @@
 %type <str> optional_path
 %type <boolean> optional_asJson
 %type <node> openxml_expr
+%type <list> openxml_column_list
+%type <node> openxml_column_el
 
 %type <node> tsql_opt_arg_dflt
 %type <node> tsql_opt_null_keyword
@@ -137,6 +139,6 @@
  * otherwise the parser cannot tell between 'WITH' and 'WITH (' and thus
  * lead to a shift/reduce conflict.
  */
-%token	WITH_paren TSQL_HINT_START_BRACKET UPDATE_paren
+%token	WITH_paren TSQL_HINT_START_BRACKET UPDATE_paren WITH_table
 
 %left TSQL_CROSS TSQL_OUTER TSQL_UNPIVOT

contrib/babelfishpg_tsql/src/backend_parser/gram-tsql-rule.y

@@ -1836,6 +1836,83 @@ openxml_expr: OPENXML '(' a_expr ',' a_expr ')' opt_alias_clause
 					/* map to OPENXML_SIMPLE */
 					$$ = (Node*) n;		
 				}
+			| OPENXML '(' a_expr ',' a_expr ')' WITH_table TABLE qualified_name opt_alias_clause
+				{
+					RangeTableFunc *n = makeNode(RangeTableFunc);
+					n->docexpr = $3;
+					n->rowexpr = $5;
+					n->location = @1;
+					/* Default flag is 0 when not specified */
+					n->namespaces = list_make1(makeIntConst(0, @1));
+					n->columns = list_make1($9);
+					n->alias = $10;
+					$$ = (Node *) n;
+				}
+			| OPENXML '(' a_expr ',' a_expr ',' a_expr ')' WITH_table TABLE qualified_name opt_alias_clause
+				{
+					RangeTableFunc *n = makeNode(RangeTableFunc);
+					n->docexpr = $3;
+					n->rowexpr = $5;
+					n->location = @1;
+					n->namespaces = list_make1((Node *)$7);
+					n->columns = list_make1($11);
+					n->alias = $12;
+					$$ = (Node *) n;
+				}
+			| OPENXML '(' a_expr ',' a_expr ')' WITH_paren '(' openxml_column_list ')' opt_alias_clause
+				{
+					RangeTableFunc *n = makeNode(RangeTableFunc);
+					n->docexpr = $3;
+					n->rowexpr = $5;
+					n->location = @1;
+					n->columns = $9;
+					/* Default flag is 0 when not specified */
+					n->namespaces = list_make1(makeIntConst(0, @1));
+					n->alias = $11;
+					$$ = (Node *) n;
+				}
+			| OPENXML '(' a_expr ',' a_expr ',' a_expr ')' WITH_paren '(' openxml_column_list ')' opt_alias_clause
+				{
+					RangeTableFunc *n = makeNode(RangeTableFunc);
+					n->docexpr = $3;
+					n->rowexpr = $5;
+					n->columns = $11;
+					n->location = @1;
+					n->namespaces = list_make1((Node *)$7);
+					n->alias = $13;
+					$$ = (Node *) n;
+				}
+		;
+
+openxml_column_list: openxml_column_el                    { $$ = list_make1($1); }
+            | openxml_column_list ',' openxml_column_el    { $$ = lappend($1, $3); }
+        ;
+
+openxml_column_el:
+			ColId Typename
+				{
+					RangeTableFuncCol *fc = makeNode(RangeTableFuncCol);
+
+					fc->colname = $1;
+					fc->typeName = $2;
+					fc->colexpr = NULL;
+					fc->coldefexpr = NULL;
+					fc->location = @1;
+
+					$$ = (Node *) fc;
+				}	
+			| ColId Typename Sconst
+				{
+					RangeTableFuncCol *fc = makeNode(RangeTableFuncCol);
+
+					fc->colname = $1;
+					fc->typeName = $2;
+					fc->colexpr = (Node *) makeStringConst($3, @1);
+					fc->coldefexpr = NULL;
+					fc->location = @1;
+
+					$$ = (Node *) fc;
+				}	
 		;
 
 openjson_expr: OPENJSON '(' a_expr  ')' opt_alias_clause

contrib/babelfishpg_tsql/src/backend_parser/parser.c

@@ -266,6 +266,8 @@ pgtsql_base_yylex(YYSTYPE *lvalp, YYLTYPE * llocp, core_yyscan_t yyscanner)
 				case '(':
 					cur_token = WITH_paren;
 					break;
+				case TABLE:
+					cur_token = WITH_table;
 			}
 			break;
 		case '(':

contrib/babelfishpg_tsql/src/extendedproperty.c

@@ -71,7 +71,6 @@ static void init_scan_key(ScanKeyData *scanKey,
 static void sp_execextended_property(PG_FUNCTION_ARGS, ExtendedPropertyProc proc);
 static bool get_extended_property_from_tuple(Relation relation, HeapTuple tuple,
 											 Datum *values, bool *nulls, int len);
-static char* get_value_by_name_from_array(ArrayType *array, const char *name);
 
 static void
 init_scan_key(ScanKeyData *scanKey,
@@ -923,7 +922,7 @@ fn_listextendedproperty(PG_FUNCTION_ARGS)
 extern const char *ATTOPTION_BBF_ORIGINAL_TABLE_NAME;
 extern const char *ATTOPTION_BBF_ORIGINAL_NAME;
 
-static char*
+char*
 get_value_by_name_from_array(ArrayType *array, const char *name)
 {
 	int			i;

contrib/babelfishpg_tsql/src/extendedproperty.h

@@ -16,6 +16,7 @@ typedef enum ExtendedPropertyType
 } ExtendedPropertyType;
 
 extern const char *const ExtendedPropertyTypeNames[];
+extern char *get_value_by_name_from_array(ArrayType *array, const char *name);
 
 extern void delete_extended_property(int16 db_id,
                                      const char *type,