NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4097233

committed

Provide query source text when parsing a SQL-standard function body.

Without this, we lose error cursor positions, as shown in themodified regression test result.Discussion:https://postgr.es/m/2197698.1617984583@sss.pgh.pa.us

1 parent83efce7 commit4097233Copy full SHA for 4097233

File tree

2 files changed

+10

-2

lines changed

src
- backend/commands
  - functioncmds.c
- test/regress/expected
  - create_function_3.out

2 files changed

+10

-2

lines changed

`‎src/backend/commands/functioncmds.c`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -852,7 +852,9 @@ static void`
`852`	`852`	`interpret_AS_clause(OidlanguageOid,constchar*languageName,`
`853`	`853`	`charfuncname,Listas,Node*sql_body_in,`
`854`	`854`	`ListparameterTypes,ListinParameterNames,`
`855`		`-charprosrc_str_p,charprobin_str_p,Node**sql_body_out)`
	`855`	`+charprosrc_str_p,charprobin_str_p,`
	`856`	`+Node**sql_body_out,`
	`857`	`+constchar*queryString)`
`856`	`858`	`{`
`857`	`859`	`if (!sql_body_in&& !as)`
`858`	`860`	`ereport(ERROR,`
`@@ -929,6 +931,7 @@ interpret_AS_clause(Oid languageOid, const char *languageName,`
`929`	`931`	`Query*q;`
`930`	`932`	`ParseState*pstate=make_parsestate(NULL);`
`931`	`933`
	`934`	`+pstate->p_sourcetext=queryString;`
`932`	`935`	`sql_fn_parser_setup(pstate,pinfo);`
`933`	`936`	`q=transformStmt(pstate,stmt);`
`934`	`937`	`if (q->commandType==CMD_UTILITY)`
`@@ -947,13 +950,15 @@ interpret_AS_clause(Oid languageOid, const char *languageName,`
`947`	`950`	`Query*q;`
`948`	`951`	`ParseState*pstate=make_parsestate(NULL);`
`949`	`952`
	`953`	`+pstate->p_sourcetext=queryString;`
`950`	`954`	`sql_fn_parser_setup(pstate,pinfo);`
`951`	`955`	`q=transformStmt(pstate,sql_body_in);`
`952`	`956`	`if (q->commandType==CMD_UTILITY)`
`953`	`957`	`ereport(ERROR,`
`954`	`958`	`errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`955`	`959`	`errmsg("%s is not yet supported in unquoted SQL function body",`
`956`	`960`	`GetCommandTagName(CreateCommandTag(q->utilityStmt))));`
	`961`	`+free_parsestate(pstate);`
`957`	`962`
`958`	`963`	`sql_body_out= (Node)q;`
`959`	`964`	`}`
`@@ -1220,7 +1225,8 @@ CreateFunction(ParseState pstate, CreateFunctionStmt stmt)`
`1220`	`1225`
`1221`	`1226`	`interpret_AS_clause(languageOid,language,funcname,as_clause,stmt->sql_body,`
`1222`	`1227`	`parameterTypes_list,inParameterNames_list,`
`1223`		`-&prosrc_str,&probin_str,&prosqlbody);`
	`1228`	`+&prosrc_str,&probin_str,&prosqlbody,`
	`1229`	`+pstate->p_sourcetext);`
`1224`	`1230`
`1225`	`1231`	`/*`
`1226`	`1232`	`* Set default values for COST and ROWS depending on other parameters;`

`‎src/test/regress/expected/create_function_3.out`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,8 @@ CREATE FUNCTION functest_S_xx(x date) RETURNS boolean`
`295`	`295`	`LANGUAGE SQL`
`296`	`296`	`RETURN x > 1;`
`297`	`297`	`ERROR: operator does not exist: date > integer`
	`298`	`+LINE 3: RETURN x > 1;`
	`299`	`+ ^`
`298`	`300`	`HINT: No operator matches the given name and argument types. You might need to add explicit type casts.`
`299`	`301`	`-- tricky parsing`
`300`	`302`	`CREATE FUNCTION functest_S_15(x int) RETURNS boolean`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4097233

File tree

2 files changed

2 files changed

`‎src/backend/commands/functioncmds.c`

`‎src/test/regress/expected/create_function_3.out`

0 commit comments