fastcodedog 3.0.1__tar.gz → 3.0.2__tar.gz

{fastcodedog-3.0.1 → fastcodedog-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastcodedog
-Version: 3.0.1
+Version: 3.0.2
 Summary: 
 License: MIT
 Author: taohoo

{fastcodedog-3.0.1 → fastcodedog-3.0.2}/fastcodedog/context/model/relationship.py

@@ -19,3 +19,5 @@ class Relationship(ContextBase):
         self.disabled = False  # 禁用。和上面的no_backup是一对
         self.from_join_table = False  # 是否是join_table
         self.is_list = False  # 是否是列表
+        self.primaryjoin = ''  # 主连接条件
+        self.secondaryjoin = ''  # 次连接条件

{fastcodedog-3.0.1 → fastcodedog-3.0.2}/fastcodedog/generation/model/relationship.py

@@ -17,6 +17,8 @@ class Relationship(Variable):
         self.back_populates = context.back_populates  # back_populates变量名
         self.no_back_populates = context.no_back_populates  # 不生成back_populates
         # self.disabled = context.disabled                      # 禁用的时候，直接不创建relationship
+        self.primaryjoin = context.primaryjoin  # 主连接条件
+        self.secondaryjoin = context.secondaryjoin
 
         self.value = self.get_value()
         self.comment = f"no back populates {self.back_populates}" if self.no_back_populates else ''
@@ -35,6 +37,10 @@ class Relationship(Variable):
             relationship_params.append(f"secondary='{self.secondary}'")
         if self.remote_side:
             relationship_params.append(f"remote_side={self.remote_side}")
+        if self.primaryjoin:
+            relationship_params.append(f"primaryjoin='{self.primaryjoin}'")
+        if self.secondaryjoin:
+            relationship_params.append(f"secondaryjoin='{self.secondaryjoin}'")
         if self.cascade:
             relationship_params.append(f"cascade='{self.cascade}'")
         if self.back_populates and not self.no_back_populates:

{fastcodedog-3.0.1 → fastcodedog-3.0.2}/fastcodedog/prepare/pdm_to_model/table.py

@@ -33,6 +33,10 @@ class Table:
             for child_reference in self.child.child_side_references:
                 if child_reference.parent != self.parent:
                     return child_reference
+            # 从自身到自身的多对多关系，比如，质检定单和普通采样定单之间的多对多关系
+            for child_reference in self.child.child_side_references:
+                if child_reference.child_column.code != self.child_column.code:
+                    return child_reference
             return None
 
     def __init__(self, node, pdm_file):
@@ -146,9 +150,19 @@ class Table:
         back_populates_module = another_side_reference.parent.module
         secondary = reference.child.code
         secondary_object_name = reference.child.get_model_name()  # crud中需要
-        return {'name': name, 'original_name': original_name, 'back_populates_module': back_populates_module,
+        primaryjoin = f"{reference.parent.get_model_name()}.{reference.parent_column.code}=={reference.child.code}.c.{reference.child_column.code}"
+        secondaryjoin = f"{another_side_reference.parent.get_model_name()}.{another_side_reference.parent_column.code}=={another_side_reference.child.code}.c.{another_side_reference.child_column.code}"
+
+        ret = {'name': name, 'original_name': original_name, 'back_populates_module': back_populates_module,
                 'back_populates_model': back_populates_model, 'back_populates': back_populates, 'secondary': secondary,
                 'secondary_object_name': secondary_object_name, 'from_join_table': True, 'is_list': True}
+        if (reference.child == another_side_reference.child
+                and reference.parent == another_side_reference.parent
+                and reference.parent_column.code == another_side_reference.parent_column.code):
+            # 如果是同一个表的多对多关系
+            ret['primaryjoin'] = primaryjoin
+            ret['secondaryjoin'] = secondaryjoin
+        return ret
 
     def get_sub_object_name_by_foreign_key(self, foreign_key):
         """根据外键生成子对象名"""

{fastcodedog-3.0.1 → fastcodedog-3.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastcodedog"
-version = "3.0.1"
+version = "3.0.2"
 description = ""
 authors = ["taohoo <taohoo@163.com>"]
 license = "MIT"