Skip to content

Commit 8ab6f26

Browse files
Fix merge integration issues
- declare.py: Support datetime(6) precision in CORE_TYPES pattern - tests/schema.py: Rename _make_tuples to make for AutoPopulate 2.0 API - tests/schema_simple.py: Rename _make_tuples to make for AutoPopulate 2.0 API 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent d899675 commit 8ab6f26

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/datajoint/declare.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"blob": (r"blob$", "longblob"),
3939
# Temporal
4040
"date": (r"date$", None),
41-
"datetime": (r"datetime$", None),
41+
"datetime": (r"datetime(\s*\(\d+\))?$", None),
4242
# String types (with parameters)
4343
"char": (r"char\s*\(\d+\)$", None),
4444
"varchar": (r"varchar\s*\(\d+\)$", None),

tests/schema.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class Channel(dj.Part):
204204
current = null : <djblob> # optional current to test null handling
205205
"""
206206

207-
def _make_tuples(self, key):
207+
def make(self, key):
208208
"""
209209
populate with random data
210210
"""
@@ -261,7 +261,7 @@ class SigIntTable(dj.Computed):
261261
-> SimpleSource
262262
"""
263263

264-
def _make_tuples(self, key):
264+
def make(self, key):
265265
raise KeyboardInterrupt
266266

267267

tests/schema_simple.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class D(dj.Computed):
103103
-> L
104104
"""
105105

106-
def _make_tuples(self, key):
106+
def make(self, key):
107107
# make reference to a random tuple from L
108108
random.seed(str(key))
109109
lookup = list(L().fetch("KEY"))

0 commit comments

Comments
 (0)