Skip to content

Support non-lower case variables in functions #24829

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
merged 1 commit into from
Jan 29, 2025
Merged

Support non-lower case variables in functions #24829

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
6 changes: 5 additions & 1 deletion core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
import static io.trino.sql.analyzer.TypeSignatureTranslator.toTypeSignature;
import static java.lang.String.format;
import static java.util.Collections.nCopies;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static java.util.function.Predicate.not;

Expand Down Expand Up @@ -629,6 +630,9 @@ public Context newScope()
private static String identifierValue(Identifier name)
{
// TODO: this should use getCanonicalValue()
return name.getValue();
// stop-gap: lowercasing for now to match what is happening during analysis;
// otherwise we do not support non-lowercase variables in functions.
// Rework as part of https://github.com/trinodb/trino/pull/24829
return name.getValue().toLowerCase(ENGLISH);
Copy link
Member

@martint martint Jan 28, 2025

Choose a reason for hiding this comment

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

Add a link to #17 so we can find the places that need to be fixed when we work on that issue.

}
}
6 changes: 5 additions & 1 deletion core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutinePlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
import static io.trino.sql.relational.Expressions.call;
import static io.trino.sql.relational.Expressions.constantNull;
import static io.trino.sql.relational.Expressions.field;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;

public final class SqlRoutinePlanner
Expand Down Expand Up @@ -360,7 +361,10 @@ private static IrBlock block(List<IrStatement> statements)
private static String identifierValue(Identifier name)
{
// TODO: this should use getCanonicalValue()
return name.getValue();
// stop-gap: lowercasing for now to match what is happening during analysis;
// otherwise we do not support non-lowercase variables in functions.
// Rework as part of https://github.com/trinodb/trino/pull/24829
return name.getValue().toLowerCase(ENGLISH);
}
}

Expand Down
13 changes: 13 additions & 0 deletions testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6652,6 +6652,19 @@ SELECT my_pow(2, 8)
"""))
.matches("VALUES 256");

assertThat(query(
"""
WITH
FUNCTION fun_with_uppercase_var()
RETURNS int
BEGIN
DECLARE R int DEFAULT 7;
RETURN R;
END
SELECT fun_with_uppercase_var()
"""))
.matches("VALUES 7");

// invoke function on data from connector to prevent constant folding on the coordinator
assertThat(query(
"""
Expand Down
Loading