Remove error context handling from string literal hook

Signed-off-by: Alex Kasko <[email protected]>
wiltondb · Jun 28, 2024 · 8ce8520 · 8ce8520
1 parent 88c8871
commit 8ce8520
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/contrib/babelfishpg_tsql/src/pltsql_coerce.c b/contrib/babelfishpg_tsql/src/pltsql_coerce.c
@@ -1016,7 +1016,7 @@ starts_with(const char *text, const char *pat)
 }
 
 static Node *
-tsql_coerce_string_literal_hook(ParseCallbackState *pcbstate, Oid targetTypeId,
+tsql_coerce_string_literal_hook(Oid targetTypeId,
 								int32 targetTypeMod, int32 baseTypeMod,
 								Const *newcon, char *value,
 								CoercionContext ccontext, CoercionForm cformat,
@@ -1149,8 +1149,6 @@ tsql_coerce_string_literal_hook(ParseCallbackState *pcbstate, Oid targetTypeId,
 														false));
 							errFunc = makeFuncExpr(errFuncOid, targetTypeId, args, 0, 0, COERCE_EXPLICIT_CALL);
 
-							cancel_parser_errposition_callback(pcbstate);
-
 							result = (Node *) errFunc;
 
 							/* If target is a domain, apply constraints. */

diff --git a/test/JDBC/expected/babel_726.out b/test/JDBC/expected/babel_726.out
@@ -638,6 +638,20 @@ x
 ~~END~~
 
 
+-- check that duplicate view with varbinary cast does not cause crash (#2693)
+create view babel_726_v1 as select cast('a' as varbinary)
+go
+
+create view babel_726_v1 as select cast('a' as varbinary)
+go
+~~ERROR (Code: 2714)~~
+
+~~ERROR (Message: relation "babel_726_v1" already exists)~~
+
+
+drop view babel_726_v1
+go
+
 drop table babel_726_t1
 go
 

diff --git a/test/JDBC/input/datatypes/babel_726.sql b/test/JDBC/input/datatypes/babel_726.sql
@@ -290,6 +290,16 @@ go
 select coalesce(CAST('x'AS VARBINARY), CAST('x' AS NVARCHAR(4000)), 'x')
 go
 
+-- check that duplicate view with varbinary cast does not cause crash (#2693)
+create view babel_726_v1 as select cast('a' as varbinary)
+go
+
+create view babel_726_v1 as select cast('a' as varbinary)
+go
+
+drop view babel_726_v1
+go
+
 drop table babel_726_t1
 go