Added pg endpoint tests, also did a fix as the PG endpoint runs without logical-DB, create_insert_exec_temp_table and pltsql_insert_exec_open_target_table

monk0707 · monk0707 · commit 8fef935a7c1c · 2026-06-23T12:44:35.000Z
now resolve the physical schema only when a DB context exists; with none
and no explicit schema, the target is referenced by its bare name and
resolved via search_path, matching the flush path and a plain INSERT.
The TDS path is unchanged.
diff --git a/contrib/babelfishpg_tsql/src/pl_exec.c b/contrib/babelfishpg_tsql/src/pl_exec.c
@@ -442,9 +442,9 @@ static pltsql_CastHashEntry *get_cast_hashentry(PLtsql_execstate *estate,
 												Oid srctype, int32 srctypmod,
 												Oid dsttype, int32 dsttypmod);
 static void exec_init_tuple_store(PLtsql_execstate *estate);
-void exec_set_found(PLtsql_execstate *estate, bool state);
+static void exec_set_found(PLtsql_execstate *estate, bool state);
 static void exec_set_fetch_status(PLtsql_execstate *estate, int status);
-void exec_set_rowcount(uint64 rowno);
+static void exec_set_rowcount(uint64 rowno);
 static void exec_set_error(PLtsql_execstate *estate, int error, int pg_error, bool error_mapping_failed);
 static void pltsql_create_econtext(PLtsql_execstate *estate);
 static void pltsql_commit_not_required_impl_txn(PLtsql_execstate *estate);
diff --git a/contrib/babelfishpg_tsql/src/pl_insert_exec.c b/contrib/babelfishpg_tsql/src/pl_insert_exec.c
@@ -74,9 +74,6 @@ static void insertexec_destroy(DestReceiver *self);
  */
 InsertExecContext *insert_exec_ctx = NULL;
 PLtsql_execstate *insert_exec_flush_estate = NULL;
-
-extern void exec_set_rowcount(uint64 rowno);
-extern void exec_set_found(PLtsql_execstate *estate, bool state);
 /*
  * The flush INSERT is routed through execute_batch (the top-level batch entry
  * point). It runs through the same econtext setup as a normal T-SQL batch.
@@ -268,19 +265,20 @@ pltsql_insert_exec_open_target_table(const char *target_table,
 	char			*schema_name = NULL;
 	char			*table_name = NULL;
 	char			*physical_schema = NULL;
+	char			*db = NULL;
 
 	if (target_table == NULL)
 		return;
 
 	table_name = pstrdup(target_table);
-	schema_name = resolve_insert_exec_schema_name(schema_name_in, db_name_in);
-	/*
-	 * Resolve against the target's database when a 3-part name
-	 * (db..table) was used; otherwise the current database.
-	 */
-	physical_schema = get_physical_schema_name(
-		(db_name_in != NULL) ? (char *) db_name_in : get_cur_db_name(),
-		schema_name);
+	db = (db_name_in != NULL) ? pstrdup(db_name_in) : get_cur_db_name();
+	if (db != NULL && db[0] != '\0')
+	{
+		schema_name = resolve_insert_exec_schema_name(schema_name_in, db);
+		physical_schema = get_physical_schema_name(db, schema_name);
+	}
+	if (db != NULL)
+		pfree(db);
 
 	/* Create RangeVar and get the relation OID */
 	rv = makeRangeVar(physical_schema, table_name, -1);
