Fixing onConflict case when custom NamingStrategy is used

[myazinn]

Fixes #3144

Notes

Apologies for the messy tests. The newly added test fails when used with ]querySchema], even before the changes introduced in #3137. I’m not very familiar with this feature, so it’s possible that not renaming fields when using querySchema is the expected behavioгr.

BTW suggested sbt scalariformFormat test:scalariformFormat doesn't seem to work and prints

[error] Not a valid key: scalariformFormat (similar: scalaArtifacts, scalafmt, scalafmtDoFormatOnCompile)
[error] scalariformFormat

sbt scalafmt worked fine though

@getquill/maintainers

[regiskuckaertz]

oh, we just fell into the exact same issue and I was about to raise a PR but I just found this one 🎉 Is there anything holding this out?

[regiskuckaertz]

@kyri-petrou very sorry to pull you in, would you be willing to merge this? I can raise a fresh PR if needed