Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

Bump sqlalchemy from 1.4.54 to 2.0.36 #1007

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 11 additions & 8 deletions baseplate/clients/sqlalchemy.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from sqlalchemy import create_engine, event
from sqlalchemy.engine import Connection, Engine, ExceptionContext
from sqlalchemy.engine.interfaces import ExecutionContext
from sqlalchemy.engine.url import make_url
from sqlalchemy.engine.url import URL, make_url
from sqlalchemy.orm import Session
from sqlalchemy.pool import QueuePool

Expand Down Expand Up @@ -87,13 +87,16 @@ def engine_from_config(
raise TypeError("'secrets' is required if 'credentials_secret' is set")
credentials = secrets.get_credentials(options.credentials_secret)

# support sqlalchemy 1.4+ where URL is immutable
# https://docs.sqlalchemy.org/en/14/changelog/migration_14.html#the-url-object-is-now-immutable
if hasattr(url, "set"):
url = url.set(username=credentials.username, password=credentials.password)
else:
url.username = credentials.username
url.password = credentials.password
# Create new URL with SQLAlchemy 2.0 compatible parameters
url = URL.create(
drivername=url.drivername,
username=credentials.username,
password=credentials.password,
host=url.host,
port=url.port,
database=url.database,
query=url.query or {},
)

return create_engine(url, **kwargs)

Expand Down
Loading
Loading