Skip to content

Fix wrong type on hooktask to convert typ from char(16) to varchar(16) #14148

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
Merged
merged 14 commits into from
Jan 6, 2021
Merged

Fix wrong type on hooktask to convert typ from char(16) to varchar(16) #14148

merged 14 commits into from
Jan 6, 2021

Conversation

lunny
Copy link
Member

@lunny lunny commented Dec 25, 2020

Fix #14010

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Dec 25, 2020
@lunny lunny force-pushed the lunny/fix_webhook branch from 24d7273 to 81dd755 Compare December 25, 2020 12:41
CirnoT
CirnoT reviewed Dec 26, 2020
View reviewed changes
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 26, 2020
CirnoT
CirnoT suggested changes Dec 26, 2020
View reviewed changes
Copy link
Contributor

@CirnoT CirnoT left a comment

Choose a reason for hiding this comment

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

  • Please revert the other TrimSpace change that happened in #13960
  • Please ensure migration trims existing whitespaces or it won't fix existing webhooks

zeripath
zeripath previously requested changes Dec 26, 2020
View reviewed changes
@lunny lunny force-pushed the lunny/fix_webhook branch 5 times, most recently from eccafbd to 97d1a0a Compare January 1, 2021 15:40
@lunny lunny force-pushed the lunny/fix_webhook branch from 97d1a0a to 36caf76 Compare January 3, 2021 05:17
@lafriks lafriks mentioned this pull request Jan 4, 2021
Merged
@lafriks
Copy link
Member

lafriks commented Jan 4, 2021

@lunny migration fails on MSSQL:

[I] Migration[165]: Convert hook task type from char(16) to varchar(16) and trim the column
migration_test.go:259:
            	Error Trace:	migration_test.go:259
            	            				migration_test.go:296
            	Error:      	Received unexpected error:
            	            	migrate: do migrate: mssql: Incorrect syntax near 'MODIFY'.

@lunny
Copy link
Member Author

lunny commented Jan 4, 2021

@lunny migration fails on MSSQL:

[I] Migration[165]: Convert hook task type from char(16) to varchar(16) and trim the column
migration_test.go:259:
            	Error Trace:	migration_test.go:259
            	            				migration_test.go:296
            	Error:      	Received unexpected error:
            	            	migrate: do migrate: mssql: Incorrect syntax near 'MODIFY'.

Yes, I think this should be a bug of xorm for mssql

@zeripath
Copy link
Contributor

zeripath commented Jan 4, 2021

just use recreatetable ...

6543
6543 reviewed Jan 4, 2021
View reviewed changes
@lafriks
Copy link
Member

lafriks commented Jan 4, 2021

just use recreatetable ...

That could be expensive on servers with many webhook calls as I think webhook history table tends to be largest one of all 😅

@lunny
Copy link
Member Author

lunny commented Jan 5, 2021

depends on https://gitea.com/xorm/xorm/pulls/1849

@lunny
Copy link
Member Author

lunny commented Jan 5, 2021

blocked by #14246

@lafriks
Copy link
Member

lafriks commented Jan 5, 2021

Looks like MSSQL needs separate session for alter table also

@CirnoT
Copy link
Contributor

CirnoT commented Jan 5, 2021 •
edited
Loading

just use recreatetable ...

That could be expensive on servers with many webhook calls as I think webhook history table tends to be largest one of all 😅

Implying that this ALTER won't cause copy to tmp on MySQL anyway...

@lunny
Copy link
Member Author

lunny commented Jan 5, 2021

@CirnoT @lafriks @zeripath Please review again.

