Skip to content
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

Jump to bottom

fix(db-migration): new_dataset_models_take_2 error on postgres #21417

Merged
merged 2 commits into from
Nov 21, 2022
Merged

fix(db-migration): new_dataset_models_take_2 error on postgres #21417

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1c226d
Update 2022-04-01_14-38_a9422eeaae74_new_dataset_models_take_2.py
micsbot Sep 9, 2022
55e55b9
fix lint
villebro Nov 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
33 changes: 26 additions & 7 deletions superset/migrations/versions/2022-04-01_14-38_a9422eeaae74_new_dataset_models_take_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,14 +636,31 @@ def postprocess_columns(session: Session) -> None:
return

def get_joined_tables(offset, limit):

# Import aliased from sqlalchemy
from sqlalchemy.orm import aliased

# Create alias of NewColumn
new_column_alias = aliased(NewColumn)
# Get subquery and give it the alias "sl_colums_2"
subquery = (
session.query(new_column_alias)
.offset(offset)
.limit(limit)
.subquery("sl_columns_2")
)

return (
sa.join(
session.query(NewColumn)
.offset(offset)
.limit(limit)
.subquery("sl_columns"),
subquery,
NewColumn,
# Use column id from subquery
subquery.c.id == NewColumn.id,
)
.join(
dataset_column_association_table,
dataset_column_association_table.c.column_id == NewColumn.id,
# Use column id from subquery
dataset_column_association_table.c.column_id == subquery.c.id,
)
.join(
NewDataset,
Expand All @@ -661,12 +678,14 @@ def get_joined_tables(offset, limit):
.join(Database, Database.id == NewDataset.database_id)
.join(
TableColumn,
TableColumn.uuid == NewColumn.uuid,
# Use column uuid from subquery
TableColumn.uuid == subquery.c.uuid,
isouter=True,
)
.join(
SqlMetric,
SqlMetric.uuid == NewColumn.uuid,
# Use column uuid from subquery
SqlMetric.uuid == subquery.c.uuid,
isouter=True,
)
)
Expand Down