Skip to content

Correct regex for timezone #4993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pbrydzinski wants to merge 1 commit into from
+1 −1
Closed

Correct regex for timezone #4993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/MySQL_Set_Stmt_Parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void MySQL_Set_Stmt_Parser::generateRE_parse1v2() {
string tzd = "(?:(?:\\+|\\-)(?:|\\d)\\d:\\d\\d)";
// time_zone in string format:
// word / word
string tzw = "(?:\\w+/\\w+)";
string tzw = "(?:\\w+/\\w+(?:/\\w+)?)";
Copy link

@gemini-code-assist gemini-code-assist bot Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This change to tzw correctly extends support to timezones with three path segments, such as 'America/Argentina/Buenos_Aires', by making the third segment (?:/\w+)? optional. This directly addresses the issue described in the pull request.

A point for consideration regarding overall robustness: the pattern uses \w+ to match individual segments of the timezone name (e.g., 'America', 'Argentina', 'Buenos_Aires'). \w typically matches alphanumeric characters plus underscore ([a-zA-Z0-9_]). Some IANA timezone names can include hyphens within their segments (e.g., 'America/Port-au-Prince'). The current \w+ would not correctly parse such segments; for 'America/Port-au-Prince', \w+ would match 'Port', and then the regex would likely fail at the hyphen.

If supporting timezones with hyphens in their path segments is within scope for this parser, \w+ might need to be broadened (e.g., to [\w-]+). Could you clarify if the current behavior of not supporting hyphens within these path segments is an acceptable limitation, or if broader support is intended?

vp = "(?:" + tzd + "|" + tzw + ")"; // time_zone in numeric and string format
}
for (auto it = quote_symbol.begin(); it != quote_symbol.end(); it++) {
Expand Down