fastcodedog 2.0.6__tar.gz → 2.0.8__tar.gz

{fastcodedog-2.0.6 → fastcodedog-2.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastcodedog
-Version: 2.0.6
+Version: 2.0.8
 Summary: 
 License: MIT
 Author: taohoo
@@ -11,23 +11,12 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: alembic (>=1.13.1)
 Requires-Dist: autopep8 (>=2.2.0)
-Requires-Dist: fastapi (>=0.100.0)
-Requires-Dist: fastapi-pagination (>=0.12.25)
-Requires-Dist: fastoauth (>=0.1.0)
 Requires-Dist: inflect (>=7.2.1)
 Requires-Dist: json5 (>=0.9.25)
-Requires-Dist: psycopg2[binary] (>=2.9.5)
-Requires-Dist: pydantic (>=1.10.10)
-Requires-Dist: pyopenssl (>=24.0.0)
-Requires-Dist: python-jose (>=3.3.0)
-Requires-Dist: python-multipart (>=0.0.9)
-Requires-Dist: redis (>=5.0.5)
-Requires-Dist: sqlalchemy (>=2.0.23)
-Requires-Dist: uvicorn (>=0.30.0)
 Description-Content-Type: text/markdown
 
 Based on the pdm file(sap powerdesigner), automatically generate a FastAPI project.    
 Including SQLAlchemy models and CRUD operations.   
 FastAPI schemas and APIs.   
+The database engine should be installed manually based on actual requirements.

{fastcodedog-2.0.6 → fastcodedog-2.0.8}/README.md

@@ -1,3 +1,4 @@
 Based on the pdm file(sap powerdesigner), automatically generate a FastAPI project.    
 Including SQLAlchemy models and CRUD operations.   
-FastAPI schemas and APIs.   
+FastAPI schemas and APIs.   
+The database engine should be installed manually based on actual requirements.

{fastcodedog-2.0.6 → fastcodedog-2.0.8}/README_zh.md

@@ -1,4 +1,5 @@
 # 概述
 基于pdm文件(sap powerdesigner)，自动生成fastapi工程。   
 包括sqlalchemy的model，crud。   
-fastapi的schema，api。  
+fastapi的schema，api。   
+数据库引擎根据实际需要安装。

{fastcodedog-2.0.6 → fastcodedog-2.0.8}/fastcodedog/context/crud/query.py

@@ -34,5 +34,6 @@ class Query(ContextBase):
         self._types['joins'] = str
         self.outerjoins = []
         self._types['outerjoins'] = str
+        self.distinct = ''
         self.orders = []
         self._types['orders'] = str

{fastcodedog-2.0.6 → fastcodedog-2.0.8}/fastcodedog/generation/crud/query_functions.py

@@ -192,17 +192,21 @@ class Query(Crud):
             self.add_possible_imports(Import(model_name, self.get_package_by_model_name(model_name)))
             self.blocks.append(Text(f'{alias_name} = {alias_value}'))
         for join in self.context.joins:
+            self._check_join_condition(join)
             model_name = join.split('.')[0]
             if model_name not in self.context.aliases.keys():
                 self.add_possible_imports(Import(model_name, self.get_package_by_model_name(model_name)))
             self.blocks.append(Text(f'query = query.join({join})'))
         for outerjoin in self.context.outerjoins:
+            self._check_join_condition(outerjoin)
             model_name = outerjoin.split('.')[0]
             if model_name not in self.context.aliases.keys():
                 self.add_possible_imports(Import(model_name, self.get_package_by_model_name(model_name)))
             self.blocks.append(Text(f'query = query.outerjoin({outerjoin})'))
         for filter in self.context.filters:
             self.blocks.append(Query.Filter(filter, parameters=self.context.parameters, aliases=self.context.aliases))
+        if self.context.distinct:
+            self.blocks.append(Text(f'query = query.distinct({self.context.distinct})'))
         if self.context.orders:
             self.blocks.append(Text(f"""if order_by and order_by not in {self.context.orders}:
     raise Exception(f'未知的排序方式：{{order_by}}，可选值：{", ".join(self.context.orders)}')"""))
@@ -210,3 +214,10 @@ class Query(Crud):
     query = eval(f'query.order_by({{order_by}})')   # 采用eval，由上面的if语句确保不执行危险代码"""))
         self.blocks.append(Text(f'return query'))
 
+    def _check_join_condition(self, join):
+        if join in self.context.aliases.keys():
+            join = self.context.aliases[join]
+        if '.' not in join and ',' not in join:
+            raise Exception(f'''join参数{join}配置错误，需明确指定关联条件。如果你使用了别名，别名也需要明确指定关联条件。
+请参考https://docs.sqlalchemy.org/en/20/orm/queryguide/query.html#sqlalchemy.orm.Query.join。
+支持使用类似(User.addresses)和(Address, User.id==Address.user_id)两种写法明确指定关联条件''')

{fastcodedog-2.0.6 → fastcodedog-2.0.8}/pyproject.toml

@@ -1,30 +1,17 @@
 [tool.poetry]
 name = "fastcodedog"
-version = "2.0.6"
+version = "2.0.8"
 description = ""
 authors = ["taohoo <taohoo@163.com>"]
 license = "MIT"
 readme = "README.md"
-
 include = ["README*.md"]
 
 [tool.poetry.dependencies]
 python = ">=3.10"
-uvicorn = ">=0.30.0"
-fastapi = ">=0.100.0"
-pydantic = ">=1.10.10"
-python-jose = ">=3.3.0"
-pyopenssl = ">=24.0.0"
-redis = ">=5.0.5"
-python-multipart = ">=0.0.9"
-sqlalchemy = ">=2.0.23"
-psycopg2 = { version = ">=2.9.5", extras = ["binary"] } # 或使用 psycopg2-binary
 json5 = ">=0.9.25"
 inflect = ">=7.2.1"
 autopep8 = ">=2.2.0"
-fastoauth = ">=0.1.0"
-alembic = ">=1.13.1"
-fastapi-pagination = ">=0.12.25"
 
 [tool.poetry.dev-dependencies]
 setuptools = ">=70.0.0"