Replace constraints name refs by column refs (#67)

src/dialect_map_core/models/jargon.py

@@ -10,6 +10,36 @@
 from .__utils import generate_id
 
 
+class JargonGroup(Base, ArchivalModel):
+    """
+    Jargon group to relate jargons with similar meaning.
+    Contains all the static properties of a jargon group
+    """
+
+    __tablename__ = "jargon_groups"
+
+    group_id = Column(String(32), nullable=False, primary_key=True, default=generate_id)
+    description = Column(String(256), nullable=False)
+
+    # All main table relationships to child tables. References:
+    # Official docs: https://docs.sqlalchemy.org/en/20/orm/basic_relationships.html
+    # Stackoverflow: https://stackoverflow.com/a/38770040
+    jargons = relationship(
+        argument="Jargon",
+        backref="jargons",
+        passive_deletes=True,
+    )
+
+    @property
+    def id(self) -> str:
+        """
+        Gets the unique ID of the data object
+        :return: unique ID
+        """
+
+        return self.group_id
+
+
 class Jargon(Base, ArchivalModel):
     """
     Jargon term related information record.
@@ -25,8 +55,8 @@ class Jargon(Base, ArchivalModel):
 
     __table_args__ = (
         FKConstraint(
-            columns=("group_id",),
-            refcolumns=("jargon_groups.group_id",),
+            columns=[group_id],
+            refcolumns=[JargonGroup.group_id],
             ondelete="CASCADE",
         ),
     )
@@ -53,33 +83,3 @@ def id(self) -> str:
         """
 
         return self.jargon_id
-
-
-class JargonGroup(Base, ArchivalModel):
-    """
-    Jargon group to relate jargons with similar meaning.
-    Contains all the static properties of a jargon group
-    """
-
-    __tablename__ = "jargon_groups"
-
-    group_id = Column(String(32), nullable=False, primary_key=True, default=generate_id)
-    description = Column(String(256), nullable=False)
-
-    # All main table relationships to child tables. References:
-    # Official docs: https://docs.sqlalchemy.org/en/20/orm/basic_relationships.html
-    # Stackoverflow: https://stackoverflow.com/a/38770040
-    jargons = relationship(
-        argument="Jargon",
-        backref="jargons",
-        passive_deletes=True,
-    )
-
-    @property
-    def id(self) -> str:
-        """
-        Gets the unique ID of the data object
-        :return: unique ID
-        """
-
-        return self.group_id

src/dialect_map_core/models/membership.py

@@ -8,6 +8,8 @@
 
 from .base import Base
 from .base import StaticModel
+from .category import Category
+from .paper import Paper
 from .__utils import generate_id
 
 
@@ -29,16 +31,16 @@ class CategoryMembership(Base, StaticModel):
     # Stackoverflow: https://stackoverflow.com/a/7506168
     __table_args__ = (
         FKConstraint(
-            columns=("arxiv_id", "arxiv_rev"),
-            refcolumns=("papers.arxiv_id", "papers.arxiv_rev"),
+            columns=[arxiv_id, arxiv_rev],
+            refcolumns=[Paper.arxiv_id, Paper.arxiv_rev],
             ondelete="CASCADE",
         ),
         FKConstraint(
-            columns=("category_id",),
-            refcolumns=("categories.category_id",),
+            columns=[category_id],
+            refcolumns=[Category.category_id],
             ondelete="CASCADE",
         ),
-        UniqueConstraint("arxiv_id", "arxiv_rev", "category_id"),
+        UniqueConstraint(arxiv_id, arxiv_rev, category_id),
     )
 
     @property

src/dialect_map_core/models/metrics.py

@@ -8,6 +8,9 @@
 
 from .base import Base
 from .base import StaticModel
+from .category import Category
+from .jargon import Jargon
+from .paper import Paper
 from .__utils import generate_id
 
 
@@ -27,13 +30,13 @@ class JargonCategoryMetrics(Base, StaticModel):
 
     __table_args__ = (
         FKConstraint(
-            columns=("jargon_id",),
-            refcolumns=("jargons.jargon_id",),
+            columns=[jargon_id],
+            refcolumns=[Jargon.jargon_id],
             ondelete="CASCADE",
         ),
         FKConstraint(
-            columns=("category_id",),
-            refcolumns=("categories.category_id",),
+            columns=[category_id],
+            refcolumns=[Category.category_id],
             ondelete="CASCADE",
         ),
     )
@@ -68,13 +71,13 @@ class JargonPaperMetrics(Base, StaticModel):
     # Stackoverflow: https://stackoverflow.com/a/7506168
     __table_args__ = (
         FKConstraint(
-            columns=("jargon_id",),
-            refcolumns=("jargons.jargon_id",),
+            columns=[jargon_id],
+            refcolumns=[Jargon.jargon_id],
             ondelete="CASCADE",
         ),
         FKConstraint(
-            columns=("arxiv_id", "arxiv_rev"),
-            refcolumns=("papers.arxiv_id", "papers.arxiv_rev"),
+            columns=[arxiv_id, arxiv_rev],
+            refcolumns=[Paper.arxiv_id, Paper.arxiv_rev],
             ondelete="CASCADE",
         ),
     )

src/dialect_map_core/models/paper.py

@@ -89,8 +89,8 @@ class PaperAuthor(Base, StaticModel):
     # Stackoverflow: https://stackoverflow.com/a/7506168
     __table_args__ = (
         FKConstraint(
-            columns=("arxiv_id", "arxiv_rev"),
-            refcolumns=("papers.arxiv_id", "papers.arxiv_rev"),
+            columns=[arxiv_id, arxiv_rev],
+            refcolumns=[Paper.arxiv_id, Paper.arxiv_rev],
             ondelete="CASCADE",
         ),
     )
@@ -124,8 +124,8 @@ class PaperReferenceCounters(Base, StaticModel):
     # Stackoverflow: https://stackoverflow.com/a/7506168
     __table_args__ = (
         FKConstraint(
-            columns=("arxiv_id", "arxiv_rev"),
-            refcolumns=("papers.arxiv_id", "papers.arxiv_rev"),
+            columns=[arxiv_id, arxiv_rev],
+            refcolumns=[Paper.arxiv_id, Paper.arxiv_rev],
             ondelete="CASCADE",
         ),
     )

src/dialect_map_core/models/reference.py

@@ -8,6 +8,7 @@
 
 from .base import Base
 from .base import StaticModel
+from .paper import Paper
 from .__utils import generate_id
 
 
@@ -30,17 +31,20 @@ class PaperReference(Base, StaticModel):
     # Stackoverflow: https://stackoverflow.com/a/7506168
     __table_args__ = (
         FKConstraint(
-            columns=("source_arxiv_id", "source_arxiv_rev"),
-            refcolumns=("papers.arxiv_id", "papers.arxiv_rev"),
+            columns=[source_arxiv_id, source_arxiv_rev],
+            refcolumns=[Paper.arxiv_id, Paper.arxiv_rev],
             ondelete="CASCADE",
         ),
         FKConstraint(
-            columns=("target_arxiv_id", "target_arxiv_rev"),
-            refcolumns=("papers.arxiv_id", "papers.arxiv_rev"),
+            columns=[target_arxiv_id, target_arxiv_rev],
+            refcolumns=[Paper.arxiv_id, Paper.arxiv_rev],
             ondelete="CASCADE",
         ),
         UniqueConstraint(
-            "source_arxiv_id", "source_arxiv_rev", "target_arxiv_id", "target_arxiv_rev"
+            source_arxiv_id,
+            source_arxiv_rev,
+            target_arxiv_id,
+            target_arxiv_rev,
         ),
     )