fix the order_by_clause for the dot-separated col references

Author: kimakan

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.1 (2022-11-17)
+
+- fixed the `ORDER BY` clause for the dot-separated column references
+
 ## 0.6.0 (2022-11-04)
 
 - bump the version of `antlr4-python3-runtime` to 4.11.1

src/queryparser/__init__.py

@@ -1,5 +1,5 @@
 __title__ = 'queryparser'
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 __author__ = 'Gal Matijevic'
 __email__ = 'gmatijevic@aip.de'
 __license__ = 'Apache-2.0'

src/queryparser/adql/ADQLParser.g4

@@ -162,7 +162,7 @@ set_limit:                      TOP unsigned_decimal ;
 set_quantifier:                 DISTINCT | ALL ;
 sign:                           PLUS | MINUS ;
 signed_integer:                 ( sign )? unsigned_decimal ;
-sort_key:                       column_name | unsigned_decimal ;
+sort_key:                       value_expression| column_reference | unsigned_decimal ;
 sort_specification:             sort_key (ordering_specification )? ;
 sort_specification_list:        sort_specification ( COMMA sort_specification )* ;
 string_geometry_function:       extract_coordsys ;
@@ -217,4 +217,4 @@ value_expression_primary:
         | set_function_specification
         | LPAREN value_expression RPAREN ;
 where_clause:                   WHERE search_condition ;
-with_query:                     query_name ( LPAREN column_name ( COMMA column_name )* RPAREN )? AS LPAREN ( query_specification )? RPAREN  ;
+with_query:                     query_name ( LPAREN column_name ( COMMA column_name )* RPAREN )? AS LPAREN ( query_specification )? RPAREN  ;