From e6c4f4487850cbfeb31f1d4797d39824db628bc2 Mon Sep 17 00:00:00 2001 From: Jason Blevins Date: Thu, 26 Sep 2024 16:09:03 -0400 Subject: [PATCH 1/2] Use Session.query instead of Class.query Updating SQLAlchemy 1.x series queries to SQLAlchemy 2.0 style queries fixes the LegacyAPIWarning. --- sqlalchemy_mixins/activerecord.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sqlalchemy_mixins/activerecord.py b/sqlalchemy_mixins/activerecord.py index 122a60d..d0e6be5 100644 --- a/sqlalchemy_mixins/activerecord.py +++ b/sqlalchemy_mixins/activerecord.py @@ -77,18 +77,18 @@ def destroy(cls, *ids, commit=True): @classmethod def all(cls): - return cls.query.all() + return cls.session.query(cls).all() @classmethod def first(cls): - return cls.query.first() + return cls.session.query(cls).first() @classmethod def find(cls, id_): """Find record by the id :param id_: the primary key """ - return cls.query.get(id_) + return cls.session.query(cls).get(id_) @classmethod def find_or_fail(cls, id_): From a8a9611c134d03e20eb947fbf23591a2527a7a7f Mon Sep 17 00:00:00 2001 From: Jason Blevins Date: Thu, 26 Sep 2024 16:09:22 -0400 Subject: [PATCH 2/2] Add greenlet to requirements-dev.txt --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index efeb72b..86c2fd8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,6 +2,7 @@ nose2 coverage codeclimate-test-reporter +greenlet>=3.1 tox mypy==1.1.1 sqlalchemy[mypy] >= 2.0