always escape

Author: A-Baji

datajoint/expression.py

@@ -125,7 +125,9 @@ def sorting_clauses(self):
         if not self._top:
             return ""
         clause = ", ".join(
-            _flatten_attribute_list(self.primary_key, self._top.order_by)
+            _wrap_attributes(
+                _flatten_attribute_list(self.primary_key, self._top.order_by)
+            )
         )
         if clause:
             clause = f" ORDER BY {clause}"
@@ -964,61 +966,18 @@ def _flatten_attribute_list(primary_key, attrs):
     :param attrs: list of attribute names, which may include "KEY", "KEY DESC" or "KEY ASC"
     :return: generator of attributes where "KEY" is replaced with its component attributes
     """
-    sql_keywords = [
-        "SELECT",
-        "FROM",
-        "WHERE",
-        "AND",
-        "OR",
-        "INSERT",
-        "INTO",
-        "VALUES",
-        "UPDATE",
-        "SET",
-        "DELETE",
-        "CREATE",
-        "TABLE",
-        "ALTER",
-        "DROP",
-        "INDEX",
-        "JOIN",
-        "LEFT",
-        "RIGHT",
-        "INNER",
-        "OUTER",
-        "UNION",
-        "GROUP",
-        "BY",
-        "HAVING",
-        "ORDER",
-        "ASC",
-        "DESC",
-        "LIMIT",
-        "OFFSET",
-        "DISTINCT",
-        "CASE",
-        "WHEN",
-        "THEN",
-        "ELSE",
-        "END",
-        "NULL",
-        "NOT",
-        "IN",
-        "LIKE",
-        "KEY",
-    ]
-    keyword_pattern = (
-        r"\b(" + "|".join(re.escape(keyword) for keyword in sql_keywords) + r")\b"
-    )
-
     for a in attrs:
         if re.match(r"^\s*KEY(\s+[aA][Ss][Cc])?\s*$", a):
             if primary_key:
                 yield from primary_key
         elif re.match(r"^\s*KEY\s+[Dd][Ee][Ss][Cc]\s*$", a):
             if primary_key:
                 yield from (q + " DESC" for q in primary_key)
-        elif re.match(keyword_pattern, a, re.I):
-            yield f"`{a}`"
         else:
             yield a
+
+
+def _wrap_attributes(attr):
+    for entry in attr:
+        wrapped_entry = re.sub(r"\b((?!asc|desc)\w+)\b", r"`\1`", entry, re.IGNORECASE)
+        yield wrapped_entry  # wrap attribute names in backquotes