Support non-lower case variables in functions

trinodb · Jan 28, 2025 · 9318bc3 · 9318bc3
1 parent 798eb19
commit 9318bc3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalyzer.java
@@ -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;
 
@@ -629,6 +630,8 @@ 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.
+        return name.getValue().toLowerCase(ENGLISH);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutinePlanner.java b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutinePlanner.java
@@ -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
@@ -360,7 +361,9 @@ 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.
+            return name.getValue().toLowerCase(ENGLISH);
         }
     }
 

diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java
@@ -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(
                 """