Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions python_tests/test_enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,14 @@ def test_enum_value_as_default_param(db0_fixture):
assert func_to_test() == ColorsEnum.RED
assert func_to_test(ColorsEnum.GREEN) == ColorsEnum.GREEN
assert func_to_test(ColorsEnum.BLUE) == ColorsEnum.BLUE


def test_enum_value_repr_can_be_added_as_tag(db0_fixture):
obj = MemoTestClass(1)

db0.tags(obj).add(func_to_test())

assert list(db0.find(ColorsEnum.RED)) == [obj]


def test_enum_value_value_repr_compare(db0_fixture):
Expand Down
22 changes: 22 additions & 0 deletions python_tests/test_tag_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,27 @@

import pytest
import dbzero as db0
from dataclasses import dataclass
from dbzero.dbzero import _get_tag_fields
from .memo_test_types import MemoTestClass, KVTestClass


_TAG_FIELDS_ATTR = "__DBZERO_TAG_FIELDS_ATTR"

TagFieldDataclassDefaultStatus = db0.enum(
"TagFieldDataclassDefaultStatus",
values=["lead", "archived"],
)
TagFieldDataclassDefaultStatusValue = type(TagFieldDataclassDefaultStatus.lead)


@db0.memo
@db0.tag_fields("status")
@dataclass(eq=False)
class DataclassEnumDefaultTag:
name: str
status: TagFieldDataclassDefaultStatusValue = TagFieldDataclassDefaultStatus.lead


def _query_names(memo_type, *tags):
return {obj.name for obj in db0.find(memo_type, *tags)}
Expand Down Expand Up @@ -151,6 +166,13 @@ def __init__(self, status):
assert list(db0.find(BufferedInitialTag, "open")) == [obj]


def test_dataclass_enum_default_is_valid_initial_tag(db0_fixture):
obj = DataclassEnumDefaultTag("Avery")

assert obj.status == TagFieldDataclassDefaultStatus.lead
assert list(db0.find(DataclassEnumDefaultTag, TagFieldDataclassDefaultStatus.lead)) == [obj]


def test_initial_tags_use_final_values_and_flush_together(db0_fixture):
@db0.memo
@db0.tag_fields("status", "owner")
Expand Down
3 changes: 3 additions & 0 deletions src/dbzero/object_model/tags/TagIndex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ namespace db0::object_model
case TypeId::MEMO_IMMUTABLE_OBJECT:
case TypeId::DB0_TAG:
case TypeId::DB0_ENUM_VALUE:
case TypeId::DB0_ENUM_VALUE_REPR:
case TypeId::DB0_FIELD_DEF:
case TypeId::DB0_CLASS:
return;
Expand Down Expand Up @@ -1295,6 +1296,8 @@ namespace db0::object_model
return tryAddShortTagFromTag(py_arg);
} else if (type_id == TypeId::DB0_ENUM_VALUE) {
return getShortTagFromEnumValue(py_arg);
} else if (type_id == TypeId::DB0_ENUM_VALUE_REPR) {
return getShortTagFromEnumValueRepr(py_arg);
} else if (type_id == TypeId::DB0_FIELD_DEF) {
return getShortTagFromFieldDef(py_arg);
} else if (type_id == TypeId::DB0_CLASS) {
Expand Down
Loading