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

Fix session key conflict with database keyword #28613

Merged
merged 8 commits into from
Dec 27, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Dec 25, 2023

This is a regression from #28220 .
builder.Cond will not add ` automatically but xorm method Get/Find adds `.

This PR also adds tests to prevent the method from being implemented incorrectly. The tests are added in integrations to test every database.

@lunny lunny added the type/bug label Dec 25, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 25, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 25, 2023
tests/integration/session_test.go Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 25, 2023
@delvh delvh added type/testing issue/regression Issue needs no code to be fixed, only a description on how to fix it yourself and removed issue/regression Issue needs no code to be fixed, only a description on how to fix it yourself labels Dec 25, 2023
@delvh
Copy link
Member

delvh commented Dec 25, 2023

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 27, 2023
@wolfogre wolfogre added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 27, 2023
@lunny lunny merged commit 4c29c75 into go-gitea:main Dec 27, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Dec 27, 2023
@lunny lunny deleted the lunny/fix_regression_session_key branch December 27, 2023 07:24
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 27, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 29, 2023
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  switch destination directory for apt signing keys (go-gitea#28639)
  Extend description for ARTIFACT_RETENTION_DAYS (go-gitea#28626)
  Refactor timeutil package (go-gitea#28623)
  Refactor some legacy code and remove unused code (go-gitea#28622)
  Remove unnecessary syncbranchToDB with tests (go-gitea#28624)
  Do not set `Accept` header twice (go-gitea#28598)
  [skip ci] Updated translations via Crowdin
  fix wrong link in user and organization profile when using relative url (go-gitea#28617)
  Add get actions runner registration token for API routes, repo, org, user and global level (go-gitea#27144)
  Fix session key conflict with database keyword (go-gitea#28613)
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
This is a regression from go-gitea#28220 .
`builder.Cond` will not add `` ` `` automatically but xorm method
`Get/Find` adds `` ` ``.

This PR also adds tests to prevent the method from being implemented
incorrectly. The tests are added in `integrations` to test every
database.
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
This is a regression from go-gitea#28220 .
`builder.Cond` will not add `` ` `` automatically but xorm method
`Get/Find` adds `` ` ``.

This PR also adds tests to prevent the method from being implemented
incorrectly. The tests are added in `integrations` to test every
database.
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug type/testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants