Commit 9fe2df7
Merge upstream/master into design/restricted-diagram
Resolve conflicts in diagram.py and table.py:
- Adopt master's config access pattern (self._connection._config)
- Keep graph-driven cascade/restrict implementation
- Apply master's declare() config param, split_full_table_name(), _config in store context
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>File tree
39 files changed
+1726
-368
lines changed- docs/design
- src/datajoint
- adapters
- builtin_codecs
- tests
- integration
- unit
39 files changed
+1726
-368
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
46 | | - | |
| 45 | + | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
| 83 | + | |
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
| |||
0 commit comments