fix insert exec with type cast (babelfish-for-postgresql#256)

Previously insert exec implement didn't consider the type cast during execution, this fix has add a implicit type cast between insert execution and exec execution if the type is mismatched. Task: BABEL-2999, BABEL-4426 Signed-off-by: Zhibai Song <szh@amazon.com>
amazon-aurora · Nov 16, 2023 · d3ff0bc · d3ff0bc
1 parent 3377d2d
commit d3ff0bc
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 2 deletions.
diff --git a/src/backend/access/common/attmap.c b/src/backend/access/common/attmap.c
@@ -26,6 +26,7 @@
 #include "access/htup_details.h"
 #include "utils/builtins.h"
 
+called_from_tsql_insert_exec_hook_type called_from_tsql_insert_exec_hook = NULL;
 
 static bool check_attrmap_match(TupleDesc indesc,
 								TupleDesc outdesc,
@@ -114,8 +115,10 @@ build_attrmap_by_position(TupleDesc indesc,
 			nincols++;
 
 			/* Found matching column, now check type */
-			if (atttypid != att->atttypid ||
-				(atttypmod != att->atttypmod && atttypmod >= 0))
+			/* skip check type if it's tsql insert exec */
+			if ((atttypid != att->atttypid ||
+				(atttypmod != att->atttypmod && atttypmod >= 0)) &&
+				!(called_from_tsql_insert_exec_hook && called_from_tsql_insert_exec_hook()))
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
 						 errmsg_internal("%s", _(msg)),
@@ -303,6 +306,14 @@ check_attrmap_match(TupleDesc indesc,
 		if (inatt->atthasmissing)
 			return false;
 
+		/**
+		 * in tsql insert exec, we need a cast
+		 */
+		if (called_from_tsql_insert_exec_hook && called_from_tsql_insert_exec_hook()
+		 	&& (inatt->atttypid != outatt->atttypid ||
+			inatt->atttypmod != outatt->atttypmod))
+			return false;
+
 		if (attrMap->attnums[i] == (i + 1))
 			continue;
 

diff --git a/src/backend/access/common/tupconvert.c b/src/backend/access/common/tupconvert.c
@@ -21,6 +21,7 @@
 #include "access/tupconvert.h"
 #include "executor/tuptable.h"
 
+exec_tsql_cast_value_hook_type exec_tsql_cast_value_hook = NULL;
 
 /*
  * The conversion setup routines have the following common API:
@@ -160,6 +161,35 @@ execute_attr_map_tuple(HeapTuple tuple, TupleConversionMap *map)
 	{
 		int			j = attrMap->attnums[i];
 
+		/**
+		 * if it's tsql insert exec, we'll consider value cast
+		 */
+		if (called_from_tsql_insert_exec_hook && called_from_tsql_insert_exec_hook())
+		{
+			Oid        intypeid;
+			Oid        outtypeid;
+			int        inttypemod;
+			int        outtypemod;
+
+			Form_pg_attribute outatt = TupleDescAttr(map->outdesc, i);
+			Form_pg_attribute inatt = TupleDescAttr(map->indesc, i);
+
+			outtypeid = outatt->atttypid;
+			outtypemod = outatt->atttypmod;
+			intypeid = inatt->atttypid;
+			inttypemod = inatt->atttypmod;
+
+			if (intypeid != outtypeid ||
+				inttypemod != outtypemod)
+			{
+				outisnull[i] = inisnull[j];
+				outvalues[i] = exec_tsql_cast_value_hook(
+					invalues[j], &outisnull[i],
+					intypeid, inttypemod,
+					outtypeid, outtypemod);
+				continue;
+			}
+		}
 		outvalues[i] = invalues[j];
 		outisnull[i] = inisnull[j];
 	}

diff --git a/src/include/access/attmap.h b/src/include/access/attmap.h
@@ -48,5 +48,7 @@ extern AttrMap *build_attrmap_by_name_if_req(TupleDesc indesc,
 extern AttrMap *build_attrmap_by_position(TupleDesc indesc,
 										  TupleDesc outdesc,
 										  const char *msg);
+typedef bool (*called_from_tsql_insert_exec_hook_type)();
+extern PGDLLIMPORT called_from_tsql_insert_exec_hook_type called_from_tsql_insert_exec_hook;
 
 #endif							/* ATTMAP_H */
diff --git a/src/include/access/tupconvert.h b/src/include/access/tupconvert.h
@@ -48,4 +48,10 @@ extern Bitmapset *execute_attr_map_cols(AttrMap *attrMap, Bitmapset *inbitmap);
 
 extern void free_conversion_map(TupleConversionMap *map);
 
+typedef Datum (*exec_tsql_cast_value_hook_type)(Datum value, bool *isnull,
+							 Oid valtype, int32 valtypmod,
+							 Oid reqtype, int32 reqtypmod);
+extern PGDLLIMPORT exec_tsql_cast_value_hook_type exec_tsql_cast_value_hook;
+
+
 #endif							/* TUPCONVERT_H */