Fix issue: sort order keyword is case sensitive (#853)

opendistro-for-elasticsearch · Dec 15, 2020 · 70ad207 · 70ad207
1 parent 318aa20
commit 70ad207
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/integ-test/src/test/resources/correctness/bugfixes/852.txt b/integ-test/src/test/resources/correctness/bugfixes/852.txt
@@ -0,0 +1,6 @@
+SELECT AvgTicketPrice FROM kibana_sample_data_flights ORDER BY AvgTicketPrice DESC
+SELECT AvgTicketPrice FROM kibana_sample_data_flights ORDER BY AvgTicketPrice desc
+SELECT AvgTicketPrice FROM kibana_sample_data_flights ORDER BY AvgTicketPrice DeSc
+SELECT AvgTicketPrice FROM kibana_sample_data_flights ORDER BY AvgTicketPrice ASC
+SELECT AvgTicketPrice FROM kibana_sample_data_flights ORDER BY AvgTicketPrice asc
+SELECT AvgTicketPrice FROM kibana_sample_data_flights ORDER BY AvgTicketPrice AsC
diff --git a/integ-test/src/test/resources/correctness/queries/orderby.txt b/integ-test/src/test/resources/correctness/queries/orderby.txt
@@ -1,6 +1,8 @@
 SELECT FlightNum FROM kibana_sample_data_flights ORDER BY FlightNum
 SELECT FlightNum FROM kibana_sample_data_flights ORDER BY FlightNum ASC
 SELECT FlightNum FROM kibana_sample_data_flights ORDER BY FlightNum DESC
+SELECT FlightNum FROM kibana_sample_data_flights ORDER BY FlightNum asc
+SELECT FlightNum FROM kibana_sample_data_flights ORDER BY FlightNum desc
 SELECT FlightNum, AvgTicketPrice FROM kibana_sample_data_flights ORDER BY FlightNum, AvgTicketPrice
 SELECT FlightNum, AvgTicketPrice FROM kibana_sample_data_flights ORDER BY FlightNum DESC, AvgTicketPrice
 SELECT FlightNum, AvgTicketPrice FROM kibana_sample_data_flights ORDER BY FlightNum, AvgTicketPrice DESC

diff --git a/...java/com/amazon/opendistroforelasticsearch/sql/sql/parser/context/QuerySpecification.java b/...java/com/amazon/opendistroforelasticsearch/sql/sql/parser/context/QuerySpecification.java
@@ -219,7 +219,7 @@ private SortOrder visitSortOrder(Token ctx) {
       if (ctx == null) {
         return null;
       }
-      return SortOrder.valueOf(ctx.getText());
+      return SortOrder.valueOf(ctx.getText().toUpperCase());
     }
 
     private NullOrder visitNullOrderClause(TerminalNode first, TerminalNode last) {

diff --git a/sql/src/test/java/com/amazon/opendistroforelasticsearch/sql/sql/parser/AstBuilderTest.java b/sql/src/test/java/com/amazon/opendistroforelasticsearch/sql/sql/parser/AstBuilderTest.java
@@ -415,6 +415,29 @@ public void can_build_order_by_null_option() {
         buildAST("SELECT name FROM test ORDER BY name NULLS LAST"));
   }
 
+  @Test
+  public void can_build_order_by_sort_order_keyword_insensitive() {
+    assertEquals(
+        project(
+            sort(
+                relation("test"),
+                field("age",
+                    argument("asc", booleanLiteral(true)))),
+            alias("age", qualifiedName("age"))),
+        buildAST("SELECT age FROM test ORDER BY age ASC")
+    );
+
+    assertEquals(
+        project(
+            sort(
+                relation("test"),
+                field("age",
+                    argument("asc", booleanLiteral(true)))),
+            alias("age", qualifiedName("age"))),
+        buildAST("SELECT age FROM test ORDER BY age asc")
+    );
+  }
+
   @Test
   public void can_build_from_subquery() {
     assertEquals(