rococo 1.2.0__tar.gz → 1.2.1__tar.gz

{rococo-1.2.0 → rococo-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rococo
-Version: 1.2.0
+Version: 1.2.1
 Summary: A Python library to help build things the way we want them built
 Home-page: https://github.com/EcorRouge/rococo
 Author: Jay Grieves

{rococo-1.2.0 → rococo-1.2.1}/rococo/data/postgresql.py

@@ -160,7 +160,8 @@ class PostgreSQLAdapter(DbAdapter):
             conditions: Dict[str, Any],
             sort: List[Tuple[str, str]] = None,
             join_statements: list = None,
-            additional_fields: list = None
+            additional_fields: list = None,
+            active: bool = True
     ) -> Optional[Dict[str, Any]]:
         fields = [f'{table}.*']
         if additional_fields:
@@ -175,7 +176,8 @@ class PostgreSQLAdapter(DbAdapter):
         if conditions:
             condition_strs_values = [self._build_condition_string(
                 table, k, v) for k, v in conditions.items()]
-        condition_strs_values.append((f"{table}.active = %s", ['true']))
+        if active:
+            condition_strs_values.append((f"{table}.active = %s", ['true']))
         query += f" WHERE {' AND '.join([condition_str for condition_str, condition_value in condition_strs_values])}"
 
         if sort:

{rococo-1.2.0 → rococo-1.2.1}/rococo/data/surrealdb.py

@@ -108,7 +108,8 @@ class SurrealDbAdapter(DbAdapter):
         conditions: Dict[str, Any],
         sort: List[Tuple[str, str]] = None,
         fetch_related: list = None,
-        additional_fields: list = None
+        additional_fields: list = None,
+        active: bool = True
     ) -> Dict[str, Any]:
         fields = ['*']
         if additional_fields:
@@ -120,7 +121,8 @@ class SurrealDbAdapter(DbAdapter):
         if conditions:
             condition_strs = [
                 f"{self._build_condition_string(k, v)}" for k, v in conditions.items()]
-        condition_strs.append("active=true")
+        if active:
+            condition_strs.append("active=true")
         query += f" WHERE {' AND '.join(condition_strs)}"
 
         if sort:

{rococo-1.2.0 → rococo-1.2.1}/rococo/repositories/postgresql/postgresql_repository.py

@@ -79,7 +79,8 @@ class PostgreSQLRepository(BaseRepository):
             conditions = self._adjust_conditions(conditions)
 
         data = self._execute_within_context(
-            self.adapter.get_one, self.table_name, conditions
+            self.adapter.get_one, self.table_name, conditions,
+            active=self._is_versioned_model()
         )
 
         if not data:
@@ -118,7 +119,8 @@ class PostgreSQLRepository(BaseRepository):
             conditions = self._adjust_conditions(conditions)
         # Fetch the records
         records = self._execute_within_context(
-            self.adapter.get_many, self.table_name, conditions, sort, limit, offset
+            self.adapter.get_many, self.table_name, conditions, sort, limit, offset,
+            active=self._is_versioned_model()
         )
 
         # If the adapter returned a single dictionary, wrap it in a list
@@ -164,8 +166,11 @@ class PostgreSQLRepository(BaseRepository):
             int: The count of matching records.
         """
         # Prepare the actual conditions for the database query
-        # Default conditions from BaseRepository
-        db_conditions = {'latest': True, 'active': True}
+        # Only add versioning filters for VersionedModel
+        if self._is_versioned_model():
+            db_conditions = {'latest': True, 'active': True}
+        else:
+            db_conditions = {}
         if query:  # Ensure query is not None before updating
             actual_query = self._adjust_conditions(
                 query.copy())  # Adjust UUIDs in query

{rococo-1.2.0 → rococo-1.2.1}/rococo/repositories/surrealdb/surreal_db_repository.py

@@ -197,7 +197,8 @@ class SurrealDbRepository(BaseRepository):
             self.table_name,
             conditions,
             fetch_related=fetch_related,
-            additional_fields=additional_fields
+            additional_fields=additional_fields,
+            active=self._is_versioned_model()
         )
         # prep model context
         self.model()
@@ -265,7 +266,8 @@ class SurrealDbRepository(BaseRepository):
             sort=sort,
             limit=limit,
             fetch_related=fetch_related,
-            additional_fields=additional_fields
+            additional_fields=additional_fields,
+            active=self._is_versioned_model()
         )
         if isinstance(raw, dict):
             raw = [raw]

{rococo-1.2.0 → rococo-1.2.1}/rococo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rococo
-Version: 1.2.0
+Version: 1.2.1
 Summary: A Python library to help build things the way we want them built
 Home-page: https://github.com/EcorRouge/rococo
 Author: Jay Grieves

{rococo-1.2.0 → rococo-1.2.1}/setup.py

@@ -64,7 +64,7 @@ extras_require["all"] = [
 
 setup(
     name='rococo',
-    version='1.2.0',
+    version='1.2.1',
     packages=find_packages(),
     url='https://github.com/EcorRouge/rococo',
     license='MIT',

{rococo-1.2.0 → rococo-1.2.1}/tests/postgre_repository_test.py

@@ -238,7 +238,8 @@ def test_get_one_existing_record(repository, mock_adapter, model_instance):
     # In this case, 'entity_id' value is a single UUID, adjust_conditions doesn't modify it.
     mock_adapter.get_one.assert_called_once_with(
         repository.table_name,
-        query_conditions  # adjust_conditions doesn't change single UUID values
+        query_conditions,  # adjust_conditions doesn't change single UUID values
+        active=True  # VersionedModel passes active=True
     )
     mock_adapter.__enter__.assert_called_once()
     mock_adapter.__exit__.assert_called_once()
@@ -256,7 +257,8 @@ def test_get_one_with_uuid_list_in_conditions(repository, mock_adapter, model_in
 
     mock_adapter.get_one.assert_called_once_with(
         repository.table_name,
-        expected_conditions_for_adapter
+        expected_conditions_for_adapter,
+        active=True  # VersionedModel passes active=True
     )
 
 
@@ -293,7 +295,8 @@ def test_get_many_records(repository, mock_adapter, test_user_id):
         query_conditions,  # adjust_conditions doesn't change this specific query_conditions
         [('name', 'ASC')],
         10,
-        0
+        0,
+        active=True  # VersionedModel passes active=True
     )