lafriks
lafriks reviewed Jan 5, 2021
View reviewed changes
lafriks
lafriks reviewed Jan 5, 2021
View reviewed changes
@lunny lunny force-pushed the lunny/fix_webhook branch from 34da08e to 7fd394d Compare January 5, 2021 12:30
@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 Jan 5, 2021
@lafriks lafriks requested review from CirnoT and zeripath January 5, 2021 12:47
6543
6543 reviewed Jan 5, 2021
View reviewed changes
CirnoT
CirnoT reviewed Jan 5, 2021
View reviewed changes
CirnoT
CirnoT reviewed Jan 5, 2021
View reviewed changes
@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 Jan 5, 2021
@6543 6543 requested a review from CirnoT January 5, 2021 21:55
@codecov-io
Copy link

codecov-io commented Jan 5, 2021 •
edited
Loading

Codecov Report

Merging #14148 (b2de9dd) into master (d2ee122) will decrease coverage by 0.02%.
The diff coverage is 1.56%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #14148      +/-   ##
==========================================
- Coverage   41.86%   41.84%   -0.03%     
==========================================
  Files         742      743       +1     
  Lines       79324    79384      +60     
==========================================
+ Hits        33209    33218       +9     
- Misses      40650    40704      +54     
+ Partials     5465     5462       -3
Impacted Files Coverage Δ
models/migrations/migrations.go 2.28% <0.00%> (-0.16%) ⬇️
models/migrations/v161.go 0.00% <0.00%> (ø)
models/migrations/v165.go 0.00% <0.00%> (ø)
models/webhook.go 69.06% <ø> (ø)
services/webhook/webhook.go 52.42% <33.33%> (ø)
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
modules/queue/unique_queue_disk_channel.go 55.38% <0.00%> (+1.53%) ⬆️
modules/charset/charset.go 73.03% <0.00%> (+4.49%) ⬆️
modules/git/repo_language_stats_nogogit.go 63.82% <0.00%> (+6.38%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d2ee122...b2de9dd. Read the comment docs.

@6543 6543 dismissed zeripath’s stale review January 6, 2021 13:54

block reason was resolved - outdated

@6543 6543 merged commit 9f73cae into go-gitea:master Jan 6, 2021
@lunny lunny deleted the lunny/fix_webhook branch January 7, 2021 01:49
a1012112796 added a commit to a1012112796/gitea that referenced this pull request Jan 14, 2021
@a1012112796
Merge branch 'master' into imap
77cedeb 
* master: (252 commits)
  Issues overview should not show issues from archived repos (go-gitea#13220)
  Display SVG files as images instead of text (go-gitea#14101)
  [skip ci] Updated translations via Crowdin
  Update docs to clarify issues raised in go-gitea#14272 (go-gitea#14318)
  [skip ci] Updated translations via Crowdin
  [Refactor] Passwort Hash/Set (go-gitea#14282)
  Add option to change username to the admin panel (go-gitea#14229)
  fix mailIssueCommentBatch for pull request (go-gitea#14252)
  Remove self from MAINTAINERS (go-gitea#14286)
  Do not reload page after adding comments in Pull Request reviews (go-gitea#13877)
  Fix session bug when introduce chi (go-gitea#14287)
  [skip ci] Updated translations via Crowdin
  Add secure/httpOnly attributes to the lang cookie (go-gitea#9690) (go-gitea#14279)
  Some code improvements (go-gitea#14266)
  [skip ci] Updated translations via Crowdin
  Fix wrong type on hooktask to convert typ from char(16) to varchar(16) (go-gitea#14148)
  Upgrade XORM links in documentation. (go-gitea#14265)
  Check permission for the appropriate unit type (go-gitea#14261)
  Add compliance check for windows to ensure cross platform build (go-gitea#14260)
  [skip ci] Updated translations via Crowdin
  ...
@go-gitea go-gitea locked and limited conversation to collaborators Feb 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@6543 6543 6543 approved these changes

@zeripath zeripath Awaiting requested review from zeripath

+1 more reviewer

@CirnoT CirnoT CirnoT approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Matrix Webhook fails - attempt displays epoch as date
7 participants
@lunny @lafriks @zeripath @CirnoT @codecov-io @6543 @GiteaBot