Skip to content

Commit

Permalink
migrate from deprecated sqlalchemy methods (#7864)
Browse files Browse the repository at this point in the history
### Summary & Motivation
noticed this in a BK run
```
[2022-05-12T18:55:29Z]   /workdir/python_modules/dagster/dagster/core/storage/alembic/versions/002_cascade_run_deletion_postgres.py:23: SADeprecationWarning: The from_engine() method on Inspector is deprecated and will be removed in a future release.  Please use the sqlalchemy.inspect() function on an Engine or Connection in order to acquire an Inspector. (deprecated since: 1.4)
[2022-05-12T18:55:29Z]     inspector = reflection.Inspector.from_engine(bind)
```

migrate to the recommended methods

### How I Tested These Changes

bk
  • Loading branch information
alangenfeld committed May 27, 2022
1 parent f733499 commit c7427a0
Show file tree
Hide file tree
Showing 28 changed files with 79 additions and 133 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@

import sqlalchemy as sa
from alembic import context, op
from sqlalchemy import Column
from sqlalchemy.engine import reflection
from sqlalchemy import Column, inspect

from dagster.core.storage.event_log import SqlEventLogStorageTable

Expand All @@ -27,9 +26,7 @@ def upgrade():
# This is our root migration, and we don't have a common base. Before this revision, sqlite- and
# postgres-based event logs had different schemas. The conditionality below is to deal with dev
# databases that might not have been stamped by Alembic.
bind = op.get_context().bind

inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()

if "event_log" not in has_tables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member
# alembic dynamically populates the alembic.context module
Expand All @@ -19,8 +19,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()

if "runs" in has_tables and "run_tags" in has_tables:
Expand All @@ -36,8 +35,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()

if "runs" in has_tables and "run_tags" in has_tables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -18,8 +18,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()

if "runs" in has_tables and "run_tags" in has_tables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
import sqlalchemy as sa
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -19,8 +19,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand All @@ -29,8 +28,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
import sqlalchemy as sa
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -19,8 +19,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand All @@ -29,8 +28,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
import sqlalchemy as sa
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

from dagster.core.storage.migration.utils import has_column, has_table

Expand All @@ -22,8 +22,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())

if not has_table("runs"):
return
Expand All @@ -50,7 +49,8 @@ def upgrade():
"snapshot_id",
sa.String(255),
sa.ForeignKey(
"snapshots.snapshot_id", name="fk_runs_snapshot_id_snapshots_snapshot_id"
"snapshots.snapshot_id",
name="fk_runs_snapshot_id_snapshots_snapshot_id",
),
),
)
Expand All @@ -63,8 +63,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())

if not has_table("runs"):
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
import sqlalchemy as sa
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -19,8 +19,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand All @@ -33,8 +32,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
import sqlalchemy as sa
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -19,8 +19,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand All @@ -33,8 +32,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

from dagster.core.storage.migration.utils import get_currently_upgrading_instance, has_table

Expand All @@ -22,8 +22,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())

if "postgresql" not in inspector.dialect.dialect_description:
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -18,8 +18,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
indices = [x.get("name") for x in inspector.get_indexes("event_logs")]
Expand All @@ -28,8 +27,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
indices = [x.get("name") for x in inspector.get_indexes("event_logs")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -18,8 +18,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
indices = [x.get("name") for x in inspector.get_indexes("event_logs")]
Expand All @@ -28,8 +27,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
indices = [x.get("name") for x in inspector.get_indexes("event_logs")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -18,8 +18,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "run_tags" in has_tables:
indices = [x.get("name") for x in inspector.get_indexes("run_tags")]
Expand All @@ -28,8 +27,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "run_tags" in has_tables:
indices = [x.get("name") for x in inspector.get_indexes("run_tags")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -18,8 +18,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "run_tags" in has_tables:
indices = [x.get("name") for x in inspector.get_indexes("run_tags")]
Expand All @@ -28,8 +27,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "run_tags" in has_tables:
indices = [x.get("name") for x in inspector.get_indexes("run_tags")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
import sqlalchemy as sa
from alembic import op
from sqlalchemy.engine import reflection
from sqlalchemy import inspect

# pylint: disable=no-member

Expand All @@ -19,8 +19,7 @@


def upgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand All @@ -32,8 +31,7 @@ def upgrade():


def downgrade():
bind = op.get_context().bind
inspector = reflection.Inspector.from_engine(bind)
inspector = inspect(op.get_bind())
has_tables = inspector.get_table_names()
if "event_logs" in has_tables:
columns = [x.get("name") for x in inspector.get_columns("event_logs")]
Expand Down

0 comments on commit c7427a0

Please sign in to comment.