fastcodedog 3.0.3__tar.gz → 3.0.4__tar.gz

{fastcodedog-3.0.3 → fastcodedog-3.0.4}/PKG-INFO

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

{fastcodedog-3.0.3 → fastcodedog-3.0.4}/fastcodedog/generation/model/model.py

@@ -21,7 +21,7 @@ class Model(ClassType):
         self.blocks.append(LineBreak())  # 空行
         for computed_property in context.computed_properties.values():
             self.blocks.append(ComputedProperty(computed_property))
-        self.blocks.append(TableArgs(context.unique_constraints))  # __table_args__
+        self.blocks.append(TableArgs(context.unique_constraints, commit=(context.title if (not context.comment or context.title == context.comment) else f'{context.title}: {context.comment}') ))  # __table_args__
         # relationships
         self.blocks.extend([Relationship(relationship, self) for relationship in context.relationships.values() if
                             not relationship.disabled])

{fastcodedog-3.0.3 → fastcodedog-3.0.4}/fastcodedog/generation/model/table_args.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 from fastcodedog.generation.base.block import Block
 from fastcodedog.generation.base.required_import import RequiredImport
+from fastcodedog.util.wrap_str_with_quotation import wrap_quotation
 
 
 class TableArgs(Block):
-    def __init__(self, unique_constraints=[]):
+    def __init__(self, unique_constraints=[], commit=None):
         super().__init__('__table_args__', {})
         self.unique_constraints = unique_constraints
+        self.commit = commit
 
         self.add_possible_imports('from sqlalchemy import UniqueConstraint')
 
@@ -18,10 +20,13 @@ class TableArgs(Block):
 
     def serialize(self):
         """有点不一样的是，参数最后的逗号,"""
+        inner_content = ''
         if self.unique_constraints:
-            content = '__table_args__ = ('
             for constraint in self.unique_constraints:
-                content += f'UniqueConstraint({", ".join(constraint)}), '
-            content = content.strip() + ')'
-            return content
+                inner_content += f'UniqueConstraint({", ".join(constraint)}),'
+        if self.commit:
+            inner_content += f"{{'comment': {wrap_quotation(self.commit)}}},"
+
+        if inner_content:
+            return f'__table_args__ = ({inner_content})'
         return ''

{fastcodedog-3.0.3 → fastcodedog-3.0.4}/pyproject.toml

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