-
Notifications
You must be signed in to change notification settings - Fork 18
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 bug with SQL query for analysis view #483
Conversation
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## 1.3.x #483 +/- ##
=======================================
Coverage 76.95% 76.95%
=======================================
Files 12 12
Lines 1406 1406
Branches 233 233
=======================================
Hits 1082 1082
Misses 277 277
Partials 47 47
☔ View full report in Codecov by Sentry. |
This bug was noticed in a code review (cylc/cylc-ui#1355) |
Hi there, thanks for this fix. You've merged master into this branch, but the PR is being raised against 1.3.x, as a result there are a bunch of unrelated commits from the 1.4.0 branch (master) showing on this PR. The easiest way to proceed is probably to cherry-pick those commits onto 1.3.x e.g: $ git fetch upstream
$ git checkout -b fix-sql-bug upstream/1.3.x
$ git cherry-pick 3e80eedb25a311c3ecc5e9fae5fe450d56fea930
$ git cherry-pick 6b3e99fcaa71f3cf945ef3fd9ff4c9ca529b1932
$ git cherry-pick 9b8b94d93a2f92c9d448629e70875ffb313b93c2 Check the diff is as expected:
You can avoid re-opening this PR by pushing to origin/master e.g:
|
Thanks, can you just extract commit 3e80eed? May have to create a feature branch and open a new PR $ git checkout -b sql-fix upstream/1.3.x # (if the remote is called upstream)
$ git cherry-pick 3e80eedb25a311c3ecc5e9fae5fe450d56fea930 |
9b8b94d
to
94ae9ce
Compare
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.
LGTM, though I'm not sure how to test/reproduce the bug, may need @oliver-sanders to review too
I think this should do it, try viewing a workflow with:
|
Ok, tested, reproduced bug on 1.3.x but all good on this branch |
Check List
CONTRIBUTING.md
and added my name as a Code Contributor.setup.cfg
(andconda-environment.yml
if present).CHANGES.md
entry included if this is a change that can affect users?.?.x
branch.