statikk 0.1.4__tar.gz → 0.1.5__tar.gz

{statikk-0.1.4 → statikk-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: statikk
-Version: 0.1.4
+Version: 0.1.5
 Summary: statikk is a single table application (STA) library for DynamoDb.
 Home-page: https://github.com/terinia/statikk
 Author: Balint Biro

{statikk-0.1.4 → statikk-0.1.5}/src/statikk/engine.py

@@ -313,7 +313,9 @@ class Table:
             raise InvalidIndexNameError(f"The provided index name '{index_name}' is not configured on the table.")
         index = index_filter[0]
         key_condition = hash_key.evaluate(index.hash_key.name)
-        if range_key is None and FIELD_STATIKK_TYPE not in model_class.index_definitions()[index_name].pk_fields:
+        if (
+            not range_key or (range_key and range_key.value != model_class.type())
+        ) and FIELD_STATIKK_TYPE not in model_class.index_definitions()[index_name].pk_fields:
             range_key = BeginsWith(model_class.type())
         if range_key:
             if not model_class.is_nested():

{statikk-0.1.4 → statikk-0.1.5}/src/statikk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: statikk
-Version: 0.1.4
+Version: 0.1.5
 Summary: statikk is a single table application (STA) library for DynamoDb.
 Home-page: https://github.com/terinia/statikk
 Author: Balint Biro

{statikk-0.1.4 → statikk-0.1.5}/tests/test_engine.py

@@ -13,6 +13,7 @@ from statikk.engine import (
     InvalidIndexNameError,
     ItemNotFoundError,
 )
+from statikk.fields import FIELD_STATIKK_TYPE
 from statikk.models import (
     DatabaseModel,
     KeySchema,
@@ -670,13 +671,13 @@ def test_query_no_range_key_provided():
     mock_dynamodb().stop()
 
 
-def test_query_no_range_is_provided_but_model_does_not_include_type_in_range_key():
+def test_query_hash_key_is_type():
     class Model(DatabaseModel):
         tier: str
 
         @classmethod
         def index_definitions(cls) -> dict[str, IndexFieldConfig]:
-            return {"main-index": IndexFieldConfig(pk_fields=["__statikk_type"], sk_fields=["tier"])}
+            return {"main-index": IndexFieldConfig(pk_fields=[FIELD_STATIKK_TYPE], sk_fields=["tier"])}
 
     mock_dynamodb().start()
     table = Table(