add support for '0=intersects()' in ADQL

Author: kimakan

src/queryparser/adql/ADQLParser.g4

@@ -80,6 +80,7 @@ in_predicate:                   value_expression ( NOT )? IN in_predicate_value
 in_predicate_value:             table_subquery | LPAREN in_value_list RPAREN ;
 in_value_list:                  value_expression ( COMMA value_expression )* ;
 intersects:                     INTERSECTS LPAREN geometry_value_expression COMMA geometry_value_expression RPAREN ;
+intersects_predicate:           INT EQ intersects;
 join_column_list:               column_name_list ;
 join_condition:                 ON search_condition ;
 join_specification:             join_condition  | named_columns_join ;
@@ -138,6 +139,7 @@ polygon:                        POLYGON LPAREN
                                 coordinates ( COMMA coordinates )+ RPAREN ;
 predicate:
           contains_predicate
+        | intersects_predicate
         | comparison_predicate
         | between_predicate
         | in_predicate

src/queryparser/adql/adqltranslator.py

@@ -330,6 +330,7 @@ def visitArea(self, ctx):
             ctx.removeLastChild()
         self.contexts[ctx] = ctx_text
 
+
     def visitCentroid(self, ctx):
         """
         Works only for circles.
@@ -348,7 +349,6 @@ def visitCentroid(self, ctx):
         _remove_children(ctx)
         self.contexts[ctx] = ctx_text
 
-
     def visitContains_predicate(self, ctx):
         comp_value = ctx.children[0].getText()
         if comp_value == '1' or comp_value == '0':
@@ -414,6 +414,21 @@ def visitDistance(self, ctx):
             ctx.removeLastChild()
         self.contexts[ctx] = ctx_text
 
+    def visitIntersects_predicate(self, ctx):
+        comp_value = ctx.children[0].getText()
+        if comp_value == '1' or comp_value == '0':
+            self.visitIntersects(ctx.children[2])
+            ctx_text = self.contexts[ctx.children[2]]
+            if self.output_sql == 'mysql':
+                ctx_text = f"{comp_value} = {ctx_text}"
+            elif self.output_sql == 'postgresql' and comp_value == '0':
+                ctx_text = ctx_text.replace('&&', '!&&')
+        else:
+            raise QueryError('The function INTERSECTS allows comparison to 1 or 0 only.')
+
+        _remove_children(ctx)
+        self.contexts[ctx] = ctx_text
+
     def visitIntersects(self, ctx):
         arg = (self.contexts[ctx.children[2].children[0]],
                self.contexts[ctx.children[4].children[0]])

src/queryparser/testing/tests.yaml

@@ -887,6 +887,11 @@ adql_postgresql_tests:
         - SELECT INTERSECTS(CIRCLE('ICRS', 0, 0, 10), BOX('ICRS', 2, -3, 4, 4)) FROM db.tab;
         - SELECT scircle(spoint(RADIANS(0.0), RADIANS(0.0)), RADIANS(10.0)) && sbox(spoint(RADIANS(0.000000000000),RADIANS(-5.000000000000)),spoint(RADIANS(4.000000000000),RADIANS(-1.000000000000))) FROM db.tab;
 
+    -
+        - SELECT TOP 10 LOG10(ra), LOG(dec) FROM db.tab WHERE 0=INTERSECTS(POINT('ICRS', ra, dec), POLYGON('ICRS', 10.0, -10.5, 20.0, 20.5, 30.0, 30.5));
+        - SELECT LOG(ra), LN(dec) FROM db.tab WHERE spoint(RADIANS(ra), RADIANS(dec)) !&& spoly('{(10.0d,-10.5d),(20.0d,20.5d),(30.0d,30.5d)}') LIMIT 10;
+
+
 
 # Each test below consists of:
 #