Merge pre/v2.0

Author: claude

src/datajoint/declare.py

@@ -17,7 +17,7 @@
 UUID_DATA_TYPE = "binary(16)"
 
 # Type aliases for numeric types
-TYPE_ALIASES = {
+SQL_TYPE_ALIASES = {
     "FLOAT32": "float",
     "FLOAT64": "double",
     "INT64": "bigint",
@@ -80,7 +80,7 @@
     "FILEPATH",
     "OBJECT",
     "ADAPTED",
-} | set(TYPE_ALIASES)
+} | set(SQL_TYPE_ALIASES)
 NATIVE_TYPES = set(TYPE_PATTERN) - SPECIAL_TYPES
 EXTERNAL_TYPES = {
     "EXTERNAL_ATTACH",
@@ -492,8 +492,8 @@ def substitute_special_type(match, category, foreign_key_sql, context):
         if category in SPECIAL_TYPES:
             # recursive redefinition from user-defined datatypes.
             substitute_special_type(match, category, foreign_key_sql, context)
-    elif category in TYPE_ALIASES:
-        match["type"] = TYPE_ALIASES[category]
+    elif category in SQL_TYPE_ALIASES:
+        match["type"] = SQL_TYPE_ALIASES[category]
     else:
         assert False, "Unknown special type"
 

tests/test_type_aliases.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from datajoint.declare import TYPE_ALIASES, SPECIAL_TYPES, match_type
+from datajoint.declare import SQL_TYPE_ALIASES, SPECIAL_TYPES, match_type
 
 from .schema_type_aliases import TypeAliasTable, TypeAliasPrimaryKey, TypeAliasNullable
 
@@ -33,7 +33,7 @@ def test_type_alias_pattern_matching(self, alias, expected_category):
         category = match_type(alias)
         assert category == expected_category
         assert category in SPECIAL_TYPES
-        assert category in TYPE_ALIASES
+        assert category in SQL_TYPE_ALIASES
 
     @pytest.mark.parametrize(
         "alias,expected_mysql_type",
@@ -54,7 +54,7 @@ def test_type_alias_pattern_matching(self, alias, expected_category):
     def test_type_alias_mysql_mapping(self, alias, expected_mysql_type):
         """Test that type aliases map to correct MySQL types."""
         category = match_type(alias)
-        mysql_type = TYPE_ALIASES[category]
+        mysql_type = SQL_TYPE_ALIASES[category]
         assert mysql_type == expected_mysql_type
 
     @pytest.mark.parametrize(