diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-04-03 23:00:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-04-03 23:00:40 +0000 |
| commit | 13d1bc65696b2cd3bb793c57bc2645f85ab9943b (patch) | |
| tree | f44ad938439b691e02107f13f388209d028d1a02 | |
| parent | 79958bf68da0684ec7c7ffe90b1c5a41360c5906 (diff) | |
| parent | 21512f479c43e3ca0abb5a59a88d1e75171c707e (diff) | |
| download | alembic-13d1bc65696b2cd3bb793c57bc2645f85ab9943b.tar.gz | |
Merge "Fix type annotation for `url`" into main
| -rw-r--r-- | alembic/context.pyi | 3 | ||||
| -rw-r--r-- | alembic/runtime/environment.py | 3 | ||||
| -rw-r--r-- | alembic/runtime/migration.py | 3 | ||||
| -rw-r--r-- | tools/write_pyi.py | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/alembic/context.pyi b/alembic/context.pyi index 142a0c7..a262638 100644 --- a/alembic/context.pyi +++ b/alembic/context.pyi @@ -17,6 +17,7 @@ from typing import Union if TYPE_CHECKING: from sqlalchemy.engine.base import Connection + from sqlalchemy.engine.url import URL from sqlalchemy.sql.elements import ClauseElement from sqlalchemy.sql.schema import MetaData @@ -75,7 +76,7 @@ config: Config def configure( connection: Optional[Connection] = None, - url: Optional[str] = None, + url: Union[str, URL, None] = None, dialect_name: Optional[str] = None, dialect_opts: Optional[Dict[str, Any]] = None, transactional_ddl: Optional[bool] = None, diff --git a/alembic/runtime/environment.py b/alembic/runtime/environment.py index 0f9d3a5..c2fa11a 100644 --- a/alembic/runtime/environment.py +++ b/alembic/runtime/environment.py @@ -20,6 +20,7 @@ from ..operations import Operations if TYPE_CHECKING: from typing import Literal + from sqlalchemy.engine import URL from sqlalchemy.engine.base import Connection from sqlalchemy.sql.elements import ClauseElement from sqlalchemy.sql.schema import MetaData @@ -334,7 +335,7 @@ class EnvironmentContext(util.ModuleClsProxy): def configure( self, connection: Optional[Connection] = None, - url: Optional[str] = None, + url: Optional[Union[str, URL]] = None, dialect_name: Optional[str] = None, dialect_opts: Optional[Dict[str, Any]] = None, transactional_ddl: Optional[bool] = None, diff --git a/alembic/runtime/migration.py b/alembic/runtime/migration.py index a615651..4e2d062 100644 --- a/alembic/runtime/migration.py +++ b/alembic/runtime/migration.py @@ -34,6 +34,7 @@ from ..util.compat import EncodedIO if TYPE_CHECKING: from sqlalchemy.engine import Dialect + from sqlalchemy.engine import URL from sqlalchemy.engine.base import Connection from sqlalchemy.engine.base import Transaction from sqlalchemy.engine.mock import MockConnection @@ -217,7 +218,7 @@ class MigrationContext: def configure( cls, connection: Optional[Connection] = None, - url: Optional[str] = None, + url: Optional[Union[str, URL]] = None, dialect_name: Optional[str] = None, dialect: Optional[Dialect] = None, environment_context: Optional[EnvironmentContext] = None, diff --git a/tools/write_pyi.py b/tools/write_pyi.py index aec1813..fcf9d36 100644 --- a/tools/write_pyi.py +++ b/tools/write_pyi.py @@ -33,6 +33,7 @@ TRIM_MODULE = [ "alembic.operations.base.", "alembic.operations.ops.", "sqlalchemy.engine.base.", + "sqlalchemy.engine.url.", "sqlalchemy.sql.schema.", "sqlalchemy.sql.selectable.", "sqlalchemy.sql.elements.", |