Skip to content

Patch sql_alchemy_conn if old Postgres schemes used #24569

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
potiuk merged 3 commits into from
Jun 22, 2022
Merged

Patch sql_alchemy_conn if old Postgres schemes used #24569

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33b103b
Patch sql_alchemy_conn if old postgres schemes used
slyapustin Jun 20, 2022
dd7200f
Fixed long line in the docstring.
slyapustin Jun 21, 2022
d599d8b
Fixed docstring.
slyapustin Jun 21, 2022
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
15 changes: 9 additions & 6 deletions airflow/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,21 +362,24 @@ def _upgrade_auth_backends(self):
)

def _upgrade_postgres_metastore_conn(self):
"""As of sqlalchemy 1.4, scheme `postgres+psycopg2` must be replaced with `postgresql`"""
"""
As of SQLAlchemy 1.4, schemes `postgres+psycopg2` and `postgres`
must be replaced with `postgresql`.
"""
section, key = 'database', 'sql_alchemy_conn'
old_value = self.get(section, key)
bad_scheme = 'postgres+psycopg2'
bad_schemes = ['postgres+psycopg2', 'postgres']
good_scheme = 'postgresql'
parsed = urlparse(old_value)
if parsed.scheme == bad_scheme:
if parsed.scheme in bad_schemes:
warnings.warn(
f"Bad scheme in Airflow configuration core > sql_alchemy_conn: `{bad_scheme}`. "
"As of SqlAlchemy 1.4 (adopted in Airflow 2.3) this is no longer supported. You must "
f"Bad scheme in Airflow configuration core > sql_alchemy_conn: `{parsed.scheme}`. "
"As of SQLAlchemy 1.4 (adopted in Airflow 2.3) this is no longer supported. You must "
f"change to `{good_scheme}` before the next Airflow release.",
FutureWarning,
)
self.upgraded_values[(section, key)] = old_value
new_value = re.sub('^' + re.escape(f"{bad_scheme}://"), f"{good_scheme}://", old_value)
new_value = re.sub('^' + re.escape(f"{parsed.scheme}://"), f"{good_scheme}://", old_value)
self._update_env_var(section=section, name=key, new_value=new_value)

# if the old value is set via env var, we need to wipe it
Expand Down