-
Notifications
You must be signed in to change notification settings - Fork 403
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.
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
Refactor exception classes #1129
Open
bryanforbes
wants to merge
1
commit into
MagicStack:master
Choose a base branch
from
bryanforbes:feature/refactor-exceptions
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,153 @@ | ||
# Copyright (C) 2016-present the asyncpg authors and contributors | ||
# <see AUTHORS file> | ||
# | ||
# This module is part of asyncpg and is released under | ||
# the Apache 2.0 License: http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
import sys | ||
import textwrap | ||
|
||
|
||
def _is_asyncpg_class(cls): | ||
modname = cls.__module__ | ||
return modname == 'asyncpg' or modname.startswith('asyncpg.') | ||
|
||
|
||
class PostgresMessageMeta(type): | ||
|
||
_message_map = {} | ||
_field_map = { | ||
'S': 'severity', | ||
'V': 'severity_en', | ||
'C': 'sqlstate', | ||
'M': 'message', | ||
'D': 'detail', | ||
'H': 'hint', | ||
'P': 'position', | ||
'p': 'internal_position', | ||
'q': 'internal_query', | ||
'W': 'context', | ||
's': 'schema_name', | ||
't': 'table_name', | ||
'c': 'column_name', | ||
'd': 'data_type_name', | ||
'n': 'constraint_name', | ||
'F': 'server_source_filename', | ||
'L': 'server_source_line', | ||
'R': 'server_source_function' | ||
} | ||
|
||
def __new__(mcls, name, bases, dct): | ||
cls = super().__new__(mcls, name, bases, dct) | ||
if cls.__module__ == mcls.__module__ and name == 'PostgresMessage': | ||
for f in mcls._field_map.values(): | ||
setattr(cls, f, None) | ||
|
||
if _is_asyncpg_class(cls): | ||
mod = sys.modules[cls.__module__] | ||
if hasattr(mod, name): | ||
raise RuntimeError('exception class redefinition: {}'.format( | ||
name)) | ||
|
||
code = dct.get('sqlstate') | ||
if code is not None: | ||
existing = mcls._message_map.get(code) | ||
if existing is not None: | ||
raise TypeError('{} has duplicate SQLSTATE code, which is' | ||
'already defined by {}'.format( | ||
name, existing.__name__)) | ||
mcls._message_map[code] = cls | ||
|
||
return cls | ||
|
||
@classmethod | ||
def get_message_class_for_sqlstate(mcls, code): | ||
from ._base import UnknownPostgresError | ||
return mcls._message_map.get(code, UnknownPostgresError) | ||
|
||
|
||
class PostgresMessage(metaclass=PostgresMessageMeta): | ||
|
||
@classmethod | ||
def _get_error_class(cls, fields): | ||
sqlstate = fields.get('C') | ||
return type(cls).get_message_class_for_sqlstate(sqlstate) | ||
|
||
@classmethod | ||
def _get_error_dict(cls, fields, query): | ||
dct = { | ||
'query': query | ||
} | ||
|
||
field_map = type(cls)._field_map | ||
for k, v in fields.items(): | ||
field = field_map.get(k) | ||
if field: | ||
dct[field] = v | ||
|
||
return dct | ||
|
||
@classmethod | ||
def _make_constructor(cls, fields, query=None): | ||
dct = cls._get_error_dict(fields, query) | ||
|
||
exccls = cls._get_error_class(fields) | ||
message = dct.get('message', '') | ||
|
||
# PostgreSQL will raise an exception when it detects | ||
# that the result type of the query has changed from | ||
# when the statement was prepared. | ||
# | ||
# The original error is somewhat cryptic and unspecific, | ||
# so we raise a custom subclass that is easier to handle | ||
# and identify. | ||
# | ||
# Note that we specifically do not rely on the error | ||
# message, as it is localizable. | ||
is_icse = ( | ||
exccls.__name__ == 'FeatureNotSupportedError' and | ||
_is_asyncpg_class(exccls) and | ||
dct.get('server_source_function') == 'RevalidateCachedQuery' | ||
) | ||
|
||
if is_icse: | ||
exceptions = sys.modules[exccls.__module__] | ||
exccls = exceptions.InvalidCachedStatementError | ||
message = ('cached statement plan is invalid due to a database ' | ||
'schema or configuration change') | ||
|
||
is_prepared_stmt_error = ( | ||
exccls.__name__ in ('DuplicatePreparedStatementError', | ||
'InvalidSQLStatementNameError') and | ||
_is_asyncpg_class(exccls) | ||
) | ||
|
||
if is_prepared_stmt_error: | ||
hint = dct.get('hint', '') | ||
hint += textwrap.dedent("""\ | ||
|
||
NOTE: pgbouncer with pool_mode set to "transaction" or | ||
"statement" does not support prepared statements properly. | ||
You have two options: | ||
|
||
* if you are using pgbouncer for connection pooling to a | ||
single server, switch to the connection pool functionality | ||
provided by asyncpg, it is a much better option for this | ||
purpose; | ||
|
||
* if you have no option of avoiding the use of pgbouncer, | ||
then you can set statement_cache_size to 0 when creating | ||
the asyncpg connection object. | ||
""") | ||
|
||
dct['hint'] = hint | ||
|
||
return exccls, message, dct | ||
|
||
def as_dict(self): | ||
dct = {} | ||
for f in type(self)._field_map.values(): | ||
val = getattr(self, f) | ||
if val is not None: | ||
dct[f] = val | ||
return dct |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can add them to
__all__
. Then you won't needas
andnoqa
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I do that, then they will be imported with
from ._base import *
inasyncpg/exceptions/__init__.py
, and then they will be accessible asasyncpg.PostgresMessage
andasyncpg.PostgresMessageMeta
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point.