Merge branch 'master' into pro-1562-recipients-order

Author: BreathingFlesh

src/onegov/core/orm/mixins/content.py

@@ -2,7 +2,7 @@
 
 from markupsafe import escape, Markup
 from onegov.core.orm.types import MarkupText
-from sqlalchemy import func, type_coerce
+from sqlalchemy import func, literal, type_coerce
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import mapped_column, Mapped
 from onegov.core.orm.types import JSON
@@ -323,7 +323,7 @@ def _default_deleter(self, instance: object) -> None:
 
     def _default_expr(self, owner: type[Any]) -> ColumnElement[T]:
         column: ColumnElement[dict[str, Any]] = getattr(owner, self.attribute)
-        expr = column[self.key]
+        expr = column[literal(self.key, literal_execute=True)]
         coerced = False
         if self.value_type is None:
             pass

src/onegov/election_day/collections/archived_results.py

@@ -580,11 +580,11 @@ def get_latest_year_by_municipality(self) -> dict[str, int]:
         year_col = cast(extract('year', ArchivedResult.date), Integer)
         rows = (
             self.session.query(
-                ArchivedResult.meta['domain_segment'].astext,
+                ArchivedResult.domain_segment,
                 func.max(year_col),
             )
             .filter(ArchivedResult.domain == 'municipality')
-            .group_by(ArchivedResult.meta['domain_segment'].astext)
+            .group_by(ArchivedResult.domain_segment)
             .all()
         )
         return {name: year for name, year in rows if name}
@@ -595,8 +595,7 @@ def get_years(self) -> list[int]:
         query = query.filter(ArchivedResult.domain == 'municipality')
         if self.municipality:
             query = query.filter(
-                ArchivedResult.meta['domain_segment'].astext
-                == self.municipality
+                ArchivedResult.domain_segment == self.municipality
             )
         query = query.order_by(desc(year_col))
         return [y for y, in query]
@@ -612,7 +611,7 @@ def _municipality_query(
             ArchivedResult.type.in_(['election', 'vote', 'complex_vote'])
         )
         query = query.filter(
-            ArchivedResult.meta['domain_segment'].astext == municipality
+            ArchivedResult.domain_segment == municipality
         )
         return query.order_by(
             ArchivedResult.date,
@@ -796,7 +795,7 @@ def term_filter(self) -> tuple[
                 ArchivedResult.title, term, self.locale
             ),
             SearchableArchivedResultCollection.filter_text_by_locale(
-                ArchivedResult.meta['domain_segment'].astext, term, self.locale
+                ArchivedResult.domain_segment, term, self.locale
             )
         )
 

src/onegov/election_day/models/archived_result.py

@@ -134,9 +134,10 @@ def title_prefix(self, request: ElectionDayRequest) -> str:
 
         return ''
 
-    @property
-    def domain_segment(self) -> str | None:
-        return (self.meta or {}).get('domain_segment') or None
+    #: The municipality name for results with a `municipality` domain.
+    domain_segment: dict_property[str | None] = meta_property(
+        'domain_segment', value_type=str
+    )
 
     #: Shortcode for cantons that use it
     shortcode: Mapped[str | None]