-
Notifications
You must be signed in to change notification settings - Fork 13.6k
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.
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
fix: catch some potential errors on dual write #20351
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
from unittest import mock | ||
|
||
import pytest | ||
from sqlalchemy.orm.exc import NoResultFound | ||
|
||
from superset.connectors.sqla.models import SqlaTable, TableColumn | ||
from superset.extensions import db | ||
from tests.integration_tests.base_tests import SupersetTestCase | ||
from tests.integration_tests.fixtures.datasource import load_dataset_with_columns | ||
|
||
|
||
class SqlaTableModelTest(SupersetTestCase): | ||
@pytest.mark.usefixtures("load_dataset_with_columns") | ||
def test_dual_update_column(self) -> None: | ||
""" | ||
Test that when updating a sqla ``TableColumn`` | ||
That the shadow ``Column`` is also updated | ||
""" | ||
dataset = db.session.query(SqlaTable).filter_by(table_name="students").first() | ||
column = dataset.columns[0] | ||
column_name = column.column_name | ||
column.column_name = "new_column_name" | ||
SqlaTable.update_column(None, None, target=column) | ||
|
||
# refetch | ||
dataset = db.session.query(SqlaTable).filter_by(id=dataset.id).one() | ||
assert dataset.columns[0].column_name == "new_column_name" | ||
|
||
# reset | ||
column.column_name = column_name | ||
SqlaTable.update_column(None, None, target=column) | ||
|
||
@pytest.mark.usefixtures("load_dataset_with_columns") | ||
@mock.patch("superset.columns.models.Column") | ||
def test_dual_update_column_not_found(self, column_mock) -> None: | ||
""" | ||
Test that when updating a sqla ``TableColumn`` | ||
That the shadow ``Column`` is also updated | ||
""" | ||
dataset = db.session.query(SqlaTable).filter_by(table_name="students").first() | ||
column = dataset.columns[0] | ||
column_uuid = column.uuid | ||
with mock.patch("sqlalchemy.orm.query.Query.one", side_effect=NoResultFound): | ||
SqlaTable.update_column(None, None, target=column) | ||
|
||
# refetch | ||
dataset = db.session.query(SqlaTable).filter_by(id=dataset.id).one() | ||
# it should create a new uuid | ||
assert dataset.columns[0].uuid != column_uuid | ||
|
||
# reset | ||
column.uuid = column_uuid | ||
SqlaTable.update_column(None, None, target=column) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this was erroring for me when running integration tests, so I just thought it would be safe to catch and log the error in case it happens in the real world.