Skip to content

Upgrade to SQLAlchemy 2 #1269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pmdevita wants to merge 3 commits into from
Closed

Upgrade to SQLAlchemy 2 #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a57154d
Fix support for SQLAlchemy 2
pmdevita Feb 21, 2024
9bf214b
Update databases to 0.9.0, set minimum Python version to 3.8
pmdevita Mar 4, 2024
a7841b9
Merge remote-tracking branch 'origin/master' into feature/sqlalchemy2
pmdevita Aug 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ormar/queryset/queries/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def build_select_expression(self) -> sqlalchemy.sql.select:
self.select_from, limit_qry, on_clause
)

expr = sqlalchemy.sql.select(self.columns)
expr = sqlalchemy.sql.select(*self.columns)
expr = expr.select_from(self.select_from)

expr = self._apply_expression_modifiers(expr)
Expand Down Expand Up @@ -191,7 +191,7 @@ def _build_pagination_condition(
elif order.get_field_name_text() == pk_aliased_name:
maxes[pk_aliased_name] = order.get_text_clause()

limit_qry = sqlalchemy.sql.select([qry_text])
limit_qry = sqlalchemy.sql.select(qry_text)
limit_qry = limit_qry.select_from(self.select_from)
limit_qry = FilterQuery(filter_clauses=self.filter_clauses).apply(limit_qry)
limit_qry = FilterQuery(
Expand Down
4 changes: 2 additions & 2 deletions ormar/queryset/queryset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ async def values(
exclude_through=exclude_through,
)
column_map = alias_resolver.resolve_columns(
columns_names=list(cast(LegacyRow, rows[0]).keys())
columns_names=rows[0].keys()
)
result = [
{column_map.get(k): v for k, v in dict(x).items() if k in column_map}
Expand Down Expand Up @@ -724,7 +724,7 @@ async def _query_aggr_function(self, func_name: str, columns: List) -> Any:
)
select_columns = [x.apply_func(func, use_label=True) for x in select_actions]
expr = self.build_select_expression().alias(f"subquery_for_{func_name}")
expr = sqlalchemy.select(select_columns).select_from(expr)
expr = sqlalchemy.select(*select_columns).select_from(expr)
# print("\n", expr.compile(compile_kwargs={"literal_binds": True}))
result = await self.database.fetch_one(expr)
return dict(result) if len(result) > 1 else result[0] # type: ignore
Expand Down
4 changes: 2 additions & 2 deletions tests/test_model_definition/test_fields_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ def test_combining_groups_together():
category_prefix = group._nested_groups[1]._nested_groups[1].actions[0].table_prefix
assert group_str == (
f"((product.name LIKE '%Test%') "
f"OR (({price_list_prefix}_price_lists.name LIKE 'Aa%') "
f"OR ({category_prefix}_categories.name IN ('Toys', 'Books'))))"
f"OR ({price_list_prefix}_price_lists.name LIKE 'Aa%') "
f"OR ({category_prefix}_categories.name IN ('Toys', 'Books')))"
)


Expand Down
Loading