Skip to content

Commit 7462272

Browse files
rjarryrjarry
committed
go: update all dependencies
Mostly the result of: go get -u -t ./... go mod tidy Bun 1.3 brings two breaking changes that need manual adaptation. Count and the Offset and Limit builders now work with int64 instead of int, so propagate the wider type through the pagination helpers, the query counters and the templ signatures. AddQueryHook is gone in favor of WithQueryHook, which returns a new DB instead of mutating the receiver. Signed-off-by: Robin Jarry <robin@jarry.cc>
1 parent e0222da commit 7462272

10 files changed

Lines changed: 63 additions & 64 deletions

File tree

‎go.mod‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/getpatchwork/patchwork
33
go 1.26.0
44

55
require (
6-
github.com/a-h/templ v0.3.1020
6+
github.com/a-h/templ v0.3.1070
77
github.com/alecthomas/kong v1.16.1
8-
github.com/alecthomas/kong-toml v0.4.0
8+
github.com/alecthomas/kong-toml v0.4.1
99
github.com/danielgtaylor/huma/v2 v2.39.1
1010
github.com/emersion/go-mbox v1.0.4
1111
github.com/emersion/go-message v0.18.2
@@ -15,33 +15,33 @@ require (
1515
github.com/go-sql-driver/mysql v1.10.1
1616
github.com/jackc/pgx/v5 v5.11.0
1717
github.com/stretchr/testify v1.12.1
18-
github.com/uptrace/bun v1.2.18
19-
github.com/uptrace/bun/dialect/mysqldialect v1.2.18
20-
github.com/uptrace/bun/dialect/pgdialect v1.2.18
21-
github.com/uptrace/bun/dialect/sqlitedialect v1.2.18
18+
github.com/uptrace/bun v1.3.0
19+
github.com/uptrace/bun/dialect/mysqldialect v1.3.0
20+
github.com/uptrace/bun/dialect/pgdialect v1.3.0
21+
github.com/uptrace/bun/dialect/sqlitedialect v1.3.0
2222
golang.org/x/crypto v0.57.0
2323
golang.org/x/term v0.46.0
24-
modernc.org/sqlite v1.59.0
24+
modernc.org/sqlite v1.60.1
2525
)
2626

2727
require (
2828
filippo.io/edwards25519 v1.2.0 // indirect
2929
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect
30-
github.com/andybalholm/brotli v1.2.2 // indirect
30+
github.com/andybalholm/brotli v1.2.6 // indirect
3131
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3232
github.com/cli/browser v1.3.0 // indirect
3333
github.com/dustin/go-humanize v1.1.0 // indirect
34-
github.com/fatih/color v1.16.0 // indirect
35-
github.com/fsnotify/fsnotify v1.7.0 // indirect
34+
github.com/fatih/color v1.19.0 // indirect
35+
github.com/fsnotify/fsnotify v1.10.1 // indirect
3636
github.com/google/uuid v1.6.0 // indirect
3737
github.com/jackc/pgpassfile v1.0.0 // indirect
3838
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
39-
github.com/jackc/puddle/v2 v2.2.2 // indirect
39+
github.com/jackc/puddle/v2 v2.2.3 // indirect
4040
github.com/jinzhu/inflection v1.0.0 // indirect
4141
github.com/mattn/go-colorable v0.1.15 // indirect
4242
github.com/mattn/go-isatty v0.0.24 // indirect
4343
github.com/natefinch/atomic v1.0.1 // indirect
44-
github.com/ncruces/go-strftime v1.0.0 // indirect
44+
github.com/ncruces/go-strftime v1.1.0 // indirect
4545
github.com/pelletier/go-toml v1.9.5 // indirect
4646
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
4747
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
@@ -54,8 +54,8 @@ require (
5454
golang.org/x/sync v0.23.0 // indirect
5555
golang.org/x/sys v0.48.0 // indirect
5656
golang.org/x/text v0.42.0 // indirect
57-
golang.org/x/tools v0.50.0 // indirect
58-
modernc.org/libc v1.77.0 // indirect
57+
golang.org/x/tools v0.51.0 // indirect
58+
modernc.org/libc v1.77.1 // indirect
5959
modernc.org/mathutil v1.7.1 // indirect
6060
modernc.org/memory v1.12.1 // indirect
6161
)

‎go.sum‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
22
filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
33
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e h1:HjVbSQHy+dnlS6C3XajZ69NYAb5jbGNfHanvm1+iYlo=
44
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e/go.mod h1:3mnrkvGpurZ4ZrTDbYU84xhwXW2TjTKShSwjRi2ihfQ=
5-
github.com/a-h/templ v0.3.1020 h1:ypAT/L5ySWEnZ6Zft/5yfoWXYYkhFNvEFOeeqecg4tw=
6-
github.com/a-h/templ v0.3.1020/go.mod h1:A2DlK61v+K+NRoGnhmYbNYVmtYHcFO5/AisMvBdDxTM=
5+
github.com/a-h/templ v0.3.1070 h1:3iCOXHXqFXa99OQzgkUOLJbNzv/QjFGLwKZkBAg+ADA=
6+
github.com/a-h/templ v0.3.1070/go.mod h1:iIqB3g2RHBe/WlnPwa+Bvhh1TKXHWLRnBD9NWHOLm78=
77
github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
88
github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
99
github.com/alecthomas/kong v1.16.1 h1:ixhCt93XkJ98kGposQ54+bl0IK6XwqB40AsMynU7Z8E=
1010
github.com/alecthomas/kong v1.16.1/go.mod h1:wrlbXem1CWqUV5Vbmss5ISYhsVPkBb1Yo7YKJghju2I=
11-
github.com/alecthomas/kong-toml v0.4.0 h1:sSK/HHi2M5jqSXYTxmuxkdZcJ+ip9jhYvwcjDGcaJBQ=
12-
github.com/alecthomas/kong-toml v0.4.0/go.mod h1:hRVV9iGmqYsFqs17jFQgqhkjYIxiklbfy95xJ3nlpKI=
11+
github.com/alecthomas/kong-toml v0.4.1 h1:wlRMMGGHZ222d8r91/2am4KnCqa7LJ6izyjHyH2oUSM=
12+
github.com/alecthomas/kong-toml v0.4.1/go.mod h1:4Zm33N5h+XgRKCvq0LM8LkvZqw0k+aveWGfP58/rx5Y=
1313
github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
1414
github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
15-
github.com/andybalholm/brotli v1.2.2 h1:HzTuoo2ErYQqf5qvcJInB8uvqSVxRttzkFexPWtnceM=
16-
github.com/andybalholm/brotli v1.2.2/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
15+
github.com/andybalholm/brotli v1.2.6 h1:ftYnfj6usCp+UGV5kSJ3+chpMQgU+gJf/AxsUQ52REI=
16+
github.com/andybalholm/brotli v1.2.6/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
1717
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
1818
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
1919
github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo=
@@ -31,18 +31,18 @@ github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 h1:oP4q0fw+fOSWn3
3131
github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
3232
github.com/emersion/go-smtp v0.25.0 h1:krfiHrme2JbJYDh0DGuSRbvPpbnQTH/v9CIfPincl1I=
3333
github.com/emersion/go-smtp v0.25.0/go.mod h1:ZtRRkbTyp2XTHCA+BmyTFTrj8xY4I+b4McvHxCU2gsQ=
34-
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
35-
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
36-
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
37-
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
34+
github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
35+
github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
36+
github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
37+
github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
3838
github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78=
3939
github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
4040
github.com/go-chi/chi/v5 v5.3.2 h1:5YQkICvTCSZ25hoRsyJazN0scjzKGiu4VAUc7H1o1nY=
4141
github.com/go-chi/chi/v5 v5.3.2/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto=
4242
github.com/go-sql-driver/mysql v1.10.1 h1:arlSnNLq6a5yxGxV7qg9lF4j0C+KwD6NbQyKr9QL6ME=
4343
github.com/go-sql-driver/mysql v1.10.1/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
44-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
45-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
44+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
45+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
4646
github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3 h1:LMLX+LgTNWpfvCBdFebv6EsYotImrt/Ppc5cXIriCSo=
4747
github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk=
4848
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -57,8 +57,8 @@ github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7Ulw
5757
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
5858
github.com/jackc/pgx/v5 v5.11.0 h1:IzBBtyK9AHqf98cctWFifYSci2hgQR/cd56wB4p+ogg=
5959
github.com/jackc/pgx/v5 v5.11.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
60-
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
61-
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
60+
github.com/jackc/puddle/v2 v2.2.3 h1:f8HoREISb3l5eO9coPgK7U3hKLhWGokOFVcThl5jrao=
61+
github.com/jackc/puddle/v2 v2.2.3/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
6262
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
6363
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
6464
github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY=
@@ -67,8 +67,8 @@ github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsRe
6767
github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A=
6868
github.com/natefinch/atomic v1.0.1 h1:ZPYKxkqQOx3KZ+RsbnP/YsgvxWQPGxjC0oBt2AhwV0A=
6969
github.com/natefinch/atomic v1.0.1/go.mod h1:N/D/ELrljoqDyT3rZrsUmtsuzvHkeB/wWjHV22AZRbM=
70-
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
71-
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
70+
github.com/ncruces/go-strftime v1.1.0 h1:vtPmPWMkb539RGV9WpWT9EwJGvrOCKvMNI4obWL47Hk=
71+
github.com/ncruces/go-strftime v1.1.0/go.mod h1:yVaq7iwCN09vHRrKBrrflXT0M9tTMG2KmZ9Fj7xeG/g=
7272
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
7373
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
7474
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -83,14 +83,14 @@ github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWD
8383
github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
8484
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
8585
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
86-
github.com/uptrace/bun v1.2.18 h1:3HnRcMfS6OBPMG1eSOzlbFJ/X/AyMEJb7rMxE6VQvDU=
87-
github.com/uptrace/bun v1.2.18/go.mod h1:wNltaKJk4JtOt4SG5I5zmA7v0/Mzjh1+/S906Rayd3Y=
88-
github.com/uptrace/bun/dialect/mysqldialect v1.2.18 h1:w+3iuWa4cVmsXXt8w28A0+Ikve77AU0tiBWG6UvGvM8=
89-
github.com/uptrace/bun/dialect/mysqldialect v1.2.18/go.mod h1:FhJEK620SM9HJ9fx0/IHT7k1cpn2+6MmtKvNptWezPY=
90-
github.com/uptrace/bun/dialect/pgdialect v1.2.18 h1:IZ6nM2+OYrL8lkEAy7UkSEZvoa3vluTAUlZfPtlRB2k=
91-
github.com/uptrace/bun/dialect/pgdialect v1.2.18/go.mod h1:Tqdf4QP1okrGYpXfodXvCOK6Ob1OOTwSaoAzCgBB3IU=
92-
github.com/uptrace/bun/dialect/sqlitedialect v1.2.18 h1:Z33SY/U++XK9uGWqS4h8OZVxfCXguIG+sU9cYq2PGFQ=
93-
github.com/uptrace/bun/dialect/sqlitedialect v1.2.18/go.mod h1:1MVOS/Ncy4FZbkJcgUFH6OqYoQinYNjkEwsmNQEXz2A=
86+
github.com/uptrace/bun v1.3.0 h1:hUcbfRpbQk4/upFSI+uZf6jSJw5A0lkIKt0XdpvbUZo=
87+
github.com/uptrace/bun v1.3.0/go.mod h1:wNltaKJk4JtOt4SG5I5zmA7v0/Mzjh1+/S906Rayd3Y=
88+
github.com/uptrace/bun/dialect/mysqldialect v1.3.0 h1:zoOoEIrr3Vzj872WA3wOUnIsFfkowl4xlKhd2vDJJUw=
89+
github.com/uptrace/bun/dialect/mysqldialect v1.3.0/go.mod h1:fPUV+vUfRceFIQ8dzRrUGYveSzGvPTafMyMh53ay3nc=
90+
github.com/uptrace/bun/dialect/pgdialect v1.3.0 h1:0ZkGqGugxaPCxko4DV2f4d7i+FnM2Qj3rNpChfhiv54=
91+
github.com/uptrace/bun/dialect/pgdialect v1.3.0/go.mod h1:kP5HGEpAX8iJCqj3WHm04XnoeBPacdCN1P2HiwMtHpg=
92+
github.com/uptrace/bun/dialect/sqlitedialect v1.3.0 h1:XzxkORYksxkLsIQLJHFYUb3yDvqSQHzTungyKpJhHTw=
93+
github.com/uptrace/bun/dialect/sqlitedialect v1.3.0/go.mod h1:x2D1sY50Itio0I/FVdNe30oMUT2ObiAS+oILcMR+Wys=
9494
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
9595
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
9696
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
@@ -145,15 +145,15 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
145145
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
146146
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
147147
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
148-
golang.org/x/tools v0.50.0 h1:c2ifzfcuY7L90lZ2aKd8S4K2NpASF08SZx9ZuJkHmSU=
149-
golang.org/x/tools v0.50.0/go.mod h1:7ulVMw3831Mwi5EZD6RomGyffr4VFjuNYXf2BbCEAV0=
148+
golang.org/x/tools v0.51.0 h1:k4Xc/1Om9jwkBJBo4NVLMSARBoWtK10mx+W5BnXCeAI=
149+
golang.org/x/tools v0.51.0/go.mod h1:9eEncMayCV6zRMGhR5eZEC2iBx98qWcF1HZ9Z7wJOoA=
150150
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
151151
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
152152
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
153153
modernc.org/cc/v4 v4.29.7 h1:q+NXGJ0bK3b4TXFYQQVr9pYETGnmwFWkrUzJnMya/Tg=
154154
modernc.org/cc/v4 v4.29.7/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=
155-
modernc.org/ccgo/v4 v4.36.0 h1:T5h7ZMcrw2r94oDLtBcU3YI6e1W8DiUg2SJIs2fwD2s=
156-
modernc.org/ccgo/v4 v4.36.0/go.mod h1:rrtGc2QkS239nYb/mQNuBMyjq3/y3ZXWbBjPoV3wqzA=
155+
modernc.org/ccgo/v4 v4.36.1 h1:ZNIUZAryN0UgnJwtyxrdEzcFc3yD4Cu4AzjfPXsLsIE=
156+
modernc.org/ccgo/v4 v4.36.1/go.mod h1:rrtGc2QkS239nYb/mQNuBMyjq3/y3ZXWbBjPoV3wqzA=
157157
modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
158158
modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
159159
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
@@ -162,8 +162,8 @@ modernc.org/gc/v3 v3.1.5 h1:21ldfPfRYE31Tb7B3mwAK8gy1AxP4+dKjrOQPfqakoc=
162162
modernc.org/gc/v3 v3.1.5/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
163163
modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
164164
modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
165-
modernc.org/libc v1.77.0 h1:wV+faa9ixRoUNlakU0fHLi/1kV2YLG8D8Ksk3c2mPtY=
166-
modernc.org/libc v1.77.0/go.mod h1:BmXDCJcMkRMRbX2EI8+Zhh4fKWlHNbCCZEy0tiZevP4=
165+
modernc.org/libc v1.77.1 h1:Ct8j47QtiZ1Enj2DtFXQtUqrPCAjdCmPjtCuvrYQ0Hs=
166+
modernc.org/libc v1.77.1/go.mod h1:87/pZ4L6nD1zqW4nItuS12YO7hN1igAah34xjnQo/W0=
167167
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
168168
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
169169
modernc.org/memory v1.12.1 h1:nFMiWrpStgZczNl6XI9GnIk/rWhYIyHGUaR04pGbp9g=
@@ -172,8 +172,8 @@ modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg=
172172
modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
173173
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
174174
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
175-
modernc.org/sqlite v1.59.0 h1:X1es1GpqBlS/5T+vbM4HLUdaa8OtQx468DF2vrx+38A=
176-
modernc.org/sqlite v1.59.0/go.mod h1:+paeT2A3iPRHkQDwG7oA6Tk0zQd5woMEI8q7orfry8k=
175+
modernc.org/sqlite v1.60.1 h1:/blz53O951KWFOso4QQvEs/Fq6cDBKLtMVrYNSeJVKw=
176+
modernc.org/sqlite v1.60.1/go.mod h1:1dIoEagfDE72QytD5scH1lxARtaUgKgHC/NuApA27r0=
177177
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
178178
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
179179
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

‎pkg/api/api.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type PageParams struct {
2828
PerPage int `query:"per_page" minimum:"1" doc:"Results per page"`
2929
}
3030

31-
func (p PageParams) offsetPage(cfg *config.Config) (int, int) {
31+
func (p PageParams) offsetPage(cfg *config.Config) (int64, int64) {
3232
perPage := p.PerPage
3333
if perPage < 1 {
3434
perPage = cfg.Http.ApiPageSize
@@ -38,7 +38,7 @@ func (p PageParams) offsetPage(cfg *config.Config) (int, int) {
3838
}
3939
offset := (p.Page - 1) * perPage
4040

41-
return offset, perPage
41+
return int64(offset), int64(perPage)
4242
}
4343

4444
type SearchParams struct {

‎pkg/api/util.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ func loadSeriesDetail(ctx context.Context, q *db.Queries, base string, series []
5555
if err != nil {
5656
log.Errorf("count series patches: %v", err)
5757
}
58-
s.ReceivedTotal = count
59-
s.ReceivedAll = count >= int(s.Total)
58+
s.ReceivedTotal = int(count)
59+
s.ReceivedAll = count >= int64(s.Total)
6060

6161
if s.CoverLetterID != nil {
6262
var cover db.Cover
@@ -293,7 +293,7 @@ func updateRelated(
293293
return tx.Commit()
294294
}
295295

296-
func buildLinkHeader(page, perPage, total int) string {
296+
func buildLinkHeader(page int, perPage, total int64) string {
297297
lastPage := (total + perPage - 1) / perPage
298298
if lastPage < 1 {
299299
lastPage = 1
@@ -302,7 +302,7 @@ func buildLinkHeader(page, perPage, total int) string {
302302
if page > 1 {
303303
link += fmt.Sprintf(", </?page=%d>; rel=\"prev\"", page-1)
304304
}
305-
if page < lastPage {
305+
if int64(page) < lastPage {
306306
link += fmt.Sprintf(", </?page=%d>; rel=\"next\"", page+1)
307307
}
308308
return link

‎pkg/db/patch.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (q *Queries) GetPatchBySeriesAndNumber(seriesID int, number int) (*Patch, e
6666
return &p, err
6767
}
6868

69-
func (q *Queries) CountPredecessorPatches(seriesID int, number int) (int, error) {
69+
func (q *Queries) CountPredecessorPatches(seriesID int, number int) (int64, error) {
7070
return q.Select((*Patch)(nil)).
7171
Where("series_id = ?", seriesID).
7272
Where("number < ?", number).
@@ -91,7 +91,7 @@ func (q *Queries) UpdatePatchesBySeriesToState(seriesID, stateID *int) error {
9191
return err
9292
}
9393

94-
func (q *Queries) CountPatchesInSeries(seriesID int) (int, error) {
94+
func (q *Queries) CountPatchesInSeries(seriesID int) (int64, error) {
9595
return q.Select((*Patch)(nil)).
9696
Where("series_id = ?", seriesID).
9797
Count(q.Ctx)

‎pkg/mail/event.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (p *parser) createPatchCompletedEvent() {
7676
}
7777

7878
predCount, err := p.db.CountPredecessorPatches(p.series.ID, number)
79-
if err != nil || predCount != number-1 {
79+
if err != nil || predCount != int64(number-1) {
8080
return
8181
}
8282

@@ -113,7 +113,7 @@ func (p *parser) createSeriesCompletedEvent() {
113113
if err != nil {
114114
return
115115
}
116-
if count < p.series.Total {
116+
if count < int64(p.series.Total) {
117117
return
118118
}
119119

‎pkg/web/auth.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ func (h *webHandler) RegisterSubmit(w http.ResponseWriter, r *http.Request) {
5555
}
5656

5757
if len(errors) == 0 {
58-
var count int
59-
count, _ = q.Select((*db.User)(nil)).
58+
count, _ := q.Select((*db.User)(nil)).
6059
Where("username = ?", username).
6160
Count(q.Ctx)
6261
if count > 0 {

‎pkg/web/patches.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ func (h *webHandler) PatchList(w http.ResponseWriter, r *http.Request) {
6666
serverErrorPage(w, "count patches", err)
6767
return
6868
}
69-
totalPages := (total + perPage - 1) / perPage
69+
totalPages := (int(total) + perPage - 1) / perPage
7070
if page > totalPages && totalPages > 0 {
7171
page = totalPages
7272
}
7373

7474
var patches []db.Patch
7575
err = sq.Relation("Submitter").Relation("State").Relation("Delegate").
76-
Offset((page-1)*perPage).Limit(perPage).Scan(q.Ctx, &patches)
76+
Offset(int64((page-1)*perPage)).Limit(int64(perPage)).Scan(q.Ctx, &patches)
7777
if err != nil {
7878
serverErrorPage(w, "list patches", err)
7979
return
@@ -160,7 +160,7 @@ func (h *webHandler) PatchList(w http.ResponseWriter, r *http.Request) {
160160
Sort: sort,
161161
Page: page,
162162
PerPage: perPage,
163-
Total: total,
163+
Total: int(total),
164164
TotalPages: totalPages,
165165
BaseQuery: bq,
166166
SeriesNames: seriesNames,

‎pkg/web/projects.templ‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ templ projectListPage(pc pageContext, projects []db.Project) {
4242
}
4343
}
4444

45-
templ projectDetailPage(pc pageContext, project db.Project, maintainers []db.User, nPatches int, nArchived int) {
45+
templ projectDetailPage(pc pageContext, project db.Project, maintainers []db.User, nPatches, nArchived int64) {
4646
@layout(project.Name, []breadcrumb{
4747
{Label: project.Name},
4848
}, pc) {
@@ -78,7 +78,7 @@ templ projectDetailPage(pc pageContext, project db.Project, maintainers []db.Use
7878
<th>Patches</th>
7979
<td>
8080
<a href={ templ.SafeURL("/project/" + project.Linkname + "/list") }>
81-
{ intStr(nPatches) }
81+
{ nPatches }
8282
</a>
8383
if nArchived > 0 {
8484
{ fmt.Sprintf(" (+ %d archived)", nArchived) }

‎pkg/web/web.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func NewRouter(cfg *config.Config, database *bun.DB, bus db.EventBus, version st
4646
r.Use(slowRequestLogger(t))
4747
}
4848
if t := cfg.Http.SlowQuery.Duration(); t > 0 {
49-
database.AddQueryHook(db.NewSlowQueryHook(t))
49+
database = database.WithQueryHook(db.NewSlowQueryHook(t))
5050
}
5151
r.Use(db.Middleware(database, bus))
5252

0 commit comments

Comments
 (0)