From b81f43c09f0cc11bbd2dd1590048f7b6975c985c Mon Sep 17 00:00:00 2001 From: baizg1107 Date: Mon, 20 Jun 2022 18:08:59 +0800 Subject: [PATCH] fix none type judgmentwq --- 0001-fix-none-type-judge.patch | 28 ++++++++++++++++++++++++++++ sqlalchemy.spec | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 0001-fix-none-type-judge.patch diff --git a/0001-fix-none-type-judge.patch b/0001-fix-none-type-judge.patch new file mode 100644 index 0000000..a36283d --- /dev/null +++ b/0001-fix-none-type-judge.patch @@ -0,0 +1,28 @@ +From 55c30253b61fb3e1fbe6db4b2cb8a487ce908fe6 Mon Sep 17 00:00:00 2001 +From: baizg1107 +Date: Mon, 20 Jun 2022 11:52:47 +0800 +Subject: [PATCH] fix none type judge + +--- + lib/sqlalchemy/engine/base.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py +index 0e695f6..fefc43b 100644 +--- a/lib/sqlalchemy/engine/base.py ++++ b/lib/sqlalchemy/engine/base.py +@@ -152,8 +152,9 @@ class Connection(Connectable): + account current schema translate map. + + """ +- +- name = obj.schema ++ name = None ++ if obj is not None: ++ name = obj.schema + schema_translate_map = self._execution_options.get( + "schema_translate_map", None + ) +-- +2.27.0 + diff --git a/sqlalchemy.spec b/sqlalchemy.spec index ae8b5d9..b424450 100644 --- a/sqlalchemy.spec +++ b/sqlalchemy.spec @@ -2,12 +2,12 @@ Name: python-sqlalchemy Version: 1.4.31 -Release: 1 +Release: 2 Summary: SQL toolkit and object relational mapper for Python License: MIT URL: http://www.sqlalchemy.org/ Source0: https://files.pythonhosted.org/packages/0f/80/d8883f12689a55e333d221bb9a56c727e976f5a8e9dc862efeac9f40d296/SQLAlchemy-1.4.31.tar.gz - +Patch0: 0001-fix-none-type-judge.patch BuildRequires: python3-devel python3-setuptools python3-pytest gcc python3-greenlet Requires: python3-greenlet @@ -63,6 +63,9 @@ PYTHONPATH=. %{__python3} -m pytest test %doc doc examples %changelog +* Mon Jun 20 2022 baizhonggui - 1.4.31-2 +- Fix None type judgment + * Wed Jun 01 2022 huangtianhua - 1.4.31-1 - update to 1.4.31 -- Gitee