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 UPSERTs on SQLite 3.24+ #4477

Merged
merged 7 commits into from Jan 28, 2019

Conversation

Projects
None yet
3 participants
@hawkowl
Copy link
Contributor

hawkowl commented Jan 25, 2019

No description provided.

hawkowl added some commits Jan 25, 2019

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 25, 2019

Codecov Report

Merging #4477 into develop will decrease coverage by 0.01%.
The diff coverage is 77.77%.

@@             Coverage Diff             @@
##           develop    #4477      +/-   ##
===========================================
- Coverage    74.73%   74.71%   -0.02%     
===========================================
  Files          336      336              
  Lines        34122    34125       +3     
  Branches      5547     5548       +1     
===========================================
- Hits         25500    25498       -2     
- Misses        7048     7049       +1     
- Partials      1574     1578       +4
@erikjohnston

This comment has been minimized.

Copy link
Member

erikjohnston commented Jan 25, 2019

We will need to revert #4471 before merging this

hawkowl added some commits Jan 28, 2019

add
Revert "Merge pull request #4471 from matrix-org/erikj/sqlite_native_…
…upsert"

This reverts commit 57c035d, reversing
changes made to 4a3f138.

@hawkowl hawkowl requested a review from erikjohnston Jan 28, 2019

@erikjohnston
Copy link
Member

erikjohnston left a comment

LGTM modulo adding a comment (as discussed IRL)

@hawkowl hawkowl merged commit 7072fe3 into develop Jan 28, 2019

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@hawkowl hawkowl deleted the hawkowl/fix-upserts-2 branch Jan 28, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment