keywork pk test cases

Author: A-Baji

datajoint/declare.py

@@ -443,9 +443,13 @@ def format_attribute(attr):
             return f"`{attr}`"
         return f"({attr})"
 
-    match = re.match(
-        r"(?P<unique>unique\s+)?index\s*\(\s*(?P<args>.*)\)", line, re.I
-    ).groupdict()
+    try:
+        match = re.match(
+            r"(?P<unique>unique\s+)?index\s*\(\s*(?P<args>.*)\)", line, re.I
+        ).groupdict()
+    except AttributeError:
+        raise DataJointError(f'Table definition syntax error in line "{line}"')
+
     attr_list = re.findall(r"(?:[^,(]|\([^)]*\))+", match["args"])
     index_sql.append(
         "{unique}index ({attrs})".format(

tests_old/schema_simple.py

@@ -14,6 +14,24 @@
 schema = dj.Schema(PREFIX + "_relational", locals(), connection=dj.conn(**CONN_INFO))
 
 
+@schema
+class SelectPK(dj.Lookup):
+    definition = """  # tests sql keyword escaping
+    id: int
+    select  : int
+    """
+    contents = list(dict(id=i, select=i * j) for i in range(3) for j in range(4, 0, -1))
+
+
+@schema
+class KeyPK(dj.Lookup):
+    definition = """  # tests sql keyword escaping
+    id   : int
+    key  : int
+    """
+    contents = list(dict(id=i, key=i + j) for i in range(3) for j in range(4, 0, -1))
+
+
 @schema
 class IJ(dj.Lookup):
     definition = """  # tests restrictions

tests_old/test_relational_operand.py

@@ -25,6 +25,8 @@
     L,
     DataA,
     DataB,
+    SelectPK,
+    KeyPK,
     TTestUpdate,
     IJ,
     JI,
@@ -527,6 +529,33 @@ def test_restrictions_by_top():
             {"id_l": 20, "cond_in_l": 1},
         ]
 
+    @staticmethod
+    def test_top_restriction_with_keywords():
+        select = SelectPK() & dj.Top(limit=9, order_by=["select desc"])
+        key = KeyPK() & dj.Top(limit=9, order_by="key desc")
+        assert select.fetch(as_dict=True) == [
+            {"id": 2, "select": 8},
+            {"id": 2, "select": 6},
+            {"id": 1, "select": 4},
+            {"id": 2, "select": 4},
+            {"id": 1, "select": 3},
+            {"id": 1, "select": 2},
+            {"id": 2, "select": 2},
+            {"id": 1, "select": 1},
+            {"id": 0, "select": 0},
+        ]
+        assert key.fetch(as_dict=True) == [
+            {"id": 2, "key": 6},
+            {"id": 2, "key": 5},
+            {"id": 1, "key": 5},
+            {"id": 0, "key": 4},
+            {"id": 1, "key": 4},
+            {"id": 2, "key": 4},
+            {"id": 0, "key": 3},
+            {"id": 1, "key": 3},
+            {"id": 2, "key": 3},
+        ]
+
     @staticmethod
     def test_top_errors():
         with assert_raises(DataJointError) as err1: