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

Commit078aaf7

Browse files
committed
Improve parser error location for cases where an INSERT or UPDATE command
supplies an expression that can't be coerced to the target column type.The code previously attempted to point at the target column name, whichdoesn't work at all in an INSERT with omitted column name list, and isalso not remarkably helpful when the problem is buried somewhere in along INSERT-multi-VALUES command. Make it point at the failed expressioninstead.
1 parenta6586c0 commit078aaf7

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

‎src/backend/parser/analyze.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
1818
* Portions Copyright (c) 1994, Regents of the University of California
1919
*
20-
*$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.381 2008/10/06 15:15:22 tgl Exp $
20+
*$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.382 2008/10/07 01:47:54 tgl Exp $
2121
*
2222
*-------------------------------------------------------------------------
2323
*/
@@ -426,11 +426,15 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
426426
exprType((Node*)tle->expr)==UNKNOWNOID)
427427
expr=tle->expr;
428428
else
429-
expr= (Expr*)makeVar(rtr->rtindex,
430-
tle->resno,
431-
exprType((Node*)tle->expr),
432-
exprTypmod((Node*)tle->expr),
433-
0);
429+
{
430+
Var*var=makeVar(rtr->rtindex,
431+
tle->resno,
432+
exprType((Node*)tle->expr),
433+
exprTypmod((Node*)tle->expr),
434+
0);
435+
var->location=exprLocation((Node*)tle->expr);
436+
expr= (Expr*)var;
437+
}
434438
exprList=lappend(exprList,expr);
435439
}
436440

‎src/backend/parser/parse_target.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.167 2008/10/06 15:15:22 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.168 2008/10/07 01:47:55 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -343,6 +343,11 @@ markTargetListOrigin(ParseState *pstate, TargetEntry *tle,
343343
* locationerror cursor position for the target column, or -1
344344
*
345345
* Returns the modified expression.
346+
*
347+
* Note: location points at the target column name (SET target or INSERT
348+
* column name list entry), and must therefore be -1 in an INSERT that
349+
* omits the column name list. So we should usually prefer to use
350+
* exprLocation(expr) for errors that can happen in a default INSERT.
346351
*/
347352
Expr*
348353
transformAssignedExpr(ParseState*pstate,
@@ -446,9 +451,11 @@ transformAssignedExpr(ParseState *pstate,
446451
* For normal non-qualified target column, do type checking and
447452
* coercion.
448453
*/
454+
Node*orig_expr= (Node*)expr;
455+
449456
expr= (Expr*)
450457
coerce_to_target_type(pstate,
451-
(Node*)expr,type_id,
458+
orig_expr,type_id,
452459
attrtype,attrtypmod,
453460
COERCION_ASSIGNMENT,
454461
COERCE_IMPLICIT_CAST,
@@ -462,7 +469,7 @@ transformAssignedExpr(ParseState *pstate,
462469
format_type_be(attrtype),
463470
format_type_be(type_id)),
464471
errhint("You will need to rewrite or cast the expression."),
465-
parser_errposition(pstate,location)));
472+
parser_errposition(pstate,exprLocation(orig_expr))));
466473
}
467474

468475
returnexpr;

0 commit comments

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