Skip to content
/ server Public

MDEV-38792: Fix inconsistent separator treatment in TO_DATE #4811

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

Open
alexDiaconuAlex wants to merge 1 commit into
base: 12.3
Choose a base branch
from
+50 −0
Open

MDEV-38792: Fix inconsistent separator treatment in TO_DATE #4811

Show file tree
Hide file tree
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
15 changes: 15 additions & 0 deletions mysql-test/main/mdev_38792.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
SET sql_mode='ORACLE';
SELECT TO_DATE('2002 - AD', 'YYYY AD');
TO_DATE('2002 - AD', 'YYYY AD')
2002-03-17 00:00:00
SELECT TO_DATE('2024---01---01', 'YYYYMMDD');
TO_DATE('2024---01---01', 'YYYYMMDD')
NULL
Warnings:
Warning 1411 Incorrect datetime value: '2024---01---01' for function to_date
SELECT TO_DATE('2024 . 05 . 10', 'YYYYMMDD');
TO_DATE('2024 . 05 . 10', 'YYYYMMDD')
2024-05-10 00:00:00
SELECT TO_DATE('2002 - February - 10', 'YYYY MONTH DD');
TO_DATE('2002 - February - 10', 'YYYY MONTH DD')
2002-02-10 00:00:00
6 changes: 6 additions & 0 deletions mysql-test/main/mdev_38792.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
SET sql_mode='ORACLE';

SELECT TO_DATE('2002 - AD', 'YYYY AD');
SELECT TO_DATE('2024---01---01', 'YYYYMMDD');
SELECT TO_DATE('2024 . 05 . 10', 'YYYYMMDD');
SELECT TO_DATE('2002 - February - 10', 'YYYY MONTH DD');
29 changes: 29 additions & 0 deletions sql/item_timefunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,35 @@ extract_oracle_date_time(THD *thd, uint16 *format_ptr,
continue;
}

/*
MDEV-38792: TO_DATE: Inconsistent treatment of different separators in the date and format strings.
Skip punctuation and spaces in the input string before matching the next
format token, but avoid skipping a '-' sign if it's followed by a digit
(as it might be part of a negative year in SYYYY).
*/
// while (val < val_end && !my_isalnum(val_cs, *val))
// {
// if (*val == '-' && (val + 1 < val_end) && my_isdigit(val_cs, *(val + 1)))
// {
// break;
// }
// val++;
// }
bool skipped_punct= false;
while (val < val_end && !my_isalnum(val_cs, *val))
{
/* Only preserve the minus sign if the current format token supports negative values */
if (*val == '-' && format == FMT_SYYYY &&
(val + 1 < val_end) && my_isdigit(val_cs, *(val + 1)))
{
break;
}
val++;
skipped_punct= true;
}

if (skipped_punct) part_of_digits = 0;

error= 0;
if (!(val_len= (uint) (val_end - val)))
goto error;
Expand Down