Skip to content

Commit

Permalink
Merge branch 'release/0.30.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
ri-gilfanov committed Jul 21, 2021
2 parents 8284510 + 2b64dd4 commit b139996
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion aiohttp_sqlalchemy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
SAModelViewMixin,
)

__version__ = '0.30.1'
__version__ = '0.30.2'

__all__ = [
'DEFAULT_KEY',
Expand Down
6 changes: 3 additions & 3 deletions aiohttp_sqlalchemy/web_handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def get_update_stmt(self, model: Any = None) -> Update:


class SAModelViewMixin(SAModelMixin):
def get_sa_select_stmt(self, model: Any = None) -> Select:
def get_select_stmt(self, model: Any = None) -> Select:
return select(model or self.sa_model)


Expand Down Expand Up @@ -69,7 +69,7 @@ class ItemEditMixin(
PrimaryKeyMixin,
metaclass=ABCMeta,
):
def get_sa_edit_stmt(self, model: Any = None) -> Update:
def get_update_stmt(self, model: Any = None) -> Update:
return super(). \
get_update_stmt(model). \
where(self.sa_pk_attr == self.pk)
Expand All @@ -83,7 +83,7 @@ class ItemViewMixin(
):
def get_select_stmt(self, model: Any = None) -> Select:
return super(). \
get_sa_select_stmt(model). \
get_select_stmt(model). \
where(self.sa_pk_attr == self.pk)


Expand Down
2 changes: 1 addition & 1 deletion docs/releases.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
========
Releases
========
Unreleased
Version 0.30
------------
**Deprecated**

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "aiohttp-sqlalchemy"
version = "0.30.1"
version = "0.30.2"
description = "SQLAlchemy 1.4 / 2.0 support for aiohttp."
authors = [
"Ruslan Ilyasovich Gilfanov <ri.gilfanov@yandex.ru>",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_web_handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class InstanceEdit(web.View, ItemEditMixin):
sa_model = Model

view = InstanceEdit(mocked_request)
view.get_sa_edit_stmt()
view.get_update_stmt()


def test_view_stmt(mocked_request: Request, base_model: orm.Mapper) -> None:
Expand Down

0 comments on commit b139996

Please sign in to comment.