8000 Failed connection counter reset by taybin · Pull Request #385 · encode/databases · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Failed connection counter reset #385

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
merged 6 commits into from
Sep 10, 2021
Merged

Failed connection counter reset #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc87d14
Fixed counter on failed connection
qweryty Jan 29, 2021
c18e3de
add automated test of semaphore rollback on exception. Uses asyncmock
Sep 9, 2021
b4f16e1
use patch.object for better cleanup
Sep 9, 2021
3fbeaea
use select avoid throwing off counts for other tests
Sep 9, 2021
8ab1cc8
further simplification since we don't need the transaction anymore
Sep 9, 2021
b7053e5
remove asyncmock dep. Use non-generic exception for test
Sep 9, 2021
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
8 changes: 6 additions & 2 deletions databases/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,12 @@ def __init__(self, backend: DatabaseBackend) -> None:
async def __aenter__(self) -> "Connection":
async with self._connection_lock:
self._connection_counter += 1
if self._connection_counter == 1:
await self._connection.acquire()
try:
if self._connection_counter == 1:
await self._connection.acquire()
except Exception as e:
self._connection_counter -= 1
raise e
return self

async def __aexit__(
Expand Down
30 changes: 30 additions & 0 deletions tests/test_databases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import functools
import os
import re
from unittest.mock import patch, MagicMock

import pytest
import sqlalchemy
Expand All @@ -15,6 +16,11 @@
DATABASE_URLS = [url.strip() for url in os.environ["TEST_DATABASE_URLS"].split(",")]


class AsyncMock(MagicMock):
async def __call__(self, *args, **kwargs):
return super(AsyncMock, self).__call__(*args, **kwargs)


class MyEpochType(sqlalchemy.types.TypeDecorator):
impl = sqlalchemy.Integer

Expand Down Expand Up @@ -267,6 +273,30 @@ async def test_ddl_queries(database_url):
await database.execute(query)


@pytest.mark.parametrize("database_url", DATABASE_URLS)
@async_adapter
async def test_queries_after_error(database_url):
"""
Test that the basic `execute()` works after a previous error.
"""

class DBException(Exception):
pass

async with Database(database_url) as database:
with patch.object(
database.connection()._connection,
"acquire",
new=AsyncMock(side_effect=DBException),
):
with pytest.raises(DBException):
query = notes.select()
await database.fetch_all(query)

query = notes.select()
await database.fetch_all(query)


@pytest.mark.parametrize("database_url", DATABASE_URLS)
@async_adapter
async def test_results_support_mapping_interface(database_url):
Expand Down
0