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

M20 rebase #922

Merged
merged 0 commits into from
Apr 2, 2019
Merged

M20 rebase #922

merged 0 commits into from
Apr 2, 2019

Conversation

jezdez
Copy link

@jezdez jezdez commented Mar 25, 2019

m20 milestone rebase

This is the m20 milestone rebase which contains
all of Redash v7 and the commits from m19 below.

Better diff view: getredash/redash@master...mozilla:m20-rebase

TO DO

Applied commits

a33e479
18695a9
1fc3098
57f11a7
a740615
6a0c867
17290cb
51be429
c27e225
1af1f42
340ac9f
b3abab9
d3eb2ad
9614858
68fa92e
a169e20
da09b7f
614ca83
af0ce47
0bcab1e
6f4bfdb
0f2f40e
7233ebb
e94d1f8
7a9c171
86f5c2f

Redundant commits not applied

68867f7 (merged with circleci commit)
87a7fb6 (considered anti-pattern)
d440b80 (feature to be ported to fork)
66501c1 (merged with column type PR)

Removed commits because of upstream fixes

0bd626d (node was upgraded to v10)
6fd67ed (needs follow-up see TODO)
e6d88ad (feature ported)
3b46720 (fixed upstream)

Removed commits after porting to redash-stmo

86f5c2f (mozilla/redash-stmo@63873a0) (was reverted in mozilla/redash-stmo@f3bc55f)
23d6f7a (mozilla/redash-stmo#29)

@emtwo
Copy link

emtwo commented Mar 25, 2019

Note that 7233ebb needs to be removed since QueryTaskTracker was removed. There is a new version that @washort will be pushing

Edit: I think commit 14b6606 might also be the cause for some test errors in tests/tasks/test_queries.py

'id': self.id,
'object_id': self.object_id,
'object_type': self.object_type,
'change_type': self.change_type,
Copy link

Choose a reason for hiding this comment

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

self.change_type doesn't exist and I think it causes issues in tests/handlers/test_queries.py

class QueryVersionListResource(BaseResource):
@require_permission('view_query')
def get(self, query_id):
results = models.Change.filter(
Copy link

Choose a reason for hiding this comment

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

This also seems to cause an issue in tests/handlers/test_queries.py. Wondering if the intention was models.Change.query.filter(...)

@washort
Copy link

washort commented Mar 26, 2019

Code updated for #786 and for #35.

@emtwo
Copy link

emtwo commented Mar 26, 2019

Pushed commits for:

  1. Making the original schedule_until migration empty.
  2. Add a merge migration to point to the latest upstream migration to avoid multiple heads
  3. Added schedule_until -> schedule.until migration
  4. Add schema drawer

@emtwo emtwo force-pushed the m20-rebase branch 2 times, most recently from 73c007a to 9308c88 Compare March 26, 2019 20:32
@washort washort merged commit 6d72e62 into master Apr 2, 2019
@jezdez jezdez added this to the 20 milestone Apr 3, 2019
@jezdez jezdez deleted the m20-rebase branch April 15, 2019 14:46
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.

3 participants