modify RUN_AS_PSQL macro for unified dialect handling

amazon-aurora · Feb 5, 2025 · b82024a · b82024a
1 parent 836bcb2
commit b82024a
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
@@ -96,27 +96,27 @@
 #define RUN_AS_PSQL(qplan)  																				\
 do																											\
 {																											\
-	bool reset_dialect = (sql_dialect == SQL_DIALECT_TSQL);                                         		\
-	int sql_dialect_old = sql_dialect;																		\
-	void *newextra = NULL;																					\
-	if (reset_dialect)																						\
+	if (sql_dialect == SQL_DIALECT_TSQL)																	\
 	{																										\
+		int sql_dialect_old = sql_dialect;																	\
+		void *newextra = NULL;																				\
 		sql_dialect = SQL_DIALECT_PG;																		\
 		assign_sql_dialect(sql_dialect, newextra);															\
-	}																										\
-	PG_TRY();																								\
-	{																										\
-		qplan;																								\
-	}																										\
-	PG_FINALLY();																							\
-	{																										\
-		if (reset_dialect)																					\
+		PG_TRY();																							\
+		{																									\
+			qplan;																							\
+		}																									\
+		PG_FINALLY();																						\
 		{																									\
 			sql_dialect = sql_dialect_old;																	\
 			assign_sql_dialect(sql_dialect, newextra);														\
 		}																									\
+		PG_END_TRY();																						\
+	}																										\
+	else																									\
+	{																										\
+		qplan;																								\
 	}																										\
-	PG_END_TRY();																							\
 } while (0)