Fix integration issues after AutoPopulate 2.0 rebase

- Update datetime pattern to allow precision (datetime(6))
- Fix jobs.delete() and jobs.drop() to handle undeclared tables
- Fix jobs.ignore() to update existing pending jobs to ignore status
- Rename _make_tuples to make (deprecated in AutoPopulate 2.0)
- Update conftest.py jobs cleanup to handle list return type
- Fix test_jobs_table_primary_key to ensure table is declared first
- Broaden exception handling in fixture teardown

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: dimitri-yatsenko

src/datajoint/declare.py

@@ -38,7 +38,7 @@
     "blob": (r"blob$", "longblob"),
     # Temporal
     "date": (r"date$", None),
-    "datetime": (r"datetime$", None),
+    "datetime": (r"datetime(\s*\(\d+\))?$", None),
     # String types (with parameters)
     "char": (r"char\s*\(\d+\)$", None),
     "varchar": (r"varchar\s*\(\d+\)$", None),

src/datajoint/jobs.py

@@ -211,10 +211,14 @@ def completed(self) -> QueryExpression:
 
     def delete(self) -> None:
         """Delete jobs without confirmation (inherits from delete_quick)."""
+        if not self.is_declared:
+            return  # Nothing to delete if table doesn't exist
         self.delete_quick()
 
     def drop(self) -> None:
         """Drop the jobs table without confirmation."""
+        if not self.is_declared:
+            return  # Nothing to drop if table doesn't exist
         self.drop_quick()
 
     def refresh(
@@ -420,8 +424,8 @@ def ignore(self, key: dict) -> None:
         """
         Mark a key to be ignored (skipped during populate).
 
-        Only inserts new records. Existing job entries cannot be converted to
-        ignore status - they must be cleared first.
+        If the job already exists, updates its status to "ignore".
+        If the job doesn't exist, creates a new job with "ignore" status.
 
         Args:
             key: Primary key dict for the job
@@ -434,7 +438,8 @@ def ignore(self, key: dict) -> None:
         try:
             self._insert_job_with_status(job_key, "ignore")
         except DuplicateError:
-            pass  # Already tracked
+            # Update existing job to ignore status
+            self.update1({**job_key, "status": "ignore"})
 
     def _insert_job_with_status(self, key: dict, status: str) -> None:
         """Insert a new job with the given status."""

tests/conftest.py

@@ -349,7 +349,8 @@ def clean_autopopulate(experiment, trial, ephys):
 def clean_jobs(schema_any):
     """Cleanup fixture for jobs tests."""
     try:
-        schema_any.jobs.delete()
+        for jobs_table in schema_any.jobs:
+            jobs_table.delete()
     except DataJointError:
         pass
     yield
@@ -375,7 +376,8 @@ def schema_any(connection_test, prefix):
     schema_any = dj.Schema(prefix + "_test1", schema.LOCALS_ANY, connection=connection_test)
     assert schema.LOCALS_ANY, "LOCALS_ANY is empty"
     try:
-        schema_any.jobs.delete()
+        for jobs_table in schema_any.jobs:
+            jobs_table.delete()
     except DataJointError:
         pass
     schema_any(schema.TTest)
@@ -418,9 +420,10 @@ def schema_any(connection_test, prefix):
     schema_any(schema.Longblob)
     yield schema_any
     try:
-        schema_any.jobs.delete()
-    except DataJointError:
-        pass
+        for jobs_table in schema_any.jobs:
+            jobs_table.delete()
+    except Exception:
+        pass  # Ignore cleanup errors (connection may be closed)
     schema_any.drop()
 
 
@@ -430,7 +433,8 @@ def schema_any_fresh(connection_test, prefix):
     schema_any = dj.Schema(prefix + "_test1_fresh", schema.LOCALS_ANY, connection=connection_test)
     assert schema.LOCALS_ANY, "LOCALS_ANY is empty"
     try:
-        schema_any.jobs.delete()
+        for jobs_table in schema_any.jobs:
+            jobs_table.delete()
     except DataJointError:
         pass
     schema_any(schema.TTest)
@@ -473,9 +477,10 @@ def schema_any_fresh(connection_test, prefix):
     schema_any(schema.Longblob)
     yield schema_any
     try:
-        schema_any.jobs.delete()
-    except DataJointError:
-        pass
+        for jobs_table in schema_any.jobs:
+            jobs_table.delete()
+    except Exception:
+        pass  # Ignore cleanup errors (connection may be closed)
     schema_any.drop()
 
 

tests/schema.py

@@ -204,7 +204,7 @@ class Channel(dj.Part):
         current = null : <djblob>   # optional current to test null handling
         """
 
-    def _make_tuples(self, key):
+    def make(self, key):
         """
         populate with random data
         """
@@ -261,7 +261,7 @@ class SigIntTable(dj.Computed):
     -> SimpleSource
     """
 
-    def _make_tuples(self, key):
+    def make(self, key):
         raise KeyboardInterrupt
 
 

tests/schema_simple.py

@@ -103,7 +103,7 @@ class D(dj.Computed):
     -> L
     """
 
-    def _make_tuples(self, key):
+    def make(self, key):
         # make reference to a random tuple from L
         random.seed(str(key))
         lookup = list(L().fetch("KEY"))

tests/test_jobs.py

@@ -30,6 +30,7 @@ def test_jobs_table_name(self, schema_any):
     def test_jobs_table_primary_key(self, schema_any):
         """Test that jobs table has FK-derived primary key."""
         jobs = schema.SigIntTable().jobs
+        jobs._ensure_declared()
         # SigIntTable depends on SimpleSource with pk 'id'
         assert "id" in jobs.primary_key