提交 d7a7e6e9 编写于 作者: A Ashwin Agrawal

Fix orafce for error-reporting routines interface change

Upstream made these changes for PostgreSQL 13. In GPDB, we have these
changes as part of PostgreSQL 12 itself, as we cherry-picked the
error-reporting interface changes.
上级 060c2655
#line 1 "sqlscan.c"
#line 2 "sqlscan.c"
#line 3 "sqlscan.c"
#line 4 "sqlscan.c"
#define YY_INT_ALIGNED short int
......@@ -1004,7 +1004,7 @@ static unsigned char unescape_single_char(unsigned char c);
#define _pg_mbstrlen_with_len(buf,loc) pg_mbstrlen_with_len(buf,loc)
#endif
#line 1007 "sqlscan.c"
#line 1008 "sqlscan.c"
#define YY_NO_INPUT 1
/*
* OK, here is a short description of lex/flex rules behavior.
......@@ -1132,7 +1132,7 @@ static unsigned char unescape_single_char(unsigned char c);
* Note that xcstart must appear before operator, as explained above!
* Also whitespace (comment) must appear before operator.
*/
#line 1135 "sqlscan.c"
#line 1136 "sqlscan.c"
#define INITIAL 0
#define xb 1
......@@ -1357,7 +1357,7 @@ YY_DECL
#line 308 "sqlscan.l"
#line 1360 "sqlscan.c"
#line 1361 "sqlscan.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
......@@ -2176,7 +2176,7 @@ YY_RULE_SETUP
#line 862 "sqlscan.l"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
#line 2179 "sqlscan.c"
#line 2180 "sqlscan.c"
case YY_END_OF_BUFFER:
{
......@@ -3165,7 +3165,7 @@ lexer_errposition(void)
pos = _pg_mbstrlen_with_len(scanbuf, orafce_sql_yylval.val.lloc) + 1;
/* And pass it to the ereport mechanism */
#if PG_VERSION_NUM >= 130000
#if PG_VERSION_NUM >= 120000
errposition(pos);
......
......@@ -880,7 +880,7 @@ lexer_errposition(void)
pos = _pg_mbstrlen_with_len(scanbuf, orafce_sql_yylval.val.lloc) + 1;
/* And pass it to the ereport mechanism */
#if PG_VERSION_NUM >= 130000
#if PG_VERSION_NUM >= 120000
errposition(pos);
......
......@@ -44,7 +44,7 @@ dbms_utility_format_call_stack(char mode)
StringInfo sinfo;
#if PG_VERSION_NUM >= 130000
#if PG_VERSION_NUM >= 120000
errstart(ERROR, TEXTDOMAIN);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册