postgres.git / summary / log / commit / refs

commit    e0c641ebbf0aab219bbe5fe0ed2be4d937f1fea1
Author:   Daniel Gustafsson <dgustafsson@postgresql.org>
Date:     Mon May 18 15:33:36 2026 +0000
First released in: 19.0, 18.6

    psql: Make ParseVariableDouble reject values above max
    
    ParseVariableDouble missed returning false after logging an error when
    the parsed value exceeded max, making the value assigned rather than
    rejected.  Backpatch down to v18 where this was introduced as part of
    the \WATCH_INTERVAL.
    
    Author: Sven Klemm <sven@tigerdata.com>
    Co-authored-by: Daniel Gustafsson <daniel@yesql.se>
    Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
    Discussion: https://postgr.es/m/CAMCrgp31p_5SDVi7dwnP39tTW5icQ0MWHA+N4kJdXgkL0PEy8w@mail.gmail.com
    Backpatch-through: 18


src/bin/psql/t/001_basic.pl | 2 ++ src/bin/psql/variables.c | 1 + 2 files changed, 3 insertions(+) diff --git a/src/bin/psql/t/001_basic.pl b/src/bin/psql/t/001_basic.pl index cf07a9dbd5e..6f2341fcaa1 100644 --- a/src/bin/psql/t/001_basic.pl +++ b/src/bin/psql/t/001_basic.pl @@ -451,6 +451,8 @@ psql_fails_like( '\set WATCH_INTERVAL 1e500', qr/is out of range/, 'WATCH_INTERVAL variable is out of range'); +psql_like($node, '\echo :WATCH_INTERVAL', + qr/^2$/m, 'WATCH_INTERVAL variable was not altered'); # Test \g output piped into a program. # The program is perl -pe '' to simply copy the input to the output. diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c index 6b64302ebca..07f5e3f6f2d 100644 --- a/src/bin/psql/variables.c +++ b/src/bin/psql/variables.c @@ -224,6 +224,7 @@ ParseVariableDouble(const char *value, const char *name, double *result, double if (name) pg_log_error("invalid value \"%s\" for variable \"%s\": must be less than %.2f", value, name, max); + return false; } *result = dblval; return true; [parent: 20a4b06a1ea1]