- 修复fastapi alchemy中如果默认的连接失败ping操作也会失败的问题

- 更改flask alchemy中如果ping操作默认key的类型值

Signed-off-by: guoyanfeng <guo.yanfeng@dataeveryday.com>

Author: guoyanfeng

CHANGES.md

@@ -1,5 +1,15 @@
 ## fessql Changelog
 
+###[1.0.4] - 2021-1-14
+
+#### Added 
+- 经过项目测试可以发布正式版本
+
+#### Changed 
+- 修复fastapi alchemy中如果默认的连接失败ping操作也会失败的问题
+- 更改flask alchemy中如果ping操作默认key的类型值
+
+
 ###[1.0.3b1~1.0.3b3] - 2020-12-8
 
 #### Added 

fessql/__init__.py

@@ -28,4 +28,4 @@
     "__version__",
 )
 
-__version__ = "1.0.3b3"
+__version__ = "1.0.4"

fessql/dbalchemy/fastapi_alchemy.py

@@ -26,6 +26,7 @@
 from .._alchemy import AlchemyMixIn
 from .._err_msg import mysql_msg
 from ..err import DBDuplicateKeyError, DBError, FuncArgsError, HttpError
+from ..utils import Undefined
 
 __all__ = ("FesPagination", "FesQuery", "FesSession", "FastapiAlchemy")
 
@@ -691,8 +692,8 @@ def ping_session(self, session: FesSession, reconnect=True) -> FesSession:
             session.execute(text("SELECT 1")).first()
         except sqlalchemy_err.OperationalError as err:
             if reconnect:
-                bind_key = getattr(session, "bind_key", "")
-                if bind_key:
+                bind_key = getattr(session, "bind_key", Undefined)
+                if bind_key != Undefined:
                     self.sessionmaker_pool[bind_key].remove()
                     session = self.gen_sessionmaker(bind_key)()
                     session.bind_key = bind_key  # 设置bind key
@@ -704,7 +705,7 @@ def ping_session(self, session: FesSession, reconnect=True) -> FesSession:
         return session
 
     @contextmanager
-    def gen_session(self, bind_key: str = None) -> Generator[FesSession, None, None]:
+    def gen_session(self, bind_key: Optional[str] = None) -> Generator[FesSession, None, None]:
         """
         创建或者获取指定的session
 

fessql/dbalchemy/flask_alchemy.py

@@ -40,7 +40,7 @@ def __init__(self) -> None:
 from .._cachelru import LRU
 from .._err_msg import mysql_msg
 from ..err import DBDuplicateKeyError, DBError, FuncArgsError, HttpError
-from ..utils import _verify_message
+from ..utils import _verify_message, Undefined
 
 __all__ = ("FlaskAlchemy",)
 
@@ -198,8 +198,8 @@ def ping_session(self, session: Union[Session, scoped_session] = None, reconnect
         except sqlalchemy_err.OperationalError as err:
             if reconnect:
                 if isinstance(session, Session):
-                    bind_key = getattr(session, "bind_key", "")
-                    if bind_key:
+                    bind_key = getattr(session, "bind_key", Undefined)
+                    if bind_key != Undefined:
                         with self.set_bindkey(bind_key):
                             self.scoped_sessions[bind_key].remove()
                             session = self.scoped_sessions[bind_key]()

fessql/utils.py

@@ -8,9 +8,9 @@
 """
 import weakref
 from collections import MutableMapping, MutableSequence
-from typing import Dict, List, Union
+from typing import Any, Dict, List, TypeVar, Union
 
-__all__ = ("_verify_message", "gen_class_name", "Cached")
+__all__ = ("_verify_message", "gen_class_name", "Cached", "Undefined")
 
 
 def _verify_message(src_message: Dict, message: Union[List, Dict]):
@@ -67,3 +67,27 @@ class Cached(metaclass=_Cached):
 
     """
     pass
+
+
+T = TypeVar('T')
+
+
+class UndefinedType(object):
+    """
+    未定义变量类
+    Args:
+    Returns:
+
+    """
+
+    def __repr__(self) -> str:
+        return 'VarUndefined'
+
+    def __copy__(self: T) -> T:
+        return self
+
+    def __deepcopy__(self: T, _: Any) -> T:
+        return self
+
+
+Undefined = UndefinedType()

setup.py

@@ -49,7 +49,7 @@
       keywords="mysql, asyncio, crud, session",
       license='MIT',
       classifiers=[
-          'Development Status :: 4 - Beta',
+          'Development Status :: 5 - Production/Stable',
           'Intended Audience :: Developers',
           'License :: OSI Approved :: MIT License',
           'Natural Language :: Chinese (Simplified)',