Add 'not in' and 'not like' to supported TAP operators

Author: juanmcloaiza

astroquery/eso/tests/test_eso.py

@@ -290,8 +290,11 @@ def test_tap_url():
     ("< '5'", "< '5'"),
     ("> '1.23'", "> '1.23'"),
     ("like '%John%'", "like '%John%'"),
+    ("not like '%John%'", "not like '%John%'"),
     ("in ('apple', 'mango', 'orange')", "in ('apple', 'mango', 'orange')"),
+    ("not in ('apple', 'mango', 'orange')", "not in ('apple', 'mango', 'orange')"),
     ("in (1, 2, 3)", "in (1, 2, 3)"),
+    ("not in (1, 2, 3)", "not in (1, 2, 3)"),
 
     # Operator-based queries
     ("<5", "< 5"),
@@ -308,6 +311,7 @@ def test_tap_url():
 
     # Ill-formed queries: not sanitized but expected to be passed through as-is
     ("like %John%", "like %John%"),
+    ("not like %John%", "not like %John%"),
     ("= SGR A", "= SGR A"),
 ])
 def test_adql_sanitize_op_val(input_val, expected):

astroquery/eso/utils.py

@@ -114,23 +114,17 @@ def _adql_sanitize_op_val(op_val):
         returns "<operator> <value>" if operator is provided.
         Defaults to "= <value>" otherwise.
     """
-    supported_operators = {"=", ">", "<", "<=", ">=", "!=", "like", "between", "in"}
+    supported_operators = {"=", ">", "<", "<=", ">=", "!=", "like", "between", "in",
+                           "not like", "not in"}
 
     if not isinstance(op_val, str):
         return f"= {op_val}"
 
     op_val = op_val.strip()
-    parts = op_val.split(" ", 1)
-
-    if len(parts) == 1:
-        for s in supported_operators:
-            if op_val.startswith(s):
-                operator, value = s, op_val.split(s, 1)[-1]
-                return f"{operator} {value}"
-
-    if len(parts) == 2 and parts[0].lower() in supported_operators:
-        operator, value = parts
-        return f"{operator} {value}"
+    for s in supported_operators:
+        if op_val.lower().startswith(s):
+            operator, value = s, op_val[len(s):].strip()
+            return f"{operator} {value}"
 
     # Default case: no operator. Assign "="
     value = op_val if (op_val.startswith("'") and op_val.endswith("'")) else f"'{op_val}'"