Fix: 'instrument' interpreted as filter 'in strument'

Author: juanmcloaiza

astroquery/eso/tests/test_eso.py

@@ -301,15 +301,17 @@ def test_tap_url():
     (">1.23", "> 1.23"),
     ("<'5'", "< '5'"),
     (">'1.23'", "> '1.23'"),
-    ("like'%John%'", "like '%John%'"),
 
     # Strings that look like operators but should be treated as strings
     ("'like %John%'", "= 'like %John%'"),
     ("'= something'", "= '= something'"),
     ("'> 5'", "= '> 5'"),
     ("' > 1.23 '", "= ' > 1.23 '"),
+    ("likewise", "= 'likewise'"),
+    ("INfinity", "= 'INfinity'"),
+    ("like'%John%'", "= 'like'%John%''"), #pathologic case
 
-    # Ill-formed queries: not sanitized but expected to be passed through as-is
+    # Ill-formed queries: Operator, but not sanitized. Expected to be passed through as-is
     ("like %John%", "like %John%"),
     ("not like %John%", "not like %John%"),
     ("= SGR A", "= SGR A"),

astroquery/eso/utils.py

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