Merge pull request #46 from tomsch420/main

[ORMaitc] added tests for uuid

Author: tomsch420

test/conftest.py

@@ -1,9 +1,11 @@
 import logging
 import os
 import traceback
+import uuid
 from dataclasses import is_dataclass
 
 import pytest
+import sqlalchemy
 from sqlalchemy import create_engine
 from sqlalchemy.orm import Session, configure_mappers
 
@@ -74,9 +76,7 @@ def generate_sqlalchemy_interface():
 
     instance = ORMatic(
         class_dependency_graph=class_diagram,
-        type_mappings={
-            PhysicalObject: ConceptType,
-        },
+        type_mappings={PhysicalObject: ConceptType, uuid.UUID: sqlalchemy.UUID},
         alternative_mappings=recursive_subclasses(AlternativeMapping),
     )
 

test/dataset/example_classes.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import importlib
+import uuid
 from dataclasses import dataclass, field
 from datetime import datetime
 from enum import Enum
@@ -549,3 +550,8 @@ def custom_static_method():
 
 def module_level_function():
     return 1
+
+
+@dataclass
+class UUIDWrapper:
+    identification: uuid.UUID

test/dataset/ormatic_interface.py

@@ -21,10 +21,12 @@
 import krrood.entity_query_language.symbol_graph
 import krrood.ormatic.alternative_mappings
 import krrood.ormatic.custom_types
+import sqlalchemy.sql.sqltypes
 import test.dataset.example_classes
 import test.dataset.semantic_world_like_classes
 import typing
 import typing_extensions
+import uuid
 
 
 from krrood.ormatic.dao import DataAccessObject
@@ -34,6 +36,7 @@
 class Base(DeclarativeBase):
     type_mappings = {
         test.dataset.example_classes.PhysicalObject: test.dataset.example_classes.ConceptType,
+        uuid.UUID: sqlalchemy.sql.sqltypes.UUID,
         typing.Type: krrood.ormatic.custom_types.TypeType,
     }
 
@@ -1208,6 +1211,19 @@ class TransformationMappedDAO(
     }
 
 
+class UUIDWrapperDAO(Base, DataAccessObject[test.dataset.example_classes.UUIDWrapper]):
+
+    __tablename__ = "UUIDWrapperDAO"
+
+    database_id: Mapped[builtins.int] = mapped_column(
+        Integer, primary_key=True, use_existing_column=True
+    )
+
+    identification: Mapped[sqlalchemy.sql.sqltypes.UUID] = mapped_column(
+        sqlalchemy.sql.sqltypes.UUID, nullable=False, use_existing_column=True
+    )
+
+
 class VectorMappedDAO(
     SymbolDAO, DataAccessObject[test.dataset.example_classes.VectorMapped]
 ):

test/test_ormatic/test_interface.py

@@ -528,3 +528,13 @@ def test_callable_mapping(session, database):
 
     from_dao = dao.from_dao()
     assert from_dao.func() == 1
+
+
+def test_uuid(session, database):
+    obj = UUIDWrapper(uuid.uuid4())
+    dao = to_dao(obj)
+    session.add(dao)
+    session.commit()
+
+    queried = session.scalars(select(UUIDWrapperDAO)).one()
+    assert queried.identification == obj.identification