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.

Sign up for GitHub

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

Jump to bottom

Quote table release in sql queries #27205

Merged
merged 3 commits into from
Sep 23, 2023
Merged

Quote table release in sql queries #27205

merged 3 commits into from
Sep 23, 2023

Conversation

KN4CK3R
Copy link
Member

@KN4CK3R KN4CK3R commented Sep 23, 2023

Fixes #27174

release is a reserved keyword in MySql. I can't reproduce the issue on my setup and we have a test for that code but it seems there can be setups where it fails.

gitea/tests/integration/repo_activity_test.go

Lines 45 to 46 in a101dba

req := NewRequest(t, "GET", "/user2/repo1/activity")
resp = session.MakeRequest(t, req, http.StatusOK)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 23, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 23, 2023
@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 Sep 23, 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 Sep 23, 2023
@KN4CK3R KN4CK3R enabled auto-merge (squash) September 23, 2023 11:39
@KN4CK3R KN4CK3R added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 23, 2023
@KN4CK3R KN4CK3R merged commit bcb78e7 into go-gitea:main Sep 23, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Sep 23, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 23, 2023
@lunny lunny added backport/v1.20 This PR should be backported to Gitea 1.20 backport/v1.21 This PR should be backported to Gitea 1.21 labels Sep 23, 2023
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.20. @KN4CK3R, please send one manually. 🍵

