chore: refactor SqlTable and BaseDatasource into Dataset #28875
+1,766
−2,034
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
github-actions
bot
added
risk:db-migration
mistercrunch
force-pushed
the
Dataset
branch
2 times, most recently
from
aa29cc9
to
f952323
Compare
mistercrunch
commented
Jun 6, 2024
| result = db_engine_spec.fetch_data(cursor, limit=1) | ||
| result_set = SupersetResultSet(result, cursor.description, db_engine_spec) | ||
| return result_set.columns | ||
| result_set = database.get_result_set(query, catalog, schema, limit=1) |
There was a problem hiding this comment.
Streamlining with a factored-out Dataset.get_result_set
mistercrunch
commented
Jun 6, 2024
| @@ -636,14 +636,24 @@ def mutate_sql_based_on_config(self, sql_: str, is_split: bool = False) -> str: | |||
| ) | |||
| return sql_ | |||
|
|
|||
| def get_df( # pylint: disable=too-many-locals | |||
| def render_sql(self, sql: str, **kwargs: Any) -> str: | |||
There was a problem hiding this comment.
this method (Database.render_sql) allows quite a bite of simplification as the template renderer was getting passed around like crazy
mistercrunch
commented
Jun 6, 2024
| tp = jinja_context.get_template_processor(self) | ||
| return tp.process_template(sql, **kwargs) | ||
|
|
||
| def get_result_set( |
There was a problem hiding this comment.
Factoring get_result_set out of get_df as its needed places, and makes the method a bit more pallatable.
mistercrunch
commented
Jun 6, 2024
| @@ -144,15 +143,6 @@ def validate_adhoc_subquery( | |||
| return ";\n".join(str(statement) for statement in statements) | |||
|
|
|||
|
|
|||
| def json_to_dict(json_str: str) -> dict[Any, Any]: | |||
There was a problem hiding this comment.
moved to utils/json.py
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
Refactoring BaseDatasource into SqlaTable, and renaming this Dataset to reflect the current information architecture.
Looiking to do more renaming over time, things like: