fix: add back database lookup from sip 68 revert #22129
Merged
Conversation
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
eschutho
commented
Nov 15, 2022
| data_model = SQLAInterface(SqlaTable, db.session) | ||
| query = DatasourceFilter(cls.id_column_name, data_model).apply(query, None) | ||
| return query.all() | ||
|
|
There was a problem hiding this comment.
This method was added in to the original PR to eager load the database.
Codecov Report
@@ Coverage Diff @@
## master #22129 +/- ##
==========================================
+ Coverage 66.97% 66.98% +0.01%
==========================================
Files 1832 1832
Lines 69905 69918 +13
Branches 7570 7570
==========================================
+ Hits 46820 46838 +18
+ Misses 21127 21122 -5
Partials 1958 1958
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
eschutho
changed the title
eschutho
force-pushed
the
elizabeth/sip-68-fix
branch
from
10b1bd1 to
c810cb5
Compare
eschutho
force-pushed
the
elizabeth/sip-68-fix
branch
from
c810cb5 to
8fdb22c
Compare
eschutho
commented
Nov 15, 2022
| if self.database_id and ( | ||
| not self.database or self.database.id != self.database_id | ||
| ): | ||
| self.database = session.query(Database).filter_by(id=self.database_id).one() |
There was a problem hiding this comment.
We're adding the database to the model here during flush, so removing this is what caused some issues for existing code that relied on this side effect.
AAfghahi
approved these changes
Nov 15, 2022
AnushaErrabelli
pushed a commit
to preset-io/superset
that referenced
this pull request
Nov 15, 2022
(cherry picked from commit 6f6cb18)
jinghua-qa
pushed a commit
to preset-io/superset
that referenced
this pull request
Nov 18, 2022
mistercrunch
added
🏷️ bot
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
SUMMARY
For the SIP 68 work, we were adding the SqlaTable dataset to the session during the shadow write process. Removing the dual write functionality impacted other unrelated SqlaTable instances that were trying to access the databases during different states of flush. For now, I'm putting back the current functionality until we can look into all of the edge cases here.
Original revert PR: #21986
TESTING INSTRUCTIONS
ADDITIONAL INFORMATION