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.

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

Allow Query.options to be None #6519

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Allow Query.options to be None #6519

merged 2 commits into from
Oct 16, 2023

Conversation

eradman
Copy link
Collaborator

@eradman eradman commented Oct 13, 2023

Query.options may not have a value on a database created by 10.1.0

What type of PR is this?

  • Bug Fix

Description

This incompatibility was introduced in #4797

How is this tested?

  • Unit tests (pytest, jest)
  • Manually

Query.options may not have a value on a database created by 10.1.0
@codecov
Copy link

codecov bot commented Oct 13, 2023

Codecov Report

Merging #6519 (1a3d0de) into master (eafe30d) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #6519   +/-   ##
=======================================
  Coverage   61.26%   61.26%           
=======================================
  Files         158      158           
  Lines       12889    12889           
  Branches     1755     1755           
=======================================
  Hits         7896     7896           
  Misses       4743     4743           
  Partials      250      250           
Files Coverage Δ
redash/models/__init__.py 92.25% <100.00%> (ø)

@justinclift
Copy link
Member

justinclift commented Oct 13, 2023

This incompatibility was introduced in #5751

Is that the correct PR number?

Looking at that PR just now, it seems like it was closed without being merged. (?)

@eradman
Copy link
Collaborator Author

eradman commented Oct 13, 2023

Ah right, updated the PR

Also bump minimum counter font size to 14
@justinclift
Copy link
Member

Ah right, updated the PR

Thanks, that seems like the right one now. 😄

@justinclift
Copy link
Member

@eradman If you reckon this is ready to merge, then I'm happy to do so. 😄

@eradman
Copy link
Collaborator Author

eradman commented Oct 16, 2023

This seems good in my testing. With this patch I have succussfuly upgraded Redash with queries created by 10.1.0

Copy link
Member

@justinclift justinclift left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, lets merge this then. 😄

@justinclift justinclift merged commit 6b98197 into getredash:master Oct 16, 2023
15 checks passed
@eradman
Copy link
Collaborator Author

eradman commented Oct 16, 2023

Appologies, somehow I managed to update this PR with the fix for the counter widget as well (#6521)

We can revert this, or leave it as is and confirm that this fixes the problem

@justinclift
Copy link
Member

Ahhh, damn. We've subsequently merged other PRs too, so not super clean to revert.

Are you ok to check if the accidentally-included-fix does solve the counter widget problem?

If it does, then we got lucky. 😁

If not though, then figuring out the proper fix for the counter widget issue (#6521) and getting it merged there is probably the right approach. Hopefully. 😄

@eradman
Copy link
Collaborator Author

eradman commented Oct 16, 2023

The counter widget fix (1a3d0de) is working well for me. I'll respond to any feedback in #6521

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants