Skip to content

Disallow null table version #12719

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

Merged
findepi merged 1 commit into from
Jun 9, 2022
Merged

Disallow null table version #12719

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
9 changes: 9 additions & 0 deletions core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4573,6 +4573,7 @@ private Optional<TableVersion> extractTableVersion(Table table, QualifiedObjectN
private void validateVersionPointer(QualifiedObjectName tableName, QueryPeriod queryPeriod, TableVersion extractedVersion)
{
Type type = extractedVersion.getObjectType();
Object pointer = extractedVersion.getPointer();
if (extractedVersion.getPointerType() == PointerType.TEMPORAL) {
// Before checking if the connector supports the version type, verify that version is a valid time-based type
if (!(type instanceof TimestampWithTimeZoneType ||
Expand All @@ -4582,6 +4583,14 @@ private void validateVersionPointer(QualifiedObjectName tableName, QueryPeriod q
"Type %s invalid. Temporal pointers must be of type Timestamp, Timestamp with Time Zone, or Date.",
type.getDisplayName()));
}
if (pointer == null) {
throw semanticException(INVALID_ARGUMENTS, queryPeriod, "Pointer value cannot be NULL");
}
}
else {
if (pointer == null) {
throw semanticException(INVALID_ARGUMENTS, queryPeriod, "Pointer value cannot be NULL");
}
}

if (!metadata.isValidTableVersion(session, tableName, extractedVersion)) {
Expand Down
20 changes: 10 additions & 10 deletions core/trino-main/src/test/java/io/trino/sql/analyzer/TestAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,14 @@ public void testTemporalTableVersion()

// null value with right type
assertFails("SELECT * FROM t1 FOR TIMESTAMP AS OF CAST(NULL AS date)")
.hasErrorCode(NOT_SUPPORTED)
.hasMessage("This connector does not support versioned tables");
.hasErrorCode(INVALID_ARGUMENTS)
.hasMessage("line 1:18: Pointer value cannot be NULL");
assertFails("SELECT * FROM t1 FOR TIMESTAMP AS OF CAST(NULL AS timestamp(3))")
.hasErrorCode(NOT_SUPPORTED)
.hasMessage("This connector does not support versioned tables");
.hasErrorCode(INVALID_ARGUMENTS)
.hasMessage("line 1:18: Pointer value cannot be NULL");
assertFails("SELECT * FROM t1 FOR TIMESTAMP AS OF CAST(NULL AS timestamp(3) with time zone)")
.hasErrorCode(NOT_SUPPORTED)
.hasMessage("This connector does not support versioned tables");
.hasErrorCode(INVALID_ARGUMENTS)
.hasMessage("line 1:18: Pointer value cannot be NULL");

// null value with wrong type
assertFails("SELECT * FROM t1 FOR TIMESTAMP AS OF NULL")
Expand Down Expand Up @@ -448,11 +448,11 @@ public void testRangeIdTableVersion()
.hasErrorCode(INVALID_ARGUMENTS)
.hasMessage("line 1:18: Pointer value cannot be NULL");
assertFails("SELECT * FROM t1 FOR VERSION AS OF CAST(NULL AS bigint)")
.hasErrorCode(NOT_SUPPORTED)
.hasMessage("This connector does not support versioned tables");
.hasErrorCode(INVALID_ARGUMENTS)
.hasMessage("line 1:18: Pointer value cannot be NULL");
assertFails("SELECT * FROM t1 FOR VERSION AS OF CAST(NULL AS varchar)")
.hasErrorCode(NOT_SUPPORTED)
.hasMessage("This connector does not support versioned tables");
.hasErrorCode(INVALID_ARGUMENTS)
.hasMessage("line 1:18: Pointer value cannot be NULL");
}

@Test
Expand Down