Skip to content

Commit 6268ebf

Browse files
committed
regex matching for empty pk case
1 parent 0002cb3 commit 6268ebf

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

datajoint/expression.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,11 @@ def sorting_clauses(self):
126126
return ""
127127
clause = (
128128
""
129-
if not self.primary_key and order_by == ["KEY"]
130-
else (
131-
" ORDER BY "
132-
+ ", ".join(_flatten_attribute_list(self.primary_key, order_by))
129+
if not self.primary_key
130+
and all(
131+
re.match(r"^\s*KEY(\s+[aA][Ss][Cc])?\s*$", a)
132+
or re.match(r"^\s*KEY\s+[Dd][Ee][Ss][Cc]\s*$", a)
133+
for a in self._top.order_by
133134
)
134135
else f" ORDER BY \
135136
{', '.join(_flatten_attribute_list(self.primary_key, self._top.order_by))}"

0 commit comments

Comments
 (0)