Skip to content

Commit e45e922

Browse files
comment and docstring corrections
1 parent 52f1f70 commit e45e922

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

datajoint/expression.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class QueryExpression:
3636
"""
3737
_restriction = None
3838
_restriction_attributes = None
39-
_left = [] # True for left joins, False for inner joins
39+
_left = [] # list of booleans True for left joins, False for inner joins
4040
_original_heading = None # heading before projections
4141

4242
# subclasses or instantiators must provide values
@@ -248,7 +248,7 @@ def join(self, other, semantic_check=True, left=False):
248248
if semantic_check:
249249
assert_join_compatibility(self, other)
250250
join_attributes = set(n for n in self.heading.names if n in other.heading.names)
251-
# needs subquery if FROM class has common attributes with the other's FROM clause
251+
# needs subquery if self's FROM clause has common attributes with other's FROM clause
252252
need_subquery1 = need_subquery2 = bool(
253253
(set(self.original_heading.names) & set(other.original_heading.names))
254254
- join_attributes)
@@ -287,7 +287,7 @@ def proj(self, *attributes, **named_attributes):
287287
self.proj(...) or self.proj(Ellipsis) -- include all attributes (return self)
288288
self.proj() -- include only primary key
289289
self.proj('attr1', 'attr2') -- include primary key and attributes attr1 and attr2
290-
self.proj(..., '-attr1', '-attr2') -- include attributes except attr1 and attr2
290+
self.proj(..., '-attr1', '-attr2') -- include all attributes except attr1 and attr2
291291
self.proj(name1='attr1') -- include primary key and 'attr1' renamed as name1
292292
self.proj('attr1', dup='(attr1)') -- include primary key and attribute attr1 twice, with the duplicate 'dup'
293293
self.proj(k='abs(attr1)') adds the new attribute k with the value computed as an expression (SQL syntax)

0 commit comments

Comments
 (0)