Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5d3fcc4

Browse files
committed
Bend parse location rules for the convenience of pg_stat_statements.
Generally, the parse location assigned to a multiple-token construct is the location of its leftmost token. This commit breaks that rule for the syntaxes TYPENAME 'LITERAL' and CAST(CONSTANT AS TYPENAME) --- the resulting Const will have the location of the literal string, not the typename or CAST keyword. The cases where this matters are pretty thin on the ground (no error messages in the regression tests change, for example), and it's unlikely that any user would be confused anyway by an error cursor pointing at the literal. But still it's less than consistent. The reason for changing it is that contrib/pg_stat_statements wants to know the parse location of the original literal, and it was agreed that this is the least unpleasant way to preserve that information through parse analysis. Peter Geoghegan
1 parent a40fa61 commit 5d3fcc4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/backend/parser/parse_coerce.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,13 @@ coerce_type(ParseState *pstate, Node *node,
280280
newcon->constlen = typeLen(targetType);
281281
newcon->constbyval = typeByVal(targetType);
282282
newcon->constisnull = con->constisnull;
283-
/* Use the leftmost of the constant's and coercion's locations */
284-
if (location < 0)
285-
newcon->location = con->location;
286-
else if (con->location >= 0 && con->location < location)
287-
newcon->location = con->location;
288-
else
289-
newcon->location = location;
283+
284+
/*
285+
* We use the original literal's location regardless of the position
286+
* of the coercion. This is a change from pre-9.2 behavior, meant to
287+
* simplify life for pg_stat_statements.
288+
*/
289+
newcon->location = con->location;
290290

291291
/*
292292
* Set up to point at the constant's text if the input routine throws

0 commit comments

Comments
 (0)