Skip to content
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

Fix DateTimeException error classification in varchar casts. #2

Merged
merged 3 commits into from
Nov 16, 2020
Merged

Fix DateTimeException error classification in varchar casts. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
424600c
Catch DateTimeException on bad casts to rethrow as a descriptive user…
johnwhumphreys Nov 15, 2020
f76ca3e
Removing trailing space in cast date cast error message.
johnwhumphreys Nov 16, 2020
4913382
Adding test cases for varchar timestamp cast errors.
johnwhumphreys Nov 16, 2020
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
11 changes: 11 additions & 0 deletions presto-main/src/main/java/io/prestosql/operator/scalar/timestamp/VarcharToTimestampCast.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.prestosql.spi.type.LongTimestamp;
import io.prestosql.type.DateTimes;

import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.util.regex.Matcher;

Expand Down Expand Up @@ -53,6 +54,11 @@ public static long castToShort(@LiteralParameter("p") long precision, @SqlType("
catch (IllegalArgumentException e) {
throw new PrestoException(INVALID_CAST_ARGUMENT, "Value cannot be cast to timestamp: " + value.toStringUtf8(), e);
}
catch (DateTimeException e) {
//Leverage highly specific error message from the source exception.
throw new PrestoException(INVALID_CAST_ARGUMENT,
String.format("Value cannot be cast to timestamp; %s.", e.getMessage()), e);
}
}

@LiteralParameters({"x", "p"})
Expand All @@ -65,6 +71,11 @@ public static LongTimestamp castToLong(@LiteralParameter("p") long precision, @S
catch (IllegalArgumentException e) {
throw new PrestoException(INVALID_CAST_ARGUMENT, "Value cannot be cast to timestamp: " + value.toStringUtf8(), e);
}
catch (DateTimeException e) {
//Leverage highly specific error message from the source exception.
throw new PrestoException(INVALID_CAST_ARGUMENT,
String.format("Value cannot be cast to timestamp; %s. ", e.getMessage()), e);
}
}

@VisibleForTesting
Expand Down
9 changes: 9 additions & 0 deletions presto-main/src/test/java/io/prestosql/type/TestTimestamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,15 @@ public void testCastToTimestampWithTimeZone()
"2001-01-22 03:04:05.321 " + DATE_TIME_ZONE.getID());
}

@Test
public void testCastInvalidVarcharToTimestamp()
{
assertInvalidCast("cast('2020-13-01 23:59:01' as timestamp)",
"Value cannot be cast to timestamp; Invalid value for MonthOfYear (valid values 1 - 12): 13.");
assertInvalidCast("cast('2020-12-01 24:00:00' as timestamp)",
"Value cannot be cast to timestamp; Invalid value for HourOfDay (valid values 0 - 23): 24.");
}

@Test
public void testCastToSlice()
{
Expand Down