Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1d6b681

Browse files
committed
Mark 3rd argument of validate_tupdesc_compat() for translation, instead of
marking up each instance separately.
1 parentb06abb7 commit1d6b681

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

‎src/pl/plpgsql/src/nls.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# $PostgreSQL: pgsql/src/pl/plpgsql/src/nls.mk,v 1.3 2009/02/1709:24:57 petere Exp $
1+
# $PostgreSQL: pgsql/src/pl/plpgsql/src/nls.mk,v 1.4 2009/02/1712:51:59 petere Exp $
22
CATALOG_NAME:= plpgsql
33
AVAIL_LANGUAGES:= es
44
GETTEXT_FILES:= pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scan.c
5-
GETTEXT_TRIGGERS:= _ errmsg errdetail errdetail_log errhint errcontext yyerror
5+
GETTEXT_TRIGGERS:= _ errmsg errdetail errdetail_log errhint errcontextvalidate_tupdesc_compat:3yyerror
66

77
.PHONY: gettext-files
88
gettext-files: distprep

‎src/pl/plpgsql/src/pl_exec.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.232 2009/02/05 15:25:49 momjian Exp $
11+
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.233 2009/02/17 12:51:59 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -387,8 +387,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo)
387387
caseTYPEFUNC_COMPOSITE:
388388
/* got the expected result rowtype, now check it */
389389
validate_tupdesc_compat(tupdesc,estate.rettupdesc,
390-
gettext_noop("returned record type does "
391-
"not match expected record type"));
390+
"returned record type does not match expected record type");
392391
break;
393392
caseTYPEFUNC_RECORD:
394393

@@ -707,8 +706,7 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
707706
{
708707
validate_tupdesc_compat(trigdata->tg_relation->rd_att,
709708
estate.rettupdesc,
710-
gettext_noop("returned tuple structure does "
711-
"not match table of trigger event"));
709+
"returned tuple structure does not match table of trigger event");
712710
/* Copy tuple to upper executor memory */
713711
rettup=SPI_copytuple((HeapTuple)DatumGetPointer(estate.retval));
714712
}
@@ -2201,8 +2199,7 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
22012199
errdetail("The tuple structure of a not-yet-assigned"
22022200
" record is indeterminate.")));
22032201
validate_tupdesc_compat(tupdesc,rec->tupdesc,
2204-
gettext_noop("wrong record type supplied "
2205-
"in RETURN NEXT"));
2202+
"wrong record type supplied in RETURN NEXT");
22062203
tuple=rec->tup;
22072204
}
22082205
break;
@@ -2310,8 +2307,7 @@ exec_stmt_return_query(PLpgSQL_execstate *estate,
23102307
}
23112308

23122309
validate_tupdesc_compat(estate->rettupdesc,portal->tupDesc,
2313-
gettext_noop("structure of query does not match "
2314-
"function result type"));
2310+
"structure of query does not match function result type");
23152311

23162312
while (true)
23172313
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp