fastcodedog 3.2.7__tar.gz → 3.2.8__tar.gz

{fastcodedog-3.2.7 → fastcodedog-3.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcodedog
-Version: 3.2.7
+Version: 3.2.8
 Summary: 
 License: MIT
 Author: taohoo

{fastcodedog-3.2.7 → fastcodedog-3.2.8}/fastcodedog/generation/api/db.py

@@ -16,12 +16,27 @@ class Db(File):
         self._init_blocks_and_imports()
 
     def _init_blocks_and_imports(self):
-        self.blocks.append(Variable('engine', value=f"""create_engine(database_url, pool_size=pool_size, max_overflow=max_overflow, connect_args={{"check_same_thread": False}}
-                       ) if database_url.startswith('sqlite') else create_engine(database_url)""",
-                                    possible_imports=['from sqlalchemy import create_engine',
-                                                      Import('database_url', Config().package),
-                                                      Import('pool_size', Config().package),
-                                                      Import('max_overflow', Config().package)]))
+        engine_imports = ['from sqlalchemy import create_engine',
+                          Import('database_url', Config().package),
+                          Import('pool_size', Config().package),
+                          Import('max_overflow', Config().package)]
+        self.blocks.append(Variable(
+            '_connect_args',
+            value='{"check_same_thread": False} if database_url.startswith(\'sqlite\') else {}',
+            possible_imports=engine_imports,
+        ))
+        self.blocks.append(Variable(
+            'engine',
+            value="""create_engine(
+    database_url,
+    pool_size=pool_size,
+    max_overflow=max_overflow,
+    pool_pre_ping=True,
+    pool_recycle=3600,
+    connect_args=_connect_args,
+)""",
+            possible_imports=engine_imports,
+        ))
         self.blocks.append(Variable('Session', value='sessionmaker(bind=engine)',
                                     possible_imports=['from sqlalchemy.orm import sessionmaker']))
         get_session = Function('get_session', comment="""生成器方式获取数据库会话（主要适用于依赖注入场景）。

{fastcodedog-3.2.7 → fastcodedog-3.2.8}/pyproject.toml

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