Update test schemas to use core DataJoint types

- Replace int/smallint/tinyint with int32/int16/uint8
- Replace float/double with float32/float64
- Replace timestamp with datetime
- Convert Auto from autoincrement to explicit Lookup values
- Update fixture teardown to check schema.exists
- Update test_alter_part regex to handle type comments

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

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

Author: dimitri-yatsenko

tests/conftest.py

@@ -574,12 +574,13 @@ def schema_any(connection_test, prefix):
     # Restore original config value after all tables are declared
     dj.config.jobs.allow_new_pk_fields_in_computed_tables = original_value
     yield schema_any
-    # Clean up job tables before dropping schema
-    for job in schema_any.jobs:
-        try:
-            job.delete()
-        except DataJointError:
-            pass
+    # Clean up job tables before dropping schema (if schema still exists)
+    if schema_any.exists:
+        for job in schema_any.jobs:
+            try:
+                job.delete()
+            except DataJointError:
+                pass
     schema_any.drop()
 
 
@@ -638,12 +639,13 @@ def schema_any_fresh(connection_test, prefix):
     # Restore original config value after all tables are declared
     dj.config.jobs.allow_new_pk_fields_in_computed_tables = original_value
     yield schema_any
-    # Clean up job tables before dropping schema
-    for job in schema_any.jobs:
-        try:
-            job.delete()
-        except DataJointError:
-            pass
+    # Clean up job tables before dropping schema (if schema still exists)
+    if schema_any.exists:
+        for job in schema_any.jobs:
+            try:
+                job.delete()
+            except DataJointError:
+                pass
     schema_any.drop()
 
 

tests/integration/test_alter.py

@@ -45,9 +45,10 @@ def test_alter_part(self, schema_alter):
         """
         https://github.com/datajoint/datajoint-python/issues/936
         """
-        self.verify_alter(schema_alter, table=Parent.Child, attribute_sql="`child_id` .* DEFAULT NULL")
+        # Regex includes optional COMMENT for type annotations
+        self.verify_alter(schema_alter, table=Parent.Child, attribute_sql=r"`child_id` .* DEFAULT NULL[^,]*")
         self.verify_alter(
             schema_alter,
             table=Parent.Grandchild,
-            attribute_sql="`grandchild_id` .* DEFAULT NULL",
+            attribute_sql=r"`grandchild_id` .* DEFAULT NULL[^,]*",
         )

tests/integration/test_declare.py

@@ -114,18 +114,17 @@ class Type(dj.Part):
 
 def test_attributes(schema_any):
     """
-    Test autoincrement declaration
+    Test attribute declarations
     """
     auto = Auto()
-    auto.fill()
     subject = Subject()
     experiment = Experiment()
     trial = Trial()
     ephys = Ephys()
     channel = Ephys.Channel()
 
     assert auto.heading.names == ["id", "name"]
