f3-data-models 0.5.12__py3-none-any.whl → 0.5.14__py3-none-any.whl

f3_data_models/models.py

@@ -504,7 +504,7 @@ class EventType_x_Event(Base):
 
     __tablename__ = "events_x_event_types"
 
-    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True, onupdate="CASCADE")
+    event_id: Mapped[int] = mapped_column(ForeignKey("events.id", onupdate="CASCADE"), primary_key=True)
     event_type_id: Mapped[int] = mapped_column(ForeignKey("event_types.id"), primary_key=True)
     __table_args__ = (
         Index("idx_events_x_event_types_event_id", "event_id"),
@@ -528,7 +528,7 @@ class EventType_x_EventInstance(Base):
     __tablename__ = "event_instances_x_event_types"
 
     event_instance_id: Mapped[int] = mapped_column(
-        ForeignKey("event_instances.id"), primary_key=True, onupdate="CASCADE"
+        ForeignKey("event_instances.id", onupdate="CASCADE"), primary_key=True
     )
     event_type_id: Mapped[int] = mapped_column(ForeignKey("event_types.id"), primary_key=True)
 
@@ -573,7 +573,7 @@ class EventTag_x_Event(Base):
 
     __tablename__ = "event_tags_x_events"
 
-    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True, onupdate="CASCADE")
+    event_id: Mapped[int] = mapped_column(ForeignKey("events.id", onupdate="CASCADE"), primary_key=True)
     event_tag_id: Mapped[int] = mapped_column(ForeignKey("event_tags.id"), primary_key=True)
 
     event: Mapped["Event"] = relationship(back_populates="event_x_event_tags")
@@ -593,7 +593,7 @@ class EventTag_x_EventInstance(Base):
     __tablename__ = "event_tags_x_event_instances"
 
     event_instance_id: Mapped[int] = mapped_column(
-        ForeignKey("event_instances.id"), primary_key=True, onupdate="CASCADE"
+        ForeignKey("event_instances.id", onupdate="CASCADE"), primary_key=True
     )
     event_tag_id: Mapped[int] = mapped_column(ForeignKey("event_tags.id"), primary_key=True)
 
@@ -745,10 +745,12 @@ class Event(Base):
     event_x_event_types: Mapped[List[EventType_x_Event]] = relationship(
         back_populates="event",
         passive_deletes=True,
+        cascade="all, delete-orphan",
     )
     event_x_event_tags: Mapped[Optional[List[EventTag_x_Event]]] = relationship(
         back_populates="event",
         passive_deletes=True,
+        cascade="all, delete-orphan",
     )
 
 
@@ -800,7 +802,7 @@ class EventInstance(Base):
     id: Mapped[intpk]
     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"))
     location_id: Mapped[Optional[int]] = mapped_column(ForeignKey("locations.id"))
-    series_id: Mapped[Optional[int]] = mapped_column(ForeignKey("events.id"), onupdate="CASCADE")
+    series_id: Mapped[Optional[int]] = mapped_column(ForeignKey("events.id", onupdate="CASCADE"))
     is_active: Mapped[bool] = mapped_column(Boolean, default=True)
     highlight: Mapped[bool] = mapped_column(Boolean, default=False)
     start_date: Mapped[date]
@@ -842,12 +844,18 @@ class EventInstance(Base):
     event_instances_x_event_types: Mapped[List[EventType_x_EventInstance]] = relationship(
         back_populates="event_instance",
         passive_deletes=True,
+        cascade="all, delete-orphan",
     )
     event_instances_x_event_tags: Mapped[Optional[List[EventTag_x_EventInstance]]] = relationship(
         back_populates="event_instance",
         passive_deletes=True,
+        cascade="all, delete-orphan",
+    )
+    attendance: Mapped[List["Attendance"]] = relationship(
+        back_populates="event_instance",
+        passive_deletes=True,
+        cascade="all, delete-orphan",
     )
-    attendance: Mapped[List["Attendance"]] = relationship(back_populates="event_instance", passive_deletes=True)
 
 
 class AttendanceType(Base):
@@ -881,7 +889,7 @@ class Attendance_x_AttendanceType(Base):
 
     __tablename__ = "attendance_x_attendance_types"
 
-    attendance_id: Mapped[int] = mapped_column(ForeignKey("attendance.id"), primary_key=True, onupdate="CASCADE")
+    attendance_id: Mapped[int] = mapped_column(ForeignKey("attendance.id", onupdate="CASCADE"), primary_key=True)
     attendance_type_id: Mapped[int] = mapped_column(ForeignKey("attendance_types.id"), primary_key=True)
 
     attendance: Mapped["Attendance"] = relationship(back_populates="attendance_x_attendance_types")
@@ -1005,7 +1013,7 @@ class Attendance(Base):
     )
 
     id: Mapped[intpk]
-    event_instance_id: Mapped[int] = mapped_column(ForeignKey("event_instances.id"), onupdate="CASCADE")
+    event_instance_id: Mapped[int] = mapped_column(ForeignKey("event_instances.id", onupdate="CASCADE"))
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
     is_planned: Mapped[bool]
     meta: Mapped[Optional[Dict[str, Any]]]
@@ -1018,7 +1026,7 @@ class Attendance(Base):
         innerjoin=False, cascade="expunge", secondary="users", viewonly=True
     )
     attendance_x_attendance_types: Mapped[List[Attendance_x_AttendanceType]] = relationship(
-        back_populates="attendance", passive_deletes=True
+        back_populates="attendance", passive_deletes=True, cascade="all, delete-orphan"
     )
     attendance_types: Mapped[List[AttendanceType]] = relationship(
         secondary="attendance_x_attendance_types",

{f3_data_models-0.5.12.dist-info → f3_data_models-0.5.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: f3-data-models
-Version: 0.5.12
+Version: 0.5.14
 Summary: The data schema and models for F3 Nation applications.
 License: MIT
 Author: Evan Petzoldt

f3_data_models-0.5.14.dist-info/RECORD

@@ -0,0 +1,7 @@
+f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+f3_data_models/models.py,sha256=b_hKsW-5aFbFXsUohdiaVa5rN8xfb0EQ6NvXfTNSoAo,52919
+f3_data_models/testing.py,sha256=uHHgrfMOpUvu6-yOyuMsGadyeN-zuAFRYuGQNpXX4Lk,598
+f3_data_models/utils.py,sha256=LBNy7BXwRY0tqNKGUBoYi6-1Ch9dSLjGysLoes1Jfys,12083
+f3_data_models-0.5.14.dist-info/METADATA,sha256=idfSh-vccUa3BVQbtN-Du6RSSIUAULLz32wh4qzXJy8,3675
+f3_data_models-0.5.14.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+f3_data_models-0.5.14.dist-info/RECORD,,

f3_data_models-0.5.12.dist-info/RECORD

@@ -1,7 +0,0 @@
-f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-f3_data_models/models.py,sha256=on62-MQnvMam4CN0pkFvrAwp83r-pUgmGnbsHasU6Uo,52676
-f3_data_models/testing.py,sha256=uHHgrfMOpUvu6-yOyuMsGadyeN-zuAFRYuGQNpXX4Lk,598
-f3_data_models/utils.py,sha256=LBNy7BXwRY0tqNKGUBoYi6-1Ch9dSLjGysLoes1Jfys,12083
-f3_data_models-0.5.12.dist-info/METADATA,sha256=H_k2dDT_YJUtyuCQOCBDF3GfDY5If2pHwjpZNiw-zts,3675
-f3_data_models-0.5.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-f3_data_models-0.5.12.dist-info/RECORD,,