Skip to content

fix(repo): logic correction for window function #421

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

Merged
cofin merged 2 commits into from
Mar 18, 2025
Merged

fix(repo): logic correction for window function #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
951d6c1
fix(repo): logic correction for window function
cofin Mar 18, 2025
1b6140d
fix: correct test case
cofin Mar 18, 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 advanced_alchemy/repository/_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,15 +1503,15 @@ async def list_and_count(
Returns:
Count of records returned by query, ignoring pagination.
"""
self.count_with_window_function = (
count_with_window_function = (
count_with_window_function if count_with_window_function is not None else self.count_with_window_function
)
self.uniquify = self._get_uniquify(uniquify)
error_messages = self._get_error_messages(
error_messages=error_messages,
default_messages=self.error_messages,
)
if self._dialect.name in {"spanner", "spanner+spanner"} or count_with_window_function:
if self._dialect.name in {"spanner", "spanner+spanner"} or not count_with_window_function:
return await self._list_and_count_basic(
*filters,
auto_expunge=auto_expunge,
Expand Down
4 changes: 2 additions & 2 deletions advanced_alchemy/repository/_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,15 +1504,15 @@ def list_and_count(
Returns:
Count of records returned by query, ignoring pagination.
"""
self.count_with_window_function = (
count_with_window_function = (
count_with_window_function if count_with_window_function is not None else self.count_with_window_function
)
self.uniquify = self._get_uniquify(uniquify)
error_messages = self._get_error_messages(
error_messages=error_messages,
default_messages=self.error_messages,
)
if self._dialect.name in {"spanner", "spanner+spanner"} or count_with_window_function:
if self._dialect.name in {"spanner", "spanner+spanner"} or not count_with_window_function:
return self._list_and_count_basic(
*filters,
auto_expunge=auto_expunge,
Expand Down
4 changes: 1 addition & 3 deletions tests/unit/test_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,6 @@ async def test_sqlalchemy_repo_list_and_count(mock_repo: SQLAlchemyAsyncReposito
"""Test expected method calls for list operation."""
mock_instances = [MagicMock(), MagicMock()]
mock_count = len(mock_instances)
mocker.patch.object(mock_repo, "_list_and_count_basic", return_value=(mock_instances, mock_count))
mocker.patch.object(mock_repo, "_list_and_count_window", return_value=(mock_instances, mock_count))

instances, instance_count = await maybe_async(mock_repo.list_and_count())
Expand All @@ -546,9 +545,8 @@ async def test_sqlalchemy_repo_list_and_count_basic(
mock_instances = [MagicMock(), MagicMock()]
mock_count = len(mock_instances)
mocker.patch.object(mock_repo, "_list_and_count_basic", return_value=(mock_instances, mock_count))
mocker.patch.object(mock_repo, "_list_and_count_window", return_value=(mock_instances, mock_count))

instances, instance_count = await maybe_async(mock_repo.list_and_count(count_with_window_function=True))
instances, instance_count = await maybe_async(mock_repo.list_and_count(count_with_window_function=False))

assert instances == mock_instances
assert instance_count == mock_count
Expand Down