-    assert auto.heading.attributes["id"].autoincrement
+    assert auto.heading.attributes["id"].numeric
 
     # test attribute declarations
     assert subject.heading.names == [

tests/schema.py

@@ -16,36 +16,36 @@ class TTest(dj.Lookup):
     """
 
     definition = """
-    key   :   int     # key
+    key   :   int32     # key
     ---
-    value   :   int     # value
+    value   :   int32     # value
     """
     contents = [(k, 2 * k) for k in range(10)]
 
 
 class TTest2(dj.Manual):
     definition = """
-    key   :   int     # key
+    key   :   int32     # key
     ---
-    value   :   int     # value
+    value   :   int32     # value
     """
 
 
 class TTest3(dj.Manual):
     definition = """
-    key : int
+    key : int32
     ---
     value : varchar(300)
     """
 
 
 class NullableNumbers(dj.Manual):
     definition = """
-    key : int
+    key : int32
     ---
-    fvalue = null : float
-    dvalue = null : double
-    ivalue = null : int
+    fvalue = null : float32
+    dvalue = null : float64
+    ivalue = null : int32
     """
 
 
@@ -54,7 +54,7 @@ class TTestExtra(dj.Manual):
     clone of Test but with an extra field
     """
 
-    definition = TTest.definition + "\nextra : int # extra int\n"
+    definition = TTest.definition + "\nextra : int32 # extra int\n"
 
 
 class TTestNoExtra(dj.Manual):
@@ -67,14 +67,11 @@ class TTestNoExtra(dj.Manual):
 
 class Auto(dj.Lookup):
     definition = """
-    id  :int auto_increment
+    id  : uint8
     ---
     name :varchar(12)
     """
-
-    def fill(self):
-        if not self:
-            self.insert([dict(name="Godel"), dict(name="Escher"), dict(name="Bach")])
+    contents = [(1, "Godel"), (2, "Escher"), (3, "Bach")]
 
 
 class User(dj.Lookup):
@@ -94,7 +91,7 @@ class User(dj.Lookup):
 
 class Subject(dj.Lookup):
     definition = """  # Basic information about animal subjects used in experiments
-    subject_id   :int  #  unique subject id
+    subject_id   :int32  #  unique subject id
     ---
     real_id            :varchar(40)  # real-world name. Omit if the same as subject_id
     species = "mouse"  :enum('mouse', 'monkey', 'human')
@@ -131,13 +128,13 @@ class Language(dj.Lookup):
 class Experiment(dj.Imported):
     definition = """  # information about experiments
     -> Subject
-    experiment_id  :smallint  # experiment number for this subject
+    experiment_id  :int16  # experiment number for this subject
     ---
     experiment_date  :date   # date when experiment was started
     -> [nullable] User
     data_path=""     :varchar(255)  # file path to recorded data
     notes=""         :varchar(2048) # e.g. purpose of experiment
-    entry_time=CURRENT_TIMESTAMP :timestamp   # automatic timestamp
+    entry_time=CURRENT_TIMESTAMP :datetime   # automatic timestamp
     """
 
     fake_experiments_per_subject = 5
@@ -164,17 +161,17 @@ def make(self, key):
 class Trial(dj.Imported):
     definition = """   # a trial within an experiment
     -> Experiment.proj(animal='subject_id')
-    trial_id  :smallint   # trial number
+    trial_id  :int16   # trial number
     ---
-    start_time                 :double      # (s)
+    start_time                 :float64      # (s)
     """
 
     class Condition(dj.Part):
         definition = """   # trial conditions
         -> Trial
-        cond_idx : smallint   # condition number
+        cond_idx : int16   # condition number
         ----
-        orientation :  float   # degrees
+        orientation :  float32   # degrees
         """
 
     def make(self, key):
@@ -191,14 +188,14 @@ class Ephys(dj.Imported):
     definition = """    # some kind of electrophysiological recording
     -> Trial
     ----
-    sampling_frequency :double  # (Hz)
+    sampling_frequency :float64  # (Hz)
     duration           :decimal(7,3)  # (s)
     """
 
     class Channel(dj.Part):
         definition = """     # subtable containing individual channels
         -> master
-        channel    :tinyint unsigned   # channel number within Ephys
+        channel    :uint8   # channel number within Ephys
         ----
         voltage    : <blob>
         current = null : <blob>   # optional current to test null handling
@@ -226,15 +223,15 @@ def _make_tuples(self, key):
 class Image(dj.Manual):
     definition = """
     # table for testing blob inserts
-    id           : int # image identifier
+    id           : int32 # image identifier
     ---
     img             : <blob> # image
     """
 
 
 class UberTrash(dj.Lookup):
     definition = """
-    id : int
+    id : int32
     ---
     """
     contents = [(1,)]
@@ -243,15 +240,15 @@ class UberTrash(dj.Lookup):
 class UnterTrash(dj.Lookup):
     definition = """
     -> UberTrash
-    my_id   : int
+    my_id   : int32
     ---
     """
     contents = [(1, 1), (1, 2)]
 
 
 class SimpleSource(dj.Lookup):
     definition = """
-    id : int  # id
+    id : int32  # id
     """
     contents = [(x,) for x in range(10)]
 
@@ -311,24 +308,24 @@ class IndexRich(dj.Manual):
     ---
     -> [unique, nullable] User.proj(first="username")
     first_date : date
-    value : int
+    value : int32
     index (first_date, value)
     """
 
 
 #  Schema for issue 656
 class ThingA(dj.Manual):
     definition = """
-    a: int
+    a: int32
     """
 
 
 class ThingB(dj.Manual):
     definition = """
-    b1: int
-    b2: int
+    b1: int32
+    b2: int32
     ---
-    b3: int
+    b3: int32
     """
 
 
@@ -343,7 +340,7 @@ class ThingC(dj.Manual):
 #  Additional tables for #1159
 class ThingD(dj.Manual):
     definition = """
-    d: int
+    d: int32
     ---
     -> ThingC
     """
@@ -357,7 +354,7 @@ class ThingE(dj.Manual):
 
 class Parent(dj.Lookup):
     definition = """
-    parent_id: int
+    parent_id: int32
     ---
     name: varchar(30)
     """
@@ -367,7 +364,7 @@ class Parent(dj.Lookup):
 class Child(dj.Lookup):
     definition = """
     -> Parent
-    child_id: int
+    child_id: int32
     ---
     name: varchar(30)
     """
@@ -376,12 +373,12 @@ class Child(dj.Lookup):
 
 # Related to issue #886 (8), #883 (5)
 class ComplexParent(dj.Lookup):
-    definition = "\n".join(["parent_id_{}: int".format(i + 1) for i in range(8)])
+    definition = "\n".join(["parent_id_{}: int32".format(i + 1) for i in range(8)])
     contents = [tuple(i for i in range(8))]
 
 
 class ComplexChild(dj.Lookup):
-    definition = "\n".join(["-> ComplexParent"] + ["child_id_{}: int".format(i + 1) for i in range(1)])
+    definition = "\n".join(["-> ComplexParent"] + ["child_id_{}: int32".format(i + 1) for i in range(1)])
     contents = [tuple(i for i in range(9))]
 
 
@@ -443,16 +440,16 @@ class SessionDateA(dj.Lookup):
 
 class Stimulus(dj.Lookup):
     definition = """
-    id: int
+    id: int32
     ---
-    contrast: int
-    brightness: int
+    contrast: int32
+    brightness: int32
     """
 
 
 class Longblob(dj.Manual):
     definition = """
-    id: int
+    id: int32
     ---
     data: <blob>
     """

tests/schema_alter.py

@@ -6,30 +6,30 @@
 class Experiment(dj.Imported):
     original_definition = """  # information about experiments
     -> Subject
-    experiment_id  :smallint  # experiment number for this subject
+    experiment_id  :int16  # experiment number for this subject
     ---
     experiment_date  :date   # date when experiment was started
     -> [nullable] User
     data_path=""     :varchar(255)  # file path to recorded data
     notes=""         :varchar(2048) # e.g. purpose of experiment
-    entry_time=CURRENT_TIMESTAMP :timestamp   # automatic timestamp
+    entry_time=CURRENT_TIMESTAMP :datetime   # automatic timestamp
     """
 
     definition1 = """  # Experiment
     -> Subject
-    experiment_id  :smallint  # experiment number for this subject
+    experiment_id  :int16  # experiment number for this subject
     ---
-    data_path     : int  # some number
+    data_path     : int32  # some number
     extra=null : <blob>  # just testing
     -> [nullable] User
     subject_notes=null         :varchar(2048) # {notes} e.g. purpose of experiment
-    entry_time=CURRENT_TIMESTAMP :timestamp   # automatic timestamp
+    entry_time=CURRENT_TIMESTAMP :datetime   # automatic timestamp
     """
 
 
 class Parent(dj.Manual):
     definition = """
-    parent_id: int
+    parent_id: int32
     """
 
     class Child(dj.Part):
@@ -39,7 +39,7 @@ class Child(dj.Part):
         definition_new = """
         -> master
         ---
-        child_id=null: int
+        child_id=null: int32
         """
 
     class Grandchild(dj.Part):
@@ -49,7 +49,7 @@ class Grandchild(dj.Part):
         definition_new = """
         -> master.Child
         ---
-        grandchild_id=null: int
+        grandchild_id=null: int32
         """