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

Fixed behavior of insertOrUpdate on tables with auto_increment option (backport #2785) #2810

Open
wants to merge 1 commit into
base: 3.4.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 24, 2023

This is an automatic backport of pull request #2785 done by Mergify.
Cherry-pick of 8665e0e has failed:

On branch mergify/bp/3.4.x/pr-2785
Your branch is up to date with 'origin/3.4.x'.

You are currently cherry-picking commit 8665e0e1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   slick/src/main/scala/slick/ast/Symbol.scala

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/InsertTest.scala
	deleted by them: slick-testkit/src/test/scala/slick/test/lifted/MySQLDMLTest.scala
	both modified:   slick/src/main/scala/slick/jdbc/MySQLProfile.scala

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…on (#2785)

fix: Fixed that if there is a primary key with auto_increment and '0' is specified for primary key in insertOrUpdate, it will be incremented.

* fix: compile with scala3

* fix: Consider capability

* test: Adds test

(cherry picked from commit 8665e0e)

# Conflicts:
#	slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/InsertTest.scala
#	slick-testkit/src/test/scala/slick/test/lifted/MySQLDMLTest.scala
#	slick/src/main/scala/slick/jdbc/MySQLProfile.scala
@nafg
Copy link
Member

nafg commented Aug 24, 2023

@MarmaladeSky (or @jkugiya) I guess this needs a human to do...

@jkugiya
Copy link
Contributor

jkugiya commented Aug 26, 2023

This PR looks quite different from the main code base, what are you trying to do? The intent is not verbalized and is difficult to guess.

@nafg
Copy link
Member

nafg commented Aug 30, 2023

@jkugiya the previous PR was on main (3.5.x) but @MarmaladeSky wants it in a 3.4.2 release.

I generated this PR with @mergifyio backport but it clearly didn't work too well

Copy link
Member

nafg commented Apr 9, 2024

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Apr 9, 2024

rebase

☑️ Nothing to do

  • any of:
    • #commits-behind>0 [📌 rebase requirement]
    • #commits>1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]

@nafg
Copy link
Member

nafg commented May 24, 2024

@MarmaladeSky what happened?

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

Successfully merging this pull request may close these issues.

MySQLProfile has a significant change in UpsertBuilder logic between 3.3.3 and 3.4.1
2 participants