Amend recent fix for SIMILAR TO regex conversion.
authorTom Lane <tgl@sss.pgh.pa.us>
Sat, 13 Sep 2025 20:55:51 +0000 (16:55 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Sat, 13 Sep 2025 20:55:51 +0000 (16:55 -0400)
commitf75ff1b141a5ceccfc6292af5e94238c360f89e9
tree90e9d907f9f86c97a7789bd1155ff41b5fc4ea46
parent5e131489fe99025dafa7ec425a7130fbad1d8015
Amend recent fix for SIMILAR TO regex conversion.

Commit e3ffc3e91 fixed the translation of character classes in
SIMILAR TO regular expressions.  Unfortunately the fix broke a corner
case: if there is an escape character right after the opening bracket
(for example in "[\q]"), a closing bracket right after the escape
sequence would not be seen as closing the character class.

There were two more oversights: a backslash or a nested opening bracket
right at the beginning of a character class should remove the special
meaning from any following caret or closing bracket.

This bug suggests that this code needs to be more readable, so also
rename the variables "charclass_depth" and "charclass_start" to
something more meaningful, rewrite an "if" cascade to be more
consistent, and improve the commentary.

Reported-by: Dominique Devienne <ddevienne@gmail.com>
Reported-by: Stephan Springl <springl-psql@bfw-online.de>
Author: Laurenz Albe <laurenz.albe@cybertec.at>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/CAFCRh-8NwJd0jq6P=R3qhHyqU7hw0BTor3W0SvUcii24et+zAw@mail.gmail.com
Backpatch-through: 13
src/backend/utils/adt/regexp.c
src/test/regress/expected/strings.out
src/test/regress/sql/strings.sql