Complete Insert Exec Implementation

Author: monk0707

.github/scripts/scan-warnings.sh

@@ -49,8 +49,8 @@ if [[ "$SNAPSHOT_ACTIVE_COUNT" -ne 44 ]]; then
     ERROR_FOUND=true
 fi
 
-if [[ "$LEAK_COUNT" -ne 416 ]]; then
-    echo "Error: Expected 416 leak warnings, but found $LEAK_COUNT"
+if [[ "$LEAK_COUNT" -ne 29 ]]; then
+    echo "Error: Expected 29 leak warnings, but found $LEAK_COUNT"
     ERROR_FOUND=true
 fi
 

contrib/babelfishpg_tds/src/backend/tds/tdsresponse.c

@@ -2730,20 +2730,34 @@ StatementEnd_Internal(PLtsql_execstate *estate, PLtsql_stmt *stmt, bool error)
 								 * is inside the procedure of an INSERT-EXEC,
 								 * or if the INSERT itself is an INSERT-EXEC
 								 * and it just returned error.
+								 *
+								 * INSERT EXEC detection covers both paths: the
+								 * new path uses the global context
+								 * (pltsql_insert_exec_active), the legacy path
+								 * uses the per-estate flag (estate->insert_exec).
 								 */
-								row_count_valid = !estate->insert_exec &&
+								row_count_valid =
+									!(estate->insert_exec ||
+									  (pltsql_plugin_handler_ptr->pltsql_insert_exec_active &&
+									   pltsql_plugin_handler_ptr->pltsql_insert_exec_active())) &&
 									!(markErrorFlag &&
 									  ((PLtsql_stmt_execsql *) stmt)->insert_exec);
 							}
 							else if (plansource->commandTag == CMDTAG_UPDATE)
 							{
 								command_type = TDS_CMD_UPDATE;
-								row_count_valid = !estate->insert_exec;
+								row_count_valid =
+									!(estate->insert_exec ||
+									  (pltsql_plugin_handler_ptr->pltsql_insert_exec_active &&
+									   pltsql_plugin_handler_ptr->pltsql_insert_exec_active()));
 							}
 							else if (plansource->commandTag == CMDTAG_DELETE)
 							{
 								command_type = TDS_CMD_DELETE;
-								row_count_valid = !estate->insert_exec;
+								row_count_valid =
+									!(estate->insert_exec ||
+									  (pltsql_plugin_handler_ptr->pltsql_insert_exec_active &&
+									   pltsql_plugin_handler_ptr->pltsql_insert_exec_active()));
 							}
 
 							/*
@@ -2753,7 +2767,10 @@ StatementEnd_Internal(PLtsql_execstate *estate, PLtsql_stmt *stmt, bool error)
 							else if (plansource->commandTag == CMDTAG_SELECT)
 							{
 								command_type = TDS_CMD_SELECT;
-								row_count_valid = !estate->insert_exec;
+								row_count_valid =
+									!(estate->insert_exec ||
+									  (pltsql_plugin_handler_ptr->pltsql_insert_exec_active &&
+									   pltsql_plugin_handler_ptr->pltsql_insert_exec_active()));
 							}
 						}
 					}
@@ -2776,6 +2793,27 @@ StatementEnd_Internal(PLtsql_execstate *estate, PLtsql_stmt *stmt, bool error)
 			{
 				is_proc = true;
 				command_type = TDS_CMD_EXECUTE;
+				/*
+				 * For INSERT EXEC, report the row count set in
+				 * flush_insert_exec_temp_table(). Suppress it when an error is
+				 * pending: the rows are rolled back, no count is sent to the
+				 * client, and a counted DONE left pending here would otherwise
+				 * carry a stale count into the following error DONE token.
+				 */
+				if (!markErrorFlag &&
+					stmt->cmd_type == PLTSQL_STMT_EXEC &&
+					((PLtsql_stmt_exec *) stmt)->insert_exec != NULL)
+				{
+					command_type = TDS_CMD_INSERT;
+					row_count_valid = true;
+				}
+				else if (!markErrorFlag &&
+					stmt->cmd_type == PLTSQL_STMT_EXEC_BATCH &&
+					((PLtsql_stmt_exec_batch *) stmt)->insert_exec != NULL)
+				{
+					command_type = TDS_CMD_INSERT;
+					row_count_valid = true;
+				}
 			}
 			break;
 		default:

