Merge pull request #74 from DataIntegrationGroup/jir-lexicon-cascade

NO TICKET: Cascade lexicon term updates

Author: jirhiker

db/base.py

@@ -40,8 +40,15 @@ class Base(DeclarativeBase):
 make_searchable(Base.metadata)
 
 
-def lexicon_term(**kw):
-    return mapped_column(String(100), ForeignKey("lexicon_term.term"), **kw)
+def lexicon_term(foreignkeykw=None, **kw):
+
+    fkw = foreignkeykw if foreignkeykw else {}
+
+    return mapped_column(
+        String(100),
+        ForeignKey("lexicon_term.term", onupdate="CASCADE", **fkw),
+        **kw,
+    )
 
 
 def pascal_to_snake(name):

db/lexicon.py

@@ -16,7 +16,7 @@
 from sqlalchemy import String, Integer, ForeignKey
 from sqlalchemy.orm import mapped_column, relationship
 
-from db.base import AutoBaseMixin, Base
+from db.base import AutoBaseMixin, Base, lexicon_term
 
 
 class Lexicon(Base, AutoBaseMixin):
@@ -60,9 +60,7 @@ class TermCategoryAssociation(Base, AutoBaseMixin):
 
     __tablename__ = "lexicon_term_category_association"
 
-    lexicon_term = mapped_column(
-        String(100), ForeignKey("lexicon_term.term", ondelete="CASCADE"), nullable=False
-    )
+    lexicon_term = lexicon_term(foreignkeykw={"ondelete": "CASCADE"})
     category_name = mapped_column(
         String(255),
         ForeignKey("lexicon_category.name", ondelete="CASCADE"),
@@ -82,13 +80,9 @@ class LexiconTriple(Base, AutoBaseMixin):
     This can be used to represent relationships between terms.
     """
 
-    subject = mapped_column(
-        String(100), ForeignKey("lexicon_term.term", ondelete="CASCADE"), nullable=False
-    )
+    subject = lexicon_term(nullable=False)
     predicate = mapped_column(String(100), nullable=False)
-    object_ = mapped_column(
-        String(100), ForeignKey("lexicon_term.term", ondelete="CASCADE"), nullable=False
-    )
+    object_ = lexicon_term(nullable=False)
 
     subject_term = relationship("Lexicon", foreign_keys=[subject])
     object_term = relationship("Lexicon", foreign_keys=[object_])