mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
Make query jumbling also squash PARAM_EXTERN params
Commit 62d712ecfd
made query jumbling squash lists of Consts as a
single element, but there's no reason not to treat PARAM_EXTERN
parameters the same. For these purposes, these values are indeed
constants for any particular execution of a query.
In particular, this should make list squashing more useful for
applications using extended query protocol, which would use parameters
extensively.
A complication arises: if a query has both external parameters and
squashable lists, then the parameter number used as placeholder for the
squashed list might be inconsistent with regards to the parameter
numbers used by the query literal. To reduce the surprise factor, all
parameters are renumbered starting from 1 in that case.
Author: Sami Imseih <samimseih@gmail.com>
Author: Dmitry Dolgov <9erthalion6@gmail.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/CAA5RZ0tRXoPG2y6bMgBCWNDt0Tn=unRerbzYM=oW0syi1=C1OA@mail.gmail.com
This commit is contained in:
@ -2841,6 +2841,16 @@ generate_normalized_query(JumbleState *jstate, const char *query,
|
||||
int off, /* Offset from start for cur tok */
|
||||
tok_len; /* Length (in bytes) of that tok */
|
||||
|
||||
/*
|
||||
* If we have an external param at this location, but no lists are
|
||||
* being squashed across the query, then we skip here; this will make
|
||||
* us print print the characters found in the original query that
|
||||
* represent the parameter in the next iteration (or after the loop is
|
||||
* done), which is a bit odd but seems to work okay in most cases.
|
||||
*/
|
||||
if (jstate->clocations[i].extern_param && !jstate->has_squashed_lists)
|
||||
continue;
|
||||
|
||||
off = jstate->clocations[i].location;
|
||||
|
||||
/* Adjust recorded location if we're dealing with partial string */
|
||||
|
Reference in New Issue
Block a user