go run ./contrib/backport 27205
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Sep 23, 2023
@GiteaBot GiteaBot mentioned this pull request Sep 23, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 23, 2023
@KN4CK3R @GiteaBot
Quote table release in sql queries (go-gitea#27205)
86837c7 
Fixes go-gitea#27174

`release` is a reserved keyword in MySql. I can't reproduce the issue on
my setup and we have a test for that code but it seems there can be
setups where it fails.


https://github.com/go-gitea/gitea/blob/a101dbaa7952e359843c6d8303ca24a0e63c865c/tests/integration/repo_activity_test.go#L45-L46
KN4CK3R added a commit to KN4CK3R/gitea that referenced this pull request Sep 23, 2023
@KN4CK3R
Quote table release in sql queries (go-gitea#27205)
89c6de2 
Fixes go-gitea#27174

`release` is a reserved keyword in MySql. I can't reproduce the issue on
my setup and we have a test for that code but it seems there can be
setups where it fails.
@KN4CK3R KN4CK3R mentioned this pull request Sep 23, 2023
Merged
@KN4CK3R KN4CK3R deleted the fix-27174 branch September 23, 2023 17:59
KN4CK3R added a commit that referenced this pull request Sep 23, 2023
@GiteaBot @KN4CK3R
Quote table release in sql queries (#27205) (#27218)
64c0a6a 
Backport #27205 by @KN4CK3R

Fixes #27174

`release` is a reserved keyword in MySql. I can't reproduce the issue on
my setup and we have a test for that code but it seems there can be
setups where it fails.


https://github.com/go-gitea/gitea/blob/a101dbaa7952e359843c6d8303ca24a0e63c865c/tests/integration/repo_activity_test.go#L45-L46

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
lafriks pushed a commit that referenced this pull request Sep 23, 2023
@KN4CK3R
Quote table release in sql queries (#27205) (#27219)
eae6985 
Backport of #27205

Fixes #27174

`release` is a reserved keyword in MySql. I can't reproduce the issue on
my setup and we have a test for that code but it seems there can be
setups where it fails.
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 25, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
294a64d 
* giteaofficial/main:
  Add missing public user visibility in user details page (go-gitea#27246)
  Use mask-based fade-out effect for `.new-menu` (go-gitea#27181)
  [skip ci] Updated translations via Crowdin
  Fix z-index on markdown completion (go-gitea#27237)
  Update database-preparation and add note re: MariaDB (go-gitea#27232)
  cleanup locale function usage (go-gitea#27227)
  Fix EOL handling in web editor (go-gitea#27141)
  Fix PushEvent NullPointerException jenkinsci/github-plugin (go-gitea#27203)
  fix issues on action runners page (go-gitea#27226)
  Fix Fomantic UI dropdown icon bug when there is a search input in menu (go-gitea#27225)
  Update go-enry to 2.8.5 (go-gitea#27215)
  Update nodejs installation method in release container (go-gitea#27207)
  Quote table `release` in sql queries (go-gitea#27205)
  Fix push mirror, wrong timestamp format (go-gitea#27153)
  Allow copying issue comment link on archived repos and when not logged in (go-gitea#27193)
  fix: text decorator on issue sidebar menu label (go-gitea#27206)
  Update JS and Poetry dependencies and eslint (go-gitea#27200)
  Remove some dead code (go-gitea#27196)

# Conflicts:
#	templates/repo/issue/view_content/context_menu.tmpl
nrdufour added a commit to nrdufour/home-ops that referenced this pull request Oct 4, 2023
@nrdufour
chore(deps): update docker.io/gitea/gitea docker tag to v1.20.5 (#129)
f9b6839 
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker.io/gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.20.4` -> `1.20.5` |

---

### ⚠ Dependency Lookup Warnings ⚠

Warnings were logged while processing this repo. Please check the logs for more information.

---

### Release Notes

<details>
<summary>go-gitea/gitea (docker.io/gitea/gitea)</summary>

### [`v1.20.5`](https://github.com/go-gitea/gitea/blob/HEAD/CHANGELOG.md#1205---2023-10-03)

[Compare Source](go-gitea/gitea@v1.20.4...v1.20.5)

-   ENHANCEMENTS
    -   Fix z-index on markdown completion ([#&#8203;27237](go-gitea/gitea#27237)) ([#&#8203;27242](go-gitea/gitea#27242) & [#&#8203;27238](go-gitea/gitea#27238))
    -   Use secure cookie for HTTPS sites ([#&#8203;26999](go-gitea/gitea#26999)) ([#&#8203;27013](go-gitea/gitea#27013))
-   BUGFIXES
    -   Fix git 2.11 error when checking IsEmpty ([#&#8203;27393](go-gitea/gitea#27393)) ([#&#8203;27396](go-gitea/gitea#27396))
    -   Allow get release download files and lfs files with oauth2 token format ([#&#8203;26430](go-gitea/gitea#26430)) ([#&#8203;27378](go-gitea/gitea#27378))
    -   Fix orphan check for deleted branch ([#&#8203;27310](go-gitea/gitea#27310)) ([#&#8203;27320](go-gitea/gitea#27320))
    -   Quote table `release` in sql queries ([#&#8203;27205](go-gitea/gitea#27205)) ([#&#8203;27219](go-gitea/gitea#27219))
    -   Fix release URL in webhooks ([#&#8203;27182](go-gitea/gitea#27182)) ([#&#8203;27184](go-gitea/gitea#27184))
    -   Fix successful return value for `SyncAndGetUserSpecificDiff` ([#&#8203;27152](go-gitea/gitea#27152)) ([#&#8203;27156](go-gitea/gitea#27156))
    -   fix pagination for followers and following ([#&#8203;27127](go-gitea/gitea#27127)) ([#&#8203;27138](go-gitea/gitea#27138))
    -   Fix issue templates when blank isses are disabled ([#&#8203;27061](go-gitea/gitea#27061)) ([#&#8203;27082](go-gitea/gitea#27082))
    -   Fix context cache bug & enable context cache for dashabord commits' authors([#&#8203;26991](go-gitea/gitea#26991)) ([#&#8203;27017](go-gitea/gitea#27017))
    -   Fix INI parsing for value with trailing slash ([#&#8203;26995](go-gitea/gitea#26995)) ([#&#8203;27001](go-gitea/gitea#27001))
    -   Fix PushEvent NullPointerException jenkinsci/github-plugin ([#&#8203;27203](go-gitea/gitea#27203)) ([#&#8203;27249](go-gitea/gitea#27249))
    -   Fix organization field being null in POST /orgs/{orgid}/teams ([#&#8203;27150](go-gitea/gitea#27150)) ([#&#8203;27167](go-gitea/gitea#27167) & [#&#8203;27162](go-gitea/gitea#27162))
    -   Fix bug of review request number ([#&#8203;27406](go-gitea/gitea#27406)) ([#&#8203;27104](go-gitea/gitea#27104))
-   TESTING
    -   services/wiki: Close() after error handling ([#&#8203;27129](go-gitea/gitea#27129)) ([#&#8203;27137](go-gitea/gitea#27137))
-   DOCS
    -   Improve actions docs related to `pull_request` event ([#&#8203;27126](go-gitea/gitea#27126)) ([#&#8203;27145](go-gitea/gitea#27145))
-   MISC
    -   Add logs for data broken of comment review ([#&#8203;27326](go-gitea/gitea#27326)) ([#&#8203;27344](go-gitea/gitea#27344))
    -   Load reviewer before sending notification ([#&#8203;27063](go-gitea/gitea#27063)) ([#&#8203;27064](go-gitea/gitea#27064))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zLjIiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zLjIiLCJ0YXJnZXRCcmFuY2giOiJtYWluIn0=-->

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/129
Co-authored-by: Renovate <renovate@ptinem.io>
Co-committed-by: Renovate <renovate@ptinem.io>
@lng2020 lng2020 added backport/done All backports for this PR have been created and removed backport/manual No power to the bots! Create your backport yourself! labels Nov 12, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.20 This PR should be backported to Gitea 1.20 backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Activity Page not showing for all repos.
7 participants
@KN4CK3R @GiteaBot @silverwind @wxiaoguang @delvh @lunny @lng2020