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

Add merge completion case #1026

Merged
merged 3 commits into from
Jan 13, 2024

Conversation

massimosiani
Copy link
Contributor

No description provided.

@mpilquist
Copy link
Member

Thanks! Would you mind retargeting this to the series/0.6.x branch?

@massimosiani massimosiani changed the base branch from main to series/0.6.x January 10, 2024 17:58
@armanbilge
Copy link
Member

Re-triggering CI ...

@armanbilge armanbilge closed this Jan 10, 2024
@armanbilge armanbilge reopened this Jan 10, 2024
@massimosiani
Copy link
Contributor Author

I believe that the tests run on pg 11, while MERGE has been introduced in pg 15. Should we run the test conditionally?

@mpilquist
Copy link
Member

Can we make the test check for merge support and then skip if not enabled on the server?

@codecov-commenter
Copy link

codecov-commenter commented Jan 11, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (7e8ae17) 84.33% compared to head (6d943be) 84.29%.
Report is 2 commits behind head on series/0.6.x.

Files Patch % Lines
...d/src/main/scala/net/message/CommandComplete.scala 50.00% 1 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           series/0.6.x    #1026      +/-   ##
================================================
- Coverage         84.33%   84.29%   -0.04%     
================================================
  Files               126      126              
  Lines              1736     1738       +2     
  Branches            197      180      -17     
================================================
+ Hits               1464     1465       +1     
- Misses              272      273       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Comment on lines 544 to 547
} yield "ok")
.recoverWith {
case SqlState.SyntaxError(ex) if ex.message.startsWith("""Syntax error at or near "MERGE"""") => s.execute(deleteCity)(Garin.id).as("ok")
}
Copy link
Member

Choose a reason for hiding this comment

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

Hm, instead of this can we do something like SELECT version(); to decide whether or not to run this test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah thanks! I was looking for querying direct support of merge, but that's much better of course.

@massimosiani
Copy link
Contributor Author

It doesn't change the discussion above, but PG 11 seems EOL since November 2023 (https://www.postgresql.org/support/versioning/). Should we upgrade the docker to PG 12 (in a separate PR)?

@mpilquist
Copy link
Member

Yeah that's a good idea.

@mpilquist mpilquist merged commit 7aa2b11 into typelevel:series/0.6.x Jan 13, 2024
14 checks passed
@massimosiani massimosiani deleted the merge-completion branch January 14, 2024 16:50
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.

None yet

4 participants