major overhaul for ADQL 2.1 from 2023-12-15

Author: kimakan

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.7.0 (XXXX-XX-XX)
+
+major overhaul for ADQL 2.1 recommendation 2023-12-15
+ - COOSYS is not required for the geometry constructors
+ - the geometry constructors return the correct datatype (doube precission[]) 
+ and correct units (degrees)
+ - drop the maintenance/support for the translation from ADQL to MySQL. 
+ - fix `BOX` constructor
+ - new requirements for the `pg_sphere` and postgreSQL
+ - ...
+
 ## 0.6.1 (2022-11-17)
 
 - fixed the `ORDER BY` clause for the dot-separated column references

Makefile

@@ -70,6 +70,7 @@ lib/queryparser/postgresql/%.py: src/queryparser/postgresql/%.py
 
 lib/queryparser/testing: \
 	lib/queryparser/testing/__init__.py \
+	lib/queryparser/testing/utils.py \
 	lib/queryparser/testing/tests.yaml \
 	lib/queryparser/testing/test_adql.py \
 	lib/queryparser/testing/test_mysql.py \

README.md

@@ -1,13 +1,15 @@
 queryparser
 ===========
 
-**Tool for parsing and processing of MySQL/PostgreSQL and translation of
+**Tool for parsing and processing of (MySQL\*)/PostgreSQL and translation of
 ADQL SELECT-like queries**
 
 Designed to be used in conjunction with [django-daiquri](https://github.com/django-daiquiri/daiquiri)
 as a query processing backend but it can be easily used as a stand-alone tool
 or integrated into another project.
 
+**\*NOTE: Since version 0.7.0, MySQL is not activelly supported/maintained anymore.**
+
 
 [![pytest Workflow Status](https://github.com/aipescience/queryparser/actions/workflows/pytest.yml/badge.svg)](https://github.com/aipescience/queryparser/actions/workflows/pytest.yml)
 [![Coverage Status](https://coveralls.io/repos/aipescience/queryparser/badge.svg?branch=master&service=github)](https://coveralls.io/github/aipescience/queryparser?branch=master)
@@ -54,9 +56,20 @@ and a `lib` directory will be created. After that, run
 to install the generated parser in your virtual environment.
 
 
+Additional requirements
+-----------------------
+The queryparser assumes that the PostgreSQL database has the extension 
+[pg_sphere](https://github.com/kimakan/pgsphere/tree/aiprdbms16) installed. Although the `pg_sphere` is not required for the 
+python module, the PostgreSQL **queries will not run** without that extension 
+installed on the database.
+
+
 Parsing MySQL and PostgreSQL
 ----------------------------
 
+**Since version 0.7, MySQL part of the parser is not maintained anymore.
+Thus, the MySQL related functionality cannot be guaranteed!**
+
 Parsing and processing of MySQL queries can be done by creating an instance
 of the `MySQLQueryProcessor` class
 
@@ -110,13 +123,12 @@ the `ADQLQueryTranslator` class
 and calling
 
 ```python
-    adt.to_mysql()
+    adt.to_postgresql()
 ```
 
 which returns a translated string representing a valid MySQL query if
-the ADQL query had no errors. The MySQL query can then be parsed with the
-`MySQLQueryProcessor` in the same way as shown above.
-
+the ADQL query had no errors. The PostgreSQL query can then be parsed with the
+`PostgreSQLQueryProcessor` in the same way as shown above.
 
 Testing
 -------

docs/dev-notes.md

@@ -6,7 +6,7 @@
 import subprocess
 import re
 
-ANTLR_JAR = 'antlr-4.11.1-complete.jar'
+ANTLR_JAR = 'antlr-4.13.1-complete.jar'
 ANTLR_DIRS = ('.', '/usr/local/lib/', '/usr/local/bin/')
 
 QUERYPARSER_SRC = 'src/queryparser/'

generate.py

@@ -1,3 +1,3 @@
-antlr4-python3-runtime==4.11.1
+antlr4-python3-runtime==4.13.1
 pytest~=6.2.5
 PyYAML~=6.0

requirements.txt

@@ -21,8 +21,8 @@
     version=metadata['version'],
     author=metadata['author'],
     author_email=metadata['email'],
-    maintainer=metadata['author'],
-    maintainer_email=metadata['email'],
+    maintainer=metadata['maintainer'],
+    maintainer_email=metadata['maintainer_email'],
     license=metadata['license'],
     url='https://github.com/aipescience/queryparser',
     description=u'Parses PostgreSQL/MySQL and translates ADQL to ' +\

setup.py

@@ -1,9 +1,11 @@
 __title__ = 'queryparser'
-__version__ = '0.6.1'
+__version__ = '0.7.0'
 __author__ = 'Gal Matijevic'
 __email__ = '[email protected]'
+__maintainer__ = 'Kirill Makan'
+__maintainer_email__ = '[email protected]'
 __license__ = 'Apache-2.0'
-__copyright__ = 'Copyright 2016-2022 Leibniz Institute for Astrophysics' +\
+__copyright__ = 'Copyright 2016-2024 Leibniz Institute for Astrophysics' +\
         'Potsdam (AIP)'
 
 VERSION = __version__

src/queryparser/__init__.py

@@ -25,14 +25,15 @@ box:
           RPAREN ;
 catalog_name:                   ID ;
 centroid:                       CENTROID LPAREN geometry_value_expression RPAREN ;
-//character_representation:       nonquote_character ;// | SQ SQ ;
+// character_representation:       nonquote_character ;// | SQ SQ ;
 char_function:                  LOWER LPAREN character_string_literal RPAREN ;
 character_string_literal:       CSL ; //SQ ( SL )* SQ ; //SQ ( character_representation )* SQ ;
 character_value_expression:
           character_value_expression concatenation_operator ( value_expression_primary | string_value_function )
         | value_expression_primary
         | string_value_function ;
-circle:                         CIRCLE LPAREN ( coord_sys COMMA )? coordinates COMMA radius RPAREN ;
+circle:                         CIRCLE LPAREN (( coord_sys COMMA )? circle_center ) COMMA radius RPAREN ;
+circle_center:                  coordinates | coord_value ;
 column_name:                    identifier ;
 column_name_list:               column_name ( COMMA column_name )* ;
 column_reference:               ( qualifier DOT )? column_name ;
@@ -41,7 +42,7 @@ comparison_predicate:           value_expression comp_op value_expression ;
 concatenation_operator:         CONCAT ;
 contains:                       CONTAINS LPAREN geometry_value_expression COMMA geometry_value_expression RPAREN ;
 coord_sys:                      string_value_expression ;
-coord_value:                    point | column_reference | centroid ;
+coord_value:                    point_value | column_reference ;
 coord1:                         COORD1 LPAREN coord_value RPAREN ;
 coord2:                         COORD2 LPAREN coord_value RPAREN ;
 coordinate1:                    numeric_value_expression ;
@@ -68,7 +69,7 @@ factor:                         ( sign )? numeric_primary ;
 from_clause:                    FROM table_reference ( COMMA table_reference )* ;
 general_literal:                character_string_literal ;
 general_set_function:           set_function_type LPAREN ( set_quantifier )? value_expression RPAREN ;
-geometry_value_expression:      box | centroid | circle | point | polygon | region | user_defined_function ;
+geometry_value_expression:      box | circle | centroid | point | polygon | region | user_defined_function ;
 group_by_clause:                GROUP BY grouping_column_reference_list ;
 grouping_column_reference:      column_reference ;
 grouping_column_reference_list: grouping_column_reference ( COMMA grouping_column_reference )* ;
@@ -129,6 +130,7 @@ ordering_specification:         ASC | DESC ;
 outer_join_type:                LEFT | RIGHT | FULL ;
 pattern:                        character_value_expression ;
 point:                          POINT LPAREN ( coord_sys COMMA )? coordinates RPAREN ;
+point_value:                    point | centroid | user_defined_function ;
 polygon:                        POLYGON LPAREN
                                 ( coord_sys COMMA )?
                                 coordinates COMMA