contrib/babelfishpg_tsql/src/guc.c

@@ -59,7 +59,7 @@ bool		pltsql_disable_batch_auto_commit = false;
 bool		pltsql_disable_internal_savepoint = false;
 bool		pltsql_disable_txn_in_triggers = false;
 bool		pltsql_recursive_triggers = false;
-bool		pltsql_enable_new_insert_exec = false;
+bool		pltsql_enable_new_insert_exec = true;
 bool		pltsql_noexec = false;
 bool		pltsql_showplan_all = false;
 bool		pltsql_showplan_text = false;
@@ -957,7 +957,7 @@ define_custom_variables(void)
 							 gettext_noop("Enables INSERT...EXEC redesign code path"),
 							 NULL,
 							 &pltsql_enable_new_insert_exec,
-							 false,
+							 true,
 							 PGC_SUSET,
 							 GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE | GUC_DISALLOW_IN_AUTO_FILE,
 							 NULL, NULL, NULL);

contrib/babelfishpg_tsql/src/hooks.c

@@ -3612,6 +3612,17 @@ bbf_object_access_hook(ObjectAccessType access, Oid classId, Oid objectId, int s
 			/* Call view dependency handling function */
 			handle_bbf_view_binding_on_object_drop(&obj, false);
 		}
+
+		/*
+		 * Detect DROP of the INSERT EXEC target table.
+		 * If the executed procedure drops the target table, we need to fail
+		 * the INSERT EXEC to prevent errors during flush.
+		 */
+		if (OidIsValid(insert_exec_ctx.target_rel_oid) &&
+			objectId == insert_exec_ctx.target_rel_oid)
+		{
+			insert_exec_ctx.is_target_relation_modified = true;
+		}
 	}
 	if (access == OAT_DROP && classId == ProcedureRelationId)
 	{

contrib/babelfishpg_tsql/src/iterative_exec.c

@@ -1333,6 +1333,7 @@ dispatch_stmt_handle_error(PLtsql_execstate *estate,
 		if (!pltsql_implicit_transactions &&
 			is_batch_command(stmt) &&
 			!is_part_of_pltsql_trigger(estate) &&
+			!pltsql_insert_exec_active() &&
 			before_tran_count != NestedTranCount)
 			ereport(ERROR,
 					(errcode(ERRCODE_T_R_INTEGRITY_CONSTRAINT_VIOLATION),
@@ -1370,7 +1371,7 @@ dispatch_stmt_handle_error(PLtsql_execstate *estate,
 			}
 			else if (!IsTransactionBlockActive())
 			{
-				if (is_part_of_pltsql_trycatch_block(estate))
+				if (is_part_of_pltsql_trycatch_block(estate) && !pltsql_insert_exec_active())
 				{
 					HOLD_INTERRUPTS();
 					elog(DEBUG1, "TSQL TXN PG semantics : Rollback current transaction");
@@ -1603,6 +1604,21 @@ exec_stmt_iterative(PLtsql_execstate *estate, ExecCodes *exec_codes, ExecConfig_
 					estate->cur_error->severity = exec_state_call_stack->error_data.error_severity;
 					estate->cur_error->state = exec_state_call_stack->error_data.error_state;
 
+					/*
+					 * If a TRY-CATCH is inside the executed procedure, INSERT
+					 * EXEC is still in progress. Re-throw column mismatch errors
+					 * to roll back all rows. Other errors (e.g., division by
+					 * zero) are caught by TRY-CATCH, preserving rows inserted
+					 * before the error.
+					 */
+					if (!pltsql_insert_exec_error_at_trycatch_level() &&
+						pltsql_insert_exec_active())
+					{
+						if (estate->cur_error->error != NULL &&
+							estate->cur_error->error->sqlerrcode == ERRCODE_DATATYPE_MISMATCH)
+							ReThrowError(estate->cur_error->error);
+					}
+
 					/* Goto error handling blocks */
 					*pc = err_handler_pc - 1;	/* same as how goto handles PC */