@@ -451,14 +449,25 @@ create_insert_exec_temp_table(const char *target_table, const char *column_list,
 	 */
 	if (!(target_table[0] == '#' || target_table[0] == '@'))
 	{
-		char *sname = resolve_insert_exec_schema_name(schema_name_in, db_name_in);
-
-		physical_schema = get_physical_schema_name(
-			(db_name_in != NULL) ? (char *) db_name_in : get_cur_db_name(), sname);
-		pfree(sname);
-		if (physical_schema == NULL)
-			elog(ERROR, "INSERT EXEC failed due to unresolvable schema for target table \"%s\"",
-				target_table);
+		char *db = (db_name_in != NULL) ? pstrdup(db_name_in) : get_cur_db_name();
+		/*
+		 * On the PostgreSQL endpoint a T-SQL procedure runs without logical
+		 * database context (fn_dbid is InvalidDbid for non-TDS connections),
+		 * so the current database name can be empty. With no DB context, leave
+		 * physical_schema NULL and reference the target by its bare name, so
+		 * search_path resolves it - exactly as a plain INSERT does.
+		 */
+		if (db != NULL && db[0] != '\0')
+		{
+			char *sname = resolve_insert_exec_schema_name(schema_name_in, db);
+			physical_schema = get_physical_schema_name(db, sname);
+			pfree(sname);
+			if (physical_schema == NULL)
+				elog(ERROR, "INSERT EXEC failed due to unresolvable schema for target table \"%s\"",
+					target_table);
+		}
+		if (db != NULL)
+			pfree(db);
 	}
 
 	/*
@@ -621,8 +630,6 @@ flush_insert_exec_temp_table(PLtsql_execstate *estate, const char *target_schema
 	 * Report rows-affected from the DestReceiver's captured-row count
 	 */
 	estate->eval_processed = insert_exec_ctx->rows_processed;
-	exec_set_rowcount(insert_exec_ctx->rows_processed);
-	exec_set_found(estate, insert_exec_ctx->rows_processed != 0);
 }
 
 /*
diff --git a/test/JDBC/expected/BABEL-INSERT-EXEC-pg-endpoint.out b/test/JDBC/expected/BABEL-INSERT-EXEC-pg-endpoint.out
@@ -0,0 +1,121 @@
+
+-- tsql
+-- This test verifies INSERT EXEC works when the enclosing T-SQL procedure is
+-- created on the Babelfish (TDS) endpoint but invoked from the PostgreSQL
+-- endpoint. The flush goes through execute_batch regardless of the entry point,
+-- so the buffered result set must still land in the target table.
+CREATE TABLE babel_ie_pg_src (id INT, val VARCHAR(20));
+GO
+INSERT INTO babel_ie_pg_src VALUES (1, 'alpha'), (2, 'beta'), (3, 'gamma');
+GO
+~~ROW COUNT: 3~~
+
+
+CREATE TABLE babel_ie_pg_dst (id INT, val VARCHAR(20));
+GO
+
+-- Source procedure produces a result set
+CREATE PROCEDURE babel_ie_pg_source AS
+BEGIN
+    SELECT id, val FROM babel_ie_pg_src ORDER BY id;
+END
+GO
+
+-- Wrapper procedure buffers the result set into the target via INSERT EXEC
+CREATE PROCEDURE babel_ie_pg_wrapper AS
+BEGIN
+    INSERT INTO babel_ie_pg_dst EXEC babel_ie_pg_source;
+END
+GO
+
+-- Call the wrapper once from the TDS endpoint as a baseline
+EXEC babel_ie_pg_wrapper;
+GO
+~~ROW COUNT: 3~~
+
+SELECT id, val FROM babel_ie_pg_dst ORDER BY id;
+GO
+~~START~~
+int#!#varchar
+1#!#alpha
+2#!#beta
+3#!#gamma
+~~END~~
+
+
+-- Empty the target so the PG-endpoint call starts clean
+DELETE FROM babel_ie_pg_dst;
+GO
+~~ROW COUNT: 3~~
+
+
+-- psql     currentSchema=master_dbo,public
+-- Invoke the T-SQL procedure from the PostgreSQL endpoint
+CALL master_dbo.babel_ie_pg_wrapper();
+GO
+
+-- Rows buffered by INSERT EXEC must be present in the target table
+SELECT id, val FROM master_dbo.babel_ie_pg_dst ORDER BY id;
+GO
+~~START~~
+int4#!#"sys"."varchar"
+1#!#alpha
+2#!#beta
+3#!#gamma
+~~END~~
+
+
+-- Clear the target again before the transaction cases
+DELETE FROM master_dbo.babel_ie_pg_dst;
+GO
+~~ROW COUNT: 3~~
+
+
+-- INSERT EXEC inside an explicit committed transaction on the PG endpoint:
+-- the buffered rows must persist after COMMIT.
+BEGIN;
+GO
+CALL master_dbo.babel_ie_pg_wrapper();
+GO
+COMMIT;
+GO
+SELECT id, val FROM master_dbo.babel_ie_pg_dst ORDER BY id;
+GO
+~~START~~
+int4#!#"sys"."varchar"
+1#!#alpha
+2#!#beta
+3#!#gamma
+~~END~~
+
+
+-- Clear the target before the rollback case
+DELETE FROM master_dbo.babel_ie_pg_dst;
+GO
+~~ROW COUNT: 3~~
+
+
+-- INSERT EXEC inside an explicit transaction that is rolled back on the PG
+-- endpoint: the buffered rows must be discarded, leaving the target empty.
+BEGIN;
+GO
+CALL master_dbo.babel_ie_pg_wrapper();
+GO
+ROLLBACK;
+GO
+SELECT id, val FROM master_dbo.babel_ie_pg_dst ORDER BY id;
+GO
+~~START~~
+int4#!#"sys"."varchar"
+~~END~~
+
+
+-- tsql
+DROP PROCEDURE babel_ie_pg_wrapper;
+GO
+DROP PROCEDURE babel_ie_pg_source;
+GO
+DROP TABLE babel_ie_pg_dst;
+GO
+DROP TABLE babel_ie_pg_src;
+GO
diff --git a/test/JDBC/expected/temp_table_rollback-vu-prepare.out b/test/JDBC/expected/temp_table_rollback-vu-prepare.out
@@ -202,7 +202,7 @@ BEGIN
     CREATE TABLE #proc_create(id int, name varchar(30))
     INSERT INTO #proc_create VALUES (1, 'first')
     INSERT INTO #proc_create VALUES (2, 'second')
-    SELECT * FROM #proc_create
+    SELECT * FROM #proc_create ORDER BY id
     DROP TABLE #proc_create
 END
 GO
diff --git a/test/JDBC/expected/temp_table_rollback_isolation_read_uncommitted.out b/test/JDBC/expected/temp_table_rollback_isolation_read_uncommitted.out
@@ -204,7 +204,7 @@ BEGIN
     CREATE TABLE #proc_create(id int, name varchar(30))
     INSERT INTO #proc_create VALUES (1, 'first')
     INSERT INTO #proc_create VALUES (2, 'second')
-    SELECT * FROM #proc_create
+    SELECT * FROM #proc_create ORDER BY id
     DROP TABLE #proc_create
 END
 GO
diff --git a/test/JDBC/expected/temp_table_rollback_isolation_snapshot.out b/test/JDBC/expected/temp_table_rollback_isolation_snapshot.out
@@ -204,7 +204,7 @@ BEGIN
     CREATE TABLE #proc_create(id int, name varchar(30))
     INSERT INTO #proc_create VALUES (1, 'first')
     INSERT INTO #proc_create VALUES (2, 'second')
-    SELECT * FROM #proc_create
+    SELECT * FROM #proc_create ORDER BY id
     DROP TABLE #proc_create
 END
 GO
diff --git a/test/JDBC/expected/temp_table_rollback_xact_abort_on.out b/test/JDBC/expected/temp_table_rollback_xact_abort_on.out
@@ -204,7 +204,7 @@ BEGIN
     CREATE TABLE #proc_create(id int, name varchar(30))
     INSERT INTO #proc_create VALUES (1, 'first')
     INSERT INTO #proc_create VALUES (2, 'second')
-    SELECT * FROM #proc_create
+    SELECT * FROM #proc_create ORDER BY id
     DROP TABLE #proc_create
 END
 GO
diff --git a/test/JDBC/input/BABEL-INSERT-EXEC-pg-endpoint.mix b/test/JDBC/input/BABEL-INSERT-EXEC-pg-endpoint.mix
@@ -0,0 +1,86 @@
+-- This test verifies INSERT EXEC works when the enclosing T-SQL procedure is
+-- created on the Babelfish (TDS) endpoint but invoked from the PostgreSQL
+-- endpoint. The flush goes through execute_batch regardless of the entry point,
+-- so the buffered result set must still land in the target table.
+
+-- tsql
+CREATE TABLE babel_ie_pg_src (id INT, val VARCHAR(20));
+GO
+INSERT INTO babel_ie_pg_src VALUES (1, 'alpha'), (2, 'beta'), (3, 'gamma');
+GO
+
+CREATE TABLE babel_ie_pg_dst (id INT, val VARCHAR(20));
+GO
+
+-- Source procedure produces a result set
+CREATE PROCEDURE babel_ie_pg_source AS
+BEGIN
+    SELECT id, val FROM babel_ie_pg_src ORDER BY id;
+END
+GO
+
+-- Wrapper procedure buffers the result set into the target via INSERT EXEC
+CREATE PROCEDURE babel_ie_pg_wrapper AS
+BEGIN
+    INSERT INTO babel_ie_pg_dst EXEC babel_ie_pg_source;
+END
+GO
+
+-- Call the wrapper once from the TDS endpoint as a baseline
+EXEC babel_ie_pg_wrapper;
+GO
+SELECT id, val FROM babel_ie_pg_dst ORDER BY id;
+GO
+
+-- Empty the target so the PG-endpoint call starts clean
+DELETE FROM babel_ie_pg_dst;
+GO
+
+-- psql     currentSchema=master_dbo,public
+-- Invoke the T-SQL procedure from the PostgreSQL endpoint
+CALL master_dbo.babel_ie_pg_wrapper();
+GO
+
+-- Rows buffered by INSERT EXEC must be present in the target table
+SELECT id, val FROM master_dbo.babel_ie_pg_dst ORDER BY id;
+GO
+
+-- Clear the target again before the transaction cases
+DELETE FROM master_dbo.babel_ie_pg_dst;
+GO
+
+-- INSERT EXEC inside an explicit committed transaction on the PG endpoint:
+-- the buffered rows must persist after COMMIT.
+BEGIN;
+GO
+CALL master_dbo.babel_ie_pg_wrapper();
+GO
+COMMIT;
+GO
+SELECT id, val FROM master_dbo.babel_ie_pg_dst ORDER BY id;
+GO
+
+-- Clear the target before the rollback case
+DELETE FROM master_dbo.babel_ie_pg_dst;
+GO
+
+-- INSERT EXEC inside an explicit transaction that is rolled back on the PG
+-- endpoint: the buffered rows must be discarded, leaving the target empty.
+BEGIN;
+GO
+CALL master_dbo.babel_ie_pg_wrapper();
+GO
+ROLLBACK;
+GO
+SELECT id, val FROM master_dbo.babel_ie_pg_dst ORDER BY id;
+GO
+
+-- tsql
+DROP PROCEDURE babel_ie_pg_wrapper;
+GO
+DROP PROCEDURE babel_ie_pg_source;
+GO
+DROP TABLE babel_ie_pg_dst;
+GO
+DROP TABLE babel_ie_pg_src;
+GO
diff --git a/test/JDBC/input/temp_tables/temp_table_rollback-vu-prepare.sql b/test/JDBC/input/temp_tables/temp_table_rollback-vu-prepare.sql
@@ -202,7 +202,7 @@ BEGIN
     CREATE TABLE #proc_create(id int, name varchar(30))
     INSERT INTO #proc_create VALUES (1, 'first')
     INSERT INTO #proc_create VALUES (2, 'second')
-    SELECT * FROM #proc_create
+    SELECT * FROM #proc_create ORDER BY id
     DROP TABLE #proc_create
 END
 GO
