Skip to content

Commit e28d1a4

Browse files
committed
WIP: fix revisit test case
1 parent 61d2e8d commit e28d1a4

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

datajoint/table.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,12 @@ def delete(
512512
deleted = set()
513513
visited_masters = set()
514514

515+
if force_masters and not force_parts:
516+
logger.warn(
517+
"force_masters=True implies force_parts=True. "
518+
+ "Ignoring force_parts=False."
519+
) # No need to reset, as force_masters will cascade to parts.
520+
515521
def cascade(table):
516522
"""service function to perform cascading deletes recursively."""
517523
max_attempts = 50

tests/schema_simple.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,18 @@ class H(dj.Part):
125125
id_h :int
126126
"""
127127

128-
class I(dj.Part):
129-
definition = """ # test force_masters revisit part
128+
class M(dj.Part):
129+
definition = """ # test force_masters revisit
130130
-> E
131-
id_i :int
131+
id_m :int
132132
---
133-
-> H
133+
-> E.H
134134
"""
135135

136136
def make(self, key):
137137
random.seed(str(key))
138138
l_contents = list(L().fetch("KEY"))
139-
part_f, part_g, part_h, part_i = E.F(), E.G(), E.H(), E.I()
139+
part_f, part_g, part_h, part_m = E.F(), E.G(), E.H(), E.M()
140140
bc_references = list((B.C() & key).fetch("KEY"))
141141
random.shuffle(bc_references)
142142

@@ -148,8 +148,9 @@ def make(self, key):
148148
)
149149
g_inserts = [dict(key, id_g=i, **ref) for i, ref in enumerate(l_contents)]
150150
part_g.insert(g_inserts)
151-
part_h.insert(dict(key, id_h=i) for i in range(4))
152-
part_i.insert(dict(key, id_i=i, **random.choice(g_inserts)) for i in range(4))
151+
h_inserts = [dict(key, id_h=i) for i in range(4)]
152+
part_h.insert(h_inserts)
153+
part_m.insert(dict(key, id_i=i, **random.choice(h_inserts)) for i in range(4))
153154

154155

155156
class F(dj.Manual):

0 commit comments

Comments
 (0)