From 2af28d9f3f258c9a45103d10fff2eb2aa29f3889 Mon Sep 17 00:00:00 2001 From: Asaf Gartner Date: Mon, 2 Jan 2023 23:52:41 +0200 Subject: [PATCH] Update pgx v4 to pgx v5 --- go.mod | 24 ++++--- go.sum | 68 +++++++++++-------- src/admintools/admintools.go | 2 +- src/auth/auth.go | 2 +- src/auth/session.go | 2 +- src/config/config.go.example | 2 +- src/config/types.go | 4 +- src/db/db.go | 23 ++++--- src/discord/gateway.go | 10 +-- src/discord/history.go | 2 +- src/hmndata/threads_and_posts_helper.go | 2 +- src/migration/migration.go | 7 +- src/migration/migrationTemplate.txt | 2 +- .../migrations/2021-03-10T051621Z_Initial.go | 2 +- .../2021-03-26T033834Z_AddSessionTable.go | 2 +- ...03-28T152630Z_AllowLongerPasswordHashes.go | 2 +- .../2021-04-09T000000Z_DeleteOrphanedData.go | 2 +- ...1-04-11T195747Z_RemoveMemberAndExtended.go | 2 +- ...-04-11T210958Z_RemoveMemberAndExtended2.go | 2 +- ...-23T000000Z_FixOrphanedPostTextVersions.go | 2 +- .../2021-04-23T021147Z_RemovePostText.go | 2 +- .../2021-04-26T000000Z_DeleteStaticPages.go | 2 +- .../2021-04-26T000001Z_FixPostCategoryId.go | 2 +- ...21-04-26T235720Z_AddCommonFieldsToPosts.go | 2 +- .../2021-04-27T034327Z_UsernameUniqueIndex.go | 2 +- .../2021-04-28T015537Z_RenameHMNProject.go | 2 +- ...021-04-29T043548Z_RenameModeratedFields.go | 2 +- .../2021-05-04T001258Z_DeleteBadUnreadInfo.go | 2 +- ...-05-04T002952Z_AddUnreadInfoConstraints.go | 2 +- .../2021-05-06T031328Z_RemoveProjectNulls.go | 2 +- .../2021-06-12T014231Z_AddCSRFToken.go | 2 +- .../2021-07-03T200233Z_RemoveParserField.go | 2 +- .../2021-07-04T204642Z_ReworkPostFields.go | 2 +- .../2021-07-04T213658Z_DropThreadFields.go | 2 +- .../2021-07-04T220228Z_FixPostConstraints.go | 2 +- ...2021-07-11T060838Z_RenamePodcastColumns.go | 2 +- .../2021-07-20T024051Z_AddPostReplyId.go | 2 +- .../2021-07-22T015929Z_DropSuperuserColumn.go | 2 +- .../2021-07-28T020000Z_ReworkThreads.go | 2 +- ...-28T033604Z_AddThreadAndPostConstraints.go | 2 +- ...-07-28T040000Z_RenameCategoryToSubforum.go | 2 +- ...021-07-30T034432Z_AddUserLastMarkedRead.go | 2 +- .../2021-07-30T164240Z_DropPostParentID.go | 2 +- .../2021-08-03T014812Z_DefaultNotSticky.go | 2 +- .../2021-08-03T021418Z_DropAuthGroups.go | 2 +- .../2021-08-07T185330Z_AddDiscordBotTables.go | 2 +- ...08-08T093624Z_FixupUsersForRegistration.go | 2 +- .../2021-08-08T110926Z_AddDeletionIndices.go | 2 +- .../2021-08-08T134655Z_DeleteInactiveUsers.go | 2 +- ...-08T141819Z_FinalizeOneTimeTokenChanges.go | 2 +- .../2021-08-16T023440Z_DiscordData.go | 2 +- .../2021-08-17T052508Z_OTTUniqueConstraint.go | 2 +- .../2021-08-23T230559Z_DiscordDefaults.go | 2 +- ...021-08-26T005607Z_FixSnippetConstraints.go | 2 +- .../2021-08-27T190408Z_NewLinkData.go | 2 +- .../2021-08-28T121228Z_ChangeHMNColors.go | 2 +- .../2021-08-28T124959Z_RemoveFeatureFlags.go | 2 +- .../2021-09-05T223354Z_PublicInFunctions.go | 2 +- ...21-09-06T213226Z_DeleteIncorrectReplies.go | 2 +- .../2021-09-08T004357Z_ImageFileNotNull.go | 2 +- .../2021-09-09T033556Z_DropUpdateColumns.go | 2 +- ...09-22T182718Z_AddHandmadePostAssetUsage.go | 2 +- .../2021-09-23T041521Z_ApproveActiveUsers.go | 2 +- .../2021-09-23T061211Z_AddSubforumSort.go | 2 +- .../2021-09-25T023810Z_AddJamSnippetField.go | 2 +- .../2021-11-06T033835Z_CleanUpProjects.go | 2 +- .../2021-11-06T033930Z_PersonalProjects.go | 2 +- ...1-11-28T162300Z_AddLogoAssetsToProjects.go | 2 +- ...021-11-28T170218Z_AddDefaultsToProjects.go | 2 +- .../2021-12-26T101633Z_UserAvatarAssetId.go | 2 +- .../2022-02-13T132653Z_RemoveUserAvatarUrl.go | 2 +- ...022-02-13T200155Z_RemoveProjectLogoUrls.go | 2 +- .../2022-03-15T012144Z_TwitchTables.go | 2 +- ...2-03-15T063506Z_AddIndexOnTwitchStreams.go | 2 +- .../2022-05-06T221726Z_RenameEverything.go | 2 +- .../2022-05-26T144517Z_AddPersistentVars.go | 2 +- .../2022-06-18T010339Z_AddJamProjects.go | 2 +- ...06-26T115703Z_SnippetProjectAssociation.go | 2 +- .../2022-08-28T203935Z_AddTwitchLog.go | 2 +- ...022-09-10T000000Z_AddEducationResources.go | 2 +- .../2022-09-14T114645Z_NewTwitchTracking.go | 2 +- .../2022-10-18T062831Z_AddTwitchEnded.go | 2 +- src/migration/migrations/migrations.go | 2 +- src/migration/seed.go | 7 +- src/migration/types/types.go | 2 +- src/models/subforum.go | 2 +- src/twitch/twitch.go | 2 +- src/website/admin.go | 2 +- src/website/projects.go | 2 +- src/website/requesthandling.go | 2 +- src/website/routes.go | 2 +- src/website/user.go | 2 +- 92 files changed, 169 insertions(+), 144 deletions(-) diff --git a/go.mod b/go.mod index 3352aadc..3e2881fc 100644 --- a/go.mod +++ b/go.mod @@ -17,18 +17,21 @@ require ( github.com/gorilla/websocket v1.4.2 github.com/jackc/pgconn v1.8.0 github.com/jackc/pgtype v1.6.2 + github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae github.com/jackc/pgx/v4 v4.10.1 + github.com/jackc/pgx/v5 v5.2.0 github.com/jpillora/backoff v1.0.0 - github.com/rs/zerolog v1.26.1 + github.com/rs/zerolog v1.28.0 github.com/spf13/cobra v1.1.3 - github.com/stretchr/testify v1.7.0 + github.com/stretchr/testify v1.8.0 github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300 github.com/teacat/noire v1.1.0 github.com/wellington/go-libsass v0.9.2 github.com/yuin/goldmark v1.4.1 github.com/yuin/goldmark-highlighting v0.0.0-20210516132338-9216f9c5aa01 - golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e + golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d + mvdan.cc/xurls/v2 v2.4.0 ) require ( @@ -52,17 +55,20 @@ require ( github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgproto3/v2 v2.0.6 // indirect github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect - github.com/jackc/puddle v1.1.3 // indirect + github.com/jackc/puddle/v2 v2.1.2 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect github.com/mitchellh/copystructure v1.1.1 // indirect github.com/mitchellh/reflectwalk v1.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect - golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect - golang.org/x/text v0.3.6 // indirect + go.uber.org/atomic v1.10.0 // indirect + golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect + golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 // indirect + golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect + golang.org/x/text v0.3.8 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect - mvdan.cc/xurls/v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) replace ( diff --git a/go.sum b/go.sum index ec19f544..a6f480fe 100644 --- a/go.sum +++ b/go.sum @@ -79,7 +79,7 @@ github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -200,6 +200,8 @@ github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkAL github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= github.com/jackc/pgtype v1.6.2 h1:b3pDeuhbbzBYcg5kwNmNDun4pFUD/0AAr1kLXZLeNt8= github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= +github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae h1:s/r/bBI1EUCZvGtoJ/Ow6WPUYe08V9VpQY3fv6eq99s= +github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae/go.mod h1:CRUuPsmIajLt3dZIlJ5+O8IDSib6y8yrst8DkCthTa4= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= @@ -208,12 +210,15 @@ github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6 github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= github.com/jackc/pgx/v4 v4.10.1 h1:/6Q3ye4myIj6AaplUm+eRcz4OhK9HAvFf4ePsG40LJY= github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA= +github.com/jackc/pgx/v5 v5.2.0 h1:NdPpngX0Y6z6XDFKqmFQaE+bCtkqzvQIOt1wvBlAqs8= +github.com/jackc/pgx/v5 v5.2.0/go.mod h1:Ptn7zmohNsWEsdxRawMzk3gaKma2obW+NWTnKa0S4nk= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.3 h1:JnPg/5Q9xVJGfjsO5CPUOjnJps1JaRUm8I9FXVCFK94= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle/v2 v2.1.2 h1:0f7vaaXINONKTsxYDn4otOAiJanX/BMeAtY//BXqzlg= +github.com/jackc/puddle/v2 v2.1.2/go.mod h1:2lpufsF5mRHO6SuZkm0fNYxM6SWHfvyFj62KwNzgels= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -228,8 +233,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= @@ -244,14 +249,19 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -291,13 +301,14 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= -github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= +github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY= +github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= @@ -327,13 +338,15 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300 h1:XQdibLKagjdevRB6vAjVY4qbSr8rQ610YzTkWcxzxSI= github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300/go.mod h1:FNa/dfN95vAYCNFrIKRrlRo+MBLbwmR9Asa5f2ljmBI= @@ -344,7 +357,6 @@ github.com/wellington/go-libsass v0.9.2 h1:6Ims04UDdBs6/CGSVK5JC8FNikR5ssrsMMKE/ github.com/wellington/go-libsass v0.9.2/go.mod h1:mxgxgam0N0E+NAUMHLcu20Ccfc3mVpDkyrLDayqfiTs= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.3.6/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark-highlighting v0.0.0-20210516132338-9216f9c5aa01 h1:0SJnXjE4jDClMW6grE0xpNhwpqbPwkBTn8zpVw5C0SI= github.com/yuin/goldmark-highlighting v0.0.0-20210516132338-9216f9c5aa01/go.mod h1:TwKQPa5XkCCRC2GRZ5wtfNUTQ2+9/i19mGRijFeJ4BE= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= @@ -354,6 +366,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= @@ -367,11 +381,10 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e h1:1SzTfNOXwIS2oWiMF+6qu0OUDKb0dauo6MoDUQyu+yU= -golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY= +golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -392,7 +405,6 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -408,9 +420,8 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -420,6 +431,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc= +golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -442,17 +455,18 @@ golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc= +golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -476,12 +490,9 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -508,8 +519,8 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -522,8 +533,9 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/src/admintools/admintools.go b/src/admintools/admintools.go index 21885f33..18fcbf3b 100644 --- a/src/admintools/admintools.go +++ b/src/admintools/admintools.go @@ -19,7 +19,7 @@ import ( "git.handmade.network/hmn/hmn/src/templates" "git.handmade.network/hmn/hmn/src/website" "github.com/google/uuid" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/spf13/cobra" ) diff --git a/src/auth/auth.go b/src/auth/auth.go index 65689666..9cd296b9 100644 --- a/src/auth/auth.go +++ b/src/auth/auth.go @@ -20,7 +20,7 @@ import ( "git.handmade.network/hmn/hmn/src/oops" "git.handmade.network/hmn/hmn/src/utils" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" "golang.org/x/crypto/argon2" "golang.org/x/crypto/pbkdf2" ) diff --git a/src/auth/session.go b/src/auth/session.go index 7bb45c88..997704db 100644 --- a/src/auth/session.go +++ b/src/auth/session.go @@ -16,7 +16,7 @@ import ( "git.handmade.network/hmn/hmn/src/models" "git.handmade.network/hmn/hmn/src/oops" "git.handmade.network/hmn/hmn/src/utils" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" ) const SessionCookieName = "HMNSession" diff --git a/src/config/config.go.example b/src/config/config.go.example index aafc5b54..ea01e4ee 100644 --- a/src/config/config.go.example +++ b/src/config/config.go.example @@ -3,7 +3,7 @@ package config import ( - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/rs/zerolog" ) diff --git a/src/config/types.go b/src/config/types.go index 6ca93eac..26566654 100644 --- a/src/config/types.go +++ b/src/config/types.go @@ -3,7 +3,7 @@ package config import ( "fmt" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5/tracelog" "github.com/rs/zerolog" ) @@ -37,7 +37,7 @@ type PostgresConfig struct { Hostname string Port int DbName string - LogLevel pgx.LogLevel + LogLevel tracelog.LogLevel MinConn int32 MaxConn int32 } diff --git a/src/db/db.go b/src/db/db.go index 24941197..c2e7b250 100644 --- a/src/db/db.go +++ b/src/db/db.go @@ -13,11 +13,12 @@ import ( "git.handmade.network/hmn/hmn/src/oops" "git.handmade.network/hmn/hmn/src/utils" "github.com/google/uuid" - "github.com/jackc/pgconn" "github.com/jackc/pgtype" - "github.com/jackc/pgx/v4" - "github.com/jackc/pgx/v4/log/zerologadapter" - "github.com/jackc/pgx/v4/pgxpool" + zerologadapter "github.com/jackc/pgx-zerolog" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" + "github.com/jackc/pgx/v5/pgxpool" + "github.com/jackc/pgx/v5/tracelog" "github.com/rs/zerolog/log" ) @@ -55,8 +56,10 @@ func NewConnWithConfig(cfg config.PostgresConfig) *pgx.Conn { pgcfg, err := pgx.ParseConfig(cfg.DSN()) - pgcfg.Logger = zerologadapter.NewLogger(log.Logger) - pgcfg.LogLevel = cfg.LogLevel + pgcfg.Tracer = &tracelog.TraceLog{ + zerologadapter.NewLogger(log.Logger), + cfg.LogLevel, + } conn, err := pgx.ConnectConfig(context.Background(), pgcfg) if err != nil { @@ -79,10 +82,12 @@ func NewConnPoolWithConfig(cfg config.PostgresConfig) *pgxpool.Pool { pgcfg.MinConns = cfg.MinConn pgcfg.MaxConns = cfg.MaxConn - pgcfg.ConnConfig.Logger = zerologadapter.NewLogger(log.Logger) - pgcfg.ConnConfig.LogLevel = cfg.LogLevel + pgcfg.ConnConfig.Tracer = &tracelog.TraceLog{ + zerologadapter.NewLogger(log.Logger), + cfg.LogLevel, + } - conn, err := pgxpool.ConnectConfig(context.Background(), pgcfg) + conn, err := pgxpool.NewWithConfig(context.Background(), pgcfg) if err != nil { panic(oops.New(err, "failed to create database connection pool")) } diff --git a/src/discord/gateway.go b/src/discord/gateway.go index acd2237a..9b2ac3ef 100644 --- a/src/discord/gateway.go +++ b/src/discord/gateway.go @@ -19,7 +19,7 @@ import ( "git.handmade.network/hmn/hmn/src/oops" "git.handmade.network/hmn/hmn/src/utils" "github.com/gorilla/websocket" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" "github.com/jpillora/backoff" ) @@ -211,10 +211,10 @@ The connection process in short: - Gateway sends Ready, client is now connected to gateway Or, if we have an existing session: -- Gateway sends Hello, asking the client to heartbeat on some interval -- Client sends Resume and starts heartbeat process -- Gateway sends all missed events followed by a RESUMED event, or an Invalid Session if the - session is ded + - Gateway sends Hello, asking the client to heartbeat on some interval + - Client sends Resume and starts heartbeat process + - Gateway sends all missed events followed by a RESUMED event, or an Invalid Session if the + session is ded Note that some events probably won't be received until the Guild Create message is received. diff --git a/src/discord/history.go b/src/discord/history.go index e7295b67..1a3ed596 100644 --- a/src/discord/history.go +++ b/src/discord/history.go @@ -11,7 +11,7 @@ import ( "git.handmade.network/hmn/hmn/src/logging" "git.handmade.network/hmn/hmn/src/models" "git.handmade.network/hmn/hmn/src/utils" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" ) func RunHistoryWatcher(ctx context.Context, dbConn *pgxpool.Pool) jobs.Job { diff --git a/src/hmndata/threads_and_posts_helper.go b/src/hmndata/threads_and_posts_helper.go index 49363c96..806f0571 100644 --- a/src/hmndata/threads_and_posts_helper.go +++ b/src/hmndata/threads_and_posts_helper.go @@ -16,7 +16,7 @@ import ( "git.handmade.network/hmn/hmn/src/parsing" "git.handmade.network/hmn/hmn/src/perf" "github.com/google/uuid" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) type ThreadsQuery struct { diff --git a/src/migration/migration.go b/src/migration/migration.go index 41ce9d0c..b879c7ad 100644 --- a/src/migration/migration.go +++ b/src/migration/migration.go @@ -17,7 +17,8 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/website" "github.com/jackc/pgconn" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/tracelog" "github.com/spf13/cobra" ) @@ -171,7 +172,7 @@ func Migrate(targetVersion types.MigrationVersion) { ctx := context.Background() // In the future, this could actually do something cool. conn := db.NewConnWithConfig(config.PostgresConfig{ - LogLevel: pgx.LogLevelWarn, + LogLevel: tracelog.LogLevelWarn, }) defer conn.Close(ctx) @@ -304,7 +305,7 @@ func Rollback() { ctx := context.Background() conn := db.NewConnWithConfig(config.PostgresConfig{ - LogLevel: pgx.LogLevelWarn, + LogLevel: tracelog.LogLevelWarn, }) defer conn.Close(ctx) diff --git a/src/migration/migrationTemplate.txt b/src/migration/migrationTemplate.txt index 53b4e355..8611a0cd 100644 --- a/src/migration/migrationTemplate.txt +++ b/src/migration/migrationTemplate.txt @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-03-10T051621Z_Initial.go b/src/migration/migrations/2021-03-10T051621Z_Initial.go index 637a7b78..4048c7b9 100644 --- a/src/migration/migrations/2021-03-10T051621Z_Initial.go +++ b/src/migration/migrations/2021-03-10T051621Z_Initial.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-03-26T033834Z_AddSessionTable.go b/src/migration/migrations/2021-03-26T033834Z_AddSessionTable.go index 328307b4..b72cdc19 100644 --- a/src/migration/migrations/2021-03-26T033834Z_AddSessionTable.go +++ b/src/migration/migrations/2021-03-26T033834Z_AddSessionTable.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-03-28T152630Z_AllowLongerPasswordHashes.go b/src/migration/migrations/2021-03-28T152630Z_AllowLongerPasswordHashes.go index 6f1164d7..1fc23b58 100644 --- a/src/migration/migrations/2021-03-28T152630Z_AllowLongerPasswordHashes.go +++ b/src/migration/migrations/2021-03-28T152630Z_AllowLongerPasswordHashes.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-09T000000Z_DeleteOrphanedData.go b/src/migration/migrations/2021-04-09T000000Z_DeleteOrphanedData.go index ce3416a6..287f43f0 100644 --- a/src/migration/migrations/2021-04-09T000000Z_DeleteOrphanedData.go +++ b/src/migration/migrations/2021-04-09T000000Z_DeleteOrphanedData.go @@ -7,7 +7,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-11T195747Z_RemoveMemberAndExtended.go b/src/migration/migrations/2021-04-11T195747Z_RemoveMemberAndExtended.go index 71ec342b..f6b1e99e 100644 --- a/src/migration/migrations/2021-04-11T195747Z_RemoveMemberAndExtended.go +++ b/src/migration/migrations/2021-04-11T195747Z_RemoveMemberAndExtended.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) /* diff --git a/src/migration/migrations/2021-04-11T210958Z_RemoveMemberAndExtended2.go b/src/migration/migrations/2021-04-11T210958Z_RemoveMemberAndExtended2.go index 3edf227e..fff533ba 100644 --- a/src/migration/migrations/2021-04-11T210958Z_RemoveMemberAndExtended2.go +++ b/src/migration/migrations/2021-04-11T210958Z_RemoveMemberAndExtended2.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) /* diff --git a/src/migration/migrations/2021-04-23T000000Z_FixOrphanedPostTextVersions.go b/src/migration/migrations/2021-04-23T000000Z_FixOrphanedPostTextVersions.go index c14f9362..4d47e2b2 100644 --- a/src/migration/migrations/2021-04-23T000000Z_FixOrphanedPostTextVersions.go +++ b/src/migration/migrations/2021-04-23T000000Z_FixOrphanedPostTextVersions.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-23T021147Z_RemovePostText.go b/src/migration/migrations/2021-04-23T021147Z_RemovePostText.go index 6a24694d..5b2b9f29 100644 --- a/src/migration/migrations/2021-04-23T021147Z_RemovePostText.go +++ b/src/migration/migrations/2021-04-23T021147Z_RemovePostText.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-26T000000Z_DeleteStaticPages.go b/src/migration/migrations/2021-04-26T000000Z_DeleteStaticPages.go index d0bbf588..848befb6 100644 --- a/src/migration/migrations/2021-04-26T000000Z_DeleteStaticPages.go +++ b/src/migration/migrations/2021-04-26T000000Z_DeleteStaticPages.go @@ -7,7 +7,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-26T000001Z_FixPostCategoryId.go b/src/migration/migrations/2021-04-26T000001Z_FixPostCategoryId.go index 7f953ade..2ae7ce6f 100644 --- a/src/migration/migrations/2021-04-26T000001Z_FixPostCategoryId.go +++ b/src/migration/migrations/2021-04-26T000001Z_FixPostCategoryId.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-26T235720Z_AddCommonFieldsToPosts.go b/src/migration/migrations/2021-04-26T235720Z_AddCommonFieldsToPosts.go index 9659d4c4..e303f363 100644 --- a/src/migration/migrations/2021-04-26T235720Z_AddCommonFieldsToPosts.go +++ b/src/migration/migrations/2021-04-26T235720Z_AddCommonFieldsToPosts.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-27T034327Z_UsernameUniqueIndex.go b/src/migration/migrations/2021-04-27T034327Z_UsernameUniqueIndex.go index e54b8a6e..64b965af 100644 --- a/src/migration/migrations/2021-04-27T034327Z_UsernameUniqueIndex.go +++ b/src/migration/migrations/2021-04-27T034327Z_UsernameUniqueIndex.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-28T015537Z_RenameHMNProject.go b/src/migration/migrations/2021-04-28T015537Z_RenameHMNProject.go index 26e4032c..c3eeafb8 100644 --- a/src/migration/migrations/2021-04-28T015537Z_RenameHMNProject.go +++ b/src/migration/migrations/2021-04-28T015537Z_RenameHMNProject.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-04-29T043548Z_RenameModeratedFields.go b/src/migration/migrations/2021-04-29T043548Z_RenameModeratedFields.go index 5ac39f86..b1388b5e 100644 --- a/src/migration/migrations/2021-04-29T043548Z_RenameModeratedFields.go +++ b/src/migration/migrations/2021-04-29T043548Z_RenameModeratedFields.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-05-04T001258Z_DeleteBadUnreadInfo.go b/src/migration/migrations/2021-05-04T001258Z_DeleteBadUnreadInfo.go index 8077ccfc..3925051a 100644 --- a/src/migration/migrations/2021-05-04T001258Z_DeleteBadUnreadInfo.go +++ b/src/migration/migrations/2021-05-04T001258Z_DeleteBadUnreadInfo.go @@ -7,7 +7,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-05-04T002952Z_AddUnreadInfoConstraints.go b/src/migration/migrations/2021-05-04T002952Z_AddUnreadInfoConstraints.go index 0d97c278..dc6e467c 100644 --- a/src/migration/migrations/2021-05-04T002952Z_AddUnreadInfoConstraints.go +++ b/src/migration/migrations/2021-05-04T002952Z_AddUnreadInfoConstraints.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-05-06T031328Z_RemoveProjectNulls.go b/src/migration/migrations/2021-05-06T031328Z_RemoveProjectNulls.go index 7352903a..b4f31bf5 100644 --- a/src/migration/migrations/2021-05-06T031328Z_RemoveProjectNulls.go +++ b/src/migration/migrations/2021-05-06T031328Z_RemoveProjectNulls.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-06-12T014231Z_AddCSRFToken.go b/src/migration/migrations/2021-06-12T014231Z_AddCSRFToken.go index d329a5a8..b7f05020 100644 --- a/src/migration/migrations/2021-06-12T014231Z_AddCSRFToken.go +++ b/src/migration/migrations/2021-06-12T014231Z_AddCSRFToken.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-03T200233Z_RemoveParserField.go b/src/migration/migrations/2021-07-03T200233Z_RemoveParserField.go index 5d6b2520..e07047a9 100644 --- a/src/migration/migrations/2021-07-03T200233Z_RemoveParserField.go +++ b/src/migration/migrations/2021-07-03T200233Z_RemoveParserField.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-04T204642Z_ReworkPostFields.go b/src/migration/migrations/2021-07-04T204642Z_ReworkPostFields.go index 603a7f13..6166229f 100644 --- a/src/migration/migrations/2021-07-04T204642Z_ReworkPostFields.go +++ b/src/migration/migrations/2021-07-04T204642Z_ReworkPostFields.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-04T213658Z_DropThreadFields.go b/src/migration/migrations/2021-07-04T213658Z_DropThreadFields.go index 37f202cf..45fada7c 100644 --- a/src/migration/migrations/2021-07-04T213658Z_DropThreadFields.go +++ b/src/migration/migrations/2021-07-04T213658Z_DropThreadFields.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-04T220228Z_FixPostConstraints.go b/src/migration/migrations/2021-07-04T220228Z_FixPostConstraints.go index a3684cb5..bacc7bac 100644 --- a/src/migration/migrations/2021-07-04T220228Z_FixPostConstraints.go +++ b/src/migration/migrations/2021-07-04T220228Z_FixPostConstraints.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-11T060838Z_RenamePodcastColumns.go b/src/migration/migrations/2021-07-11T060838Z_RenamePodcastColumns.go index a72e3195..e024a89d 100644 --- a/src/migration/migrations/2021-07-11T060838Z_RenamePodcastColumns.go +++ b/src/migration/migrations/2021-07-11T060838Z_RenamePodcastColumns.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-20T024051Z_AddPostReplyId.go b/src/migration/migrations/2021-07-20T024051Z_AddPostReplyId.go index f92cd2ed..7ac98b3b 100644 --- a/src/migration/migrations/2021-07-20T024051Z_AddPostReplyId.go +++ b/src/migration/migrations/2021-07-20T024051Z_AddPostReplyId.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-22T015929Z_DropSuperuserColumn.go b/src/migration/migrations/2021-07-22T015929Z_DropSuperuserColumn.go index 57e2b2ff..ba0668a3 100644 --- a/src/migration/migrations/2021-07-22T015929Z_DropSuperuserColumn.go +++ b/src/migration/migrations/2021-07-22T015929Z_DropSuperuserColumn.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-28T020000Z_ReworkThreads.go b/src/migration/migrations/2021-07-28T020000Z_ReworkThreads.go index ee4fea46..7bd9b3c2 100644 --- a/src/migration/migrations/2021-07-28T020000Z_ReworkThreads.go +++ b/src/migration/migrations/2021-07-28T020000Z_ReworkThreads.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-28T033604Z_AddThreadAndPostConstraints.go b/src/migration/migrations/2021-07-28T033604Z_AddThreadAndPostConstraints.go index cfe0a2b5..ecd83974 100644 --- a/src/migration/migrations/2021-07-28T033604Z_AddThreadAndPostConstraints.go +++ b/src/migration/migrations/2021-07-28T033604Z_AddThreadAndPostConstraints.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-28T040000Z_RenameCategoryToSubforum.go b/src/migration/migrations/2021-07-28T040000Z_RenameCategoryToSubforum.go index a9b4b4be..e68ac4da 100644 --- a/src/migration/migrations/2021-07-28T040000Z_RenameCategoryToSubforum.go +++ b/src/migration/migrations/2021-07-28T040000Z_RenameCategoryToSubforum.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-30T034432Z_AddUserLastMarkedRead.go b/src/migration/migrations/2021-07-30T034432Z_AddUserLastMarkedRead.go index ef1df6c8..155de5a2 100644 --- a/src/migration/migrations/2021-07-30T034432Z_AddUserLastMarkedRead.go +++ b/src/migration/migrations/2021-07-30T034432Z_AddUserLastMarkedRead.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-07-30T164240Z_DropPostParentID.go b/src/migration/migrations/2021-07-30T164240Z_DropPostParentID.go index b2152c29..fcda6c24 100644 --- a/src/migration/migrations/2021-07-30T164240Z_DropPostParentID.go +++ b/src/migration/migrations/2021-07-30T164240Z_DropPostParentID.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-03T014812Z_DefaultNotSticky.go b/src/migration/migrations/2021-08-03T014812Z_DefaultNotSticky.go index 9bf85cc7..0e2fc747 100644 --- a/src/migration/migrations/2021-08-03T014812Z_DefaultNotSticky.go +++ b/src/migration/migrations/2021-08-03T014812Z_DefaultNotSticky.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-03T021418Z_DropAuthGroups.go b/src/migration/migrations/2021-08-03T021418Z_DropAuthGroups.go index 60b8703e..e1e36097 100644 --- a/src/migration/migrations/2021-08-03T021418Z_DropAuthGroups.go +++ b/src/migration/migrations/2021-08-03T021418Z_DropAuthGroups.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-07T185330Z_AddDiscordBotTables.go b/src/migration/migrations/2021-08-07T185330Z_AddDiscordBotTables.go index 272cbd24..c89854c5 100644 --- a/src/migration/migrations/2021-08-07T185330Z_AddDiscordBotTables.go +++ b/src/migration/migrations/2021-08-07T185330Z_AddDiscordBotTables.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-08T093624Z_FixupUsersForRegistration.go b/src/migration/migrations/2021-08-08T093624Z_FixupUsersForRegistration.go index a4f9bf8d..f2d78e4a 100644 --- a/src/migration/migrations/2021-08-08T093624Z_FixupUsersForRegistration.go +++ b/src/migration/migrations/2021-08-08T093624Z_FixupUsersForRegistration.go @@ -7,7 +7,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-08T110926Z_AddDeletionIndices.go b/src/migration/migrations/2021-08-08T110926Z_AddDeletionIndices.go index 5a54fd75..f5fcf426 100644 --- a/src/migration/migrations/2021-08-08T110926Z_AddDeletionIndices.go +++ b/src/migration/migrations/2021-08-08T110926Z_AddDeletionIndices.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-08T134655Z_DeleteInactiveUsers.go b/src/migration/migrations/2021-08-08T134655Z_DeleteInactiveUsers.go index eeec40c1..82dfebe4 100644 --- a/src/migration/migrations/2021-08-08T134655Z_DeleteInactiveUsers.go +++ b/src/migration/migrations/2021-08-08T134655Z_DeleteInactiveUsers.go @@ -7,7 +7,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-08T141819Z_FinalizeOneTimeTokenChanges.go b/src/migration/migrations/2021-08-08T141819Z_FinalizeOneTimeTokenChanges.go index 18b36a55..2c62849d 100644 --- a/src/migration/migrations/2021-08-08T141819Z_FinalizeOneTimeTokenChanges.go +++ b/src/migration/migrations/2021-08-08T141819Z_FinalizeOneTimeTokenChanges.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-16T023440Z_DiscordData.go b/src/migration/migrations/2021-08-16T023440Z_DiscordData.go index a1114800..55bbd4b9 100644 --- a/src/migration/migrations/2021-08-16T023440Z_DiscordData.go +++ b/src/migration/migrations/2021-08-16T023440Z_DiscordData.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-17T052508Z_OTTUniqueConstraint.go b/src/migration/migrations/2021-08-17T052508Z_OTTUniqueConstraint.go index 6fa5aa1c..8ae48c10 100644 --- a/src/migration/migrations/2021-08-17T052508Z_OTTUniqueConstraint.go +++ b/src/migration/migrations/2021-08-17T052508Z_OTTUniqueConstraint.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-23T230559Z_DiscordDefaults.go b/src/migration/migrations/2021-08-23T230559Z_DiscordDefaults.go index b06e3b2c..a14aff84 100644 --- a/src/migration/migrations/2021-08-23T230559Z_DiscordDefaults.go +++ b/src/migration/migrations/2021-08-23T230559Z_DiscordDefaults.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-26T005607Z_FixSnippetConstraints.go b/src/migration/migrations/2021-08-26T005607Z_FixSnippetConstraints.go index ff5ec55f..c31825ba 100644 --- a/src/migration/migrations/2021-08-26T005607Z_FixSnippetConstraints.go +++ b/src/migration/migrations/2021-08-26T005607Z_FixSnippetConstraints.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-27T190408Z_NewLinkData.go b/src/migration/migrations/2021-08-27T190408Z_NewLinkData.go index f35e071c..ccaf4f0f 100644 --- a/src/migration/migrations/2021-08-27T190408Z_NewLinkData.go +++ b/src/migration/migrations/2021-08-27T190408Z_NewLinkData.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-28T121228Z_ChangeHMNColors.go b/src/migration/migrations/2021-08-28T121228Z_ChangeHMNColors.go index c0478361..f514f788 100644 --- a/src/migration/migrations/2021-08-28T121228Z_ChangeHMNColors.go +++ b/src/migration/migrations/2021-08-28T121228Z_ChangeHMNColors.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-08-28T124959Z_RemoveFeatureFlags.go b/src/migration/migrations/2021-08-28T124959Z_RemoveFeatureFlags.go index 13bc1592..46dd46bb 100644 --- a/src/migration/migrations/2021-08-28T124959Z_RemoveFeatureFlags.go +++ b/src/migration/migrations/2021-08-28T124959Z_RemoveFeatureFlags.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-09-05T223354Z_PublicInFunctions.go b/src/migration/migrations/2021-09-05T223354Z_PublicInFunctions.go index 561898e6..cc87a315 100644 --- a/src/migration/migrations/2021-09-05T223354Z_PublicInFunctions.go +++ b/src/migration/migrations/2021-09-05T223354Z_PublicInFunctions.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-09-06T213226Z_DeleteIncorrectReplies.go b/src/migration/migrations/2021-09-06T213226Z_DeleteIncorrectReplies.go index 169d5492..eae99306 100644 --- a/src/migration/migrations/2021-09-06T213226Z_DeleteIncorrectReplies.go +++ b/src/migration/migrations/2021-09-06T213226Z_DeleteIncorrectReplies.go @@ -7,7 +7,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-09-08T004357Z_ImageFileNotNull.go b/src/migration/migrations/2021-09-08T004357Z_ImageFileNotNull.go index cb76fb13..b448ac52 100644 --- a/src/migration/migrations/2021-09-08T004357Z_ImageFileNotNull.go +++ b/src/migration/migrations/2021-09-08T004357Z_ImageFileNotNull.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-09-09T033556Z_DropUpdateColumns.go b/src/migration/migrations/2021-09-09T033556Z_DropUpdateColumns.go index 049b8eac..86429cba 100644 --- a/src/migration/migrations/2021-09-09T033556Z_DropUpdateColumns.go +++ b/src/migration/migrations/2021-09-09T033556Z_DropUpdateColumns.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-09-22T182718Z_AddHandmadePostAssetUsage.go b/src/migration/migrations/2021-09-22T182718Z_AddHandmadePostAssetUsage.go index 1db02b9f..7f3271ca 100644 --- a/src/migration/migrations/2021-09-22T182718Z_AddHandmadePostAssetUsage.go +++ b/src/migration/migrations/2021-09-22T182718Z_AddHandmadePostAssetUsage.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-09-23T041521Z_ApproveActiveUsers.go b/src/migration/migrations/2021-09-23T041521Z_ApproveActiveUsers.go index bf6a6243..019d91b8 100644 --- a/src/migration/migrations/2021-09-23T041521Z_ApproveActiveUsers.go +++ b/src/migration/migrations/2021-09-23T041521Z_ApproveActiveUsers.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-09-23T061211Z_AddSubforumSort.go b/src/migration/migrations/2021-09-23T061211Z_AddSubforumSort.go index c7c39fdc..76294f2b 100644 --- a/src/migration/migrations/2021-09-23T061211Z_AddSubforumSort.go +++ b/src/migration/migrations/2021-09-23T061211Z_AddSubforumSort.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-09-25T023810Z_AddJamSnippetField.go b/src/migration/migrations/2021-09-25T023810Z_AddJamSnippetField.go index a5a8a30c..bd77d118 100644 --- a/src/migration/migrations/2021-09-25T023810Z_AddJamSnippetField.go +++ b/src/migration/migrations/2021-09-25T023810Z_AddJamSnippetField.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-11-06T033835Z_CleanUpProjects.go b/src/migration/migrations/2021-11-06T033835Z_CleanUpProjects.go index 5bc0a552..59f53464 100644 --- a/src/migration/migrations/2021-11-06T033835Z_CleanUpProjects.go +++ b/src/migration/migrations/2021-11-06T033835Z_CleanUpProjects.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-11-06T033930Z_PersonalProjects.go b/src/migration/migrations/2021-11-06T033930Z_PersonalProjects.go index 29168d00..e12c5b11 100644 --- a/src/migration/migrations/2021-11-06T033930Z_PersonalProjects.go +++ b/src/migration/migrations/2021-11-06T033930Z_PersonalProjects.go @@ -8,7 +8,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-11-28T162300Z_AddLogoAssetsToProjects.go b/src/migration/migrations/2021-11-28T162300Z_AddLogoAssetsToProjects.go index 7be1c644..02860f94 100644 --- a/src/migration/migrations/2021-11-28T162300Z_AddLogoAssetsToProjects.go +++ b/src/migration/migrations/2021-11-28T162300Z_AddLogoAssetsToProjects.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-11-28T170218Z_AddDefaultsToProjects.go b/src/migration/migrations/2021-11-28T170218Z_AddDefaultsToProjects.go index 53624647..1e15ed84 100644 --- a/src/migration/migrations/2021-11-28T170218Z_AddDefaultsToProjects.go +++ b/src/migration/migrations/2021-11-28T170218Z_AddDefaultsToProjects.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2021-12-26T101633Z_UserAvatarAssetId.go b/src/migration/migrations/2021-12-26T101633Z_UserAvatarAssetId.go index 049f4f1f..1be28375 100644 --- a/src/migration/migrations/2021-12-26T101633Z_UserAvatarAssetId.go +++ b/src/migration/migrations/2021-12-26T101633Z_UserAvatarAssetId.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-02-13T132653Z_RemoveUserAvatarUrl.go b/src/migration/migrations/2022-02-13T132653Z_RemoveUserAvatarUrl.go index c74e7411..1d68fb8e 100644 --- a/src/migration/migrations/2022-02-13T132653Z_RemoveUserAvatarUrl.go +++ b/src/migration/migrations/2022-02-13T132653Z_RemoveUserAvatarUrl.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-02-13T200155Z_RemoveProjectLogoUrls.go b/src/migration/migrations/2022-02-13T200155Z_RemoveProjectLogoUrls.go index 4e330e7c..c3a60a7b 100644 --- a/src/migration/migrations/2022-02-13T200155Z_RemoveProjectLogoUrls.go +++ b/src/migration/migrations/2022-02-13T200155Z_RemoveProjectLogoUrls.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-03-15T012144Z_TwitchTables.go b/src/migration/migrations/2022-03-15T012144Z_TwitchTables.go index 5a69733d..3ebc7a22 100644 --- a/src/migration/migrations/2022-03-15T012144Z_TwitchTables.go +++ b/src/migration/migrations/2022-03-15T012144Z_TwitchTables.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-03-15T063506Z_AddIndexOnTwitchStreams.go b/src/migration/migrations/2022-03-15T063506Z_AddIndexOnTwitchStreams.go index 3ea728bd..3d0226cc 100644 --- a/src/migration/migrations/2022-03-15T063506Z_AddIndexOnTwitchStreams.go +++ b/src/migration/migrations/2022-03-15T063506Z_AddIndexOnTwitchStreams.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-05-06T221726Z_RenameEverything.go b/src/migration/migrations/2022-05-06T221726Z_RenameEverything.go index e08cec79..482009b1 100644 --- a/src/migration/migrations/2022-05-06T221726Z_RenameEverything.go +++ b/src/migration/migrations/2022-05-06T221726Z_RenameEverything.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-05-26T144517Z_AddPersistentVars.go b/src/migration/migrations/2022-05-26T144517Z_AddPersistentVars.go index 1ed3c4df..0b581da4 100644 --- a/src/migration/migrations/2022-05-26T144517Z_AddPersistentVars.go +++ b/src/migration/migrations/2022-05-26T144517Z_AddPersistentVars.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-06-18T010339Z_AddJamProjects.go b/src/migration/migrations/2022-06-18T010339Z_AddJamProjects.go index 93ca060c..fd492f02 100644 --- a/src/migration/migrations/2022-06-18T010339Z_AddJamProjects.go +++ b/src/migration/migrations/2022-06-18T010339Z_AddJamProjects.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-06-26T115703Z_SnippetProjectAssociation.go b/src/migration/migrations/2022-06-26T115703Z_SnippetProjectAssociation.go index b1072e62..74413f7b 100644 --- a/src/migration/migrations/2022-06-26T115703Z_SnippetProjectAssociation.go +++ b/src/migration/migrations/2022-06-26T115703Z_SnippetProjectAssociation.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-08-28T203935Z_AddTwitchLog.go b/src/migration/migrations/2022-08-28T203935Z_AddTwitchLog.go index 7d2f8c8d..49f9aeaa 100644 --- a/src/migration/migrations/2022-08-28T203935Z_AddTwitchLog.go +++ b/src/migration/migrations/2022-08-28T203935Z_AddTwitchLog.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-09-10T000000Z_AddEducationResources.go b/src/migration/migrations/2022-09-10T000000Z_AddEducationResources.go index 45535c1d..ad268ff7 100644 --- a/src/migration/migrations/2022-09-10T000000Z_AddEducationResources.go +++ b/src/migration/migrations/2022-09-10T000000Z_AddEducationResources.go @@ -6,7 +6,7 @@ import ( "git.handmade.network/hmn/hmn/src/migration/types" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-09-14T114645Z_NewTwitchTracking.go b/src/migration/migrations/2022-09-14T114645Z_NewTwitchTracking.go index a0227410..fa904a3c 100644 --- a/src/migration/migrations/2022-09-14T114645Z_NewTwitchTracking.go +++ b/src/migration/migrations/2022-09-14T114645Z_NewTwitchTracking.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/2022-10-18T062831Z_AddTwitchEnded.go b/src/migration/migrations/2022-10-18T062831Z_AddTwitchEnded.go index c1f1f6ac..10ec622d 100644 --- a/src/migration/migrations/2022-10-18T062831Z_AddTwitchEnded.go +++ b/src/migration/migrations/2022-10-18T062831Z_AddTwitchEnded.go @@ -5,7 +5,7 @@ import ( "time" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) func init() { diff --git a/src/migration/migrations/migrations.go b/src/migration/migrations/migrations.go index 0805b909..840bfc76 100644 --- a/src/migration/migrations/migrations.go +++ b/src/migration/migrations/migrations.go @@ -5,7 +5,7 @@ import ( "fmt" "git.handmade.network/hmn/hmn/src/migration/types" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) var All = make(map[types.MigrationVersion]types.Migration) diff --git a/src/migration/seed.go b/src/migration/seed.go index e4bc8dfe..0b6aff79 100644 --- a/src/migration/seed.go +++ b/src/migration/seed.go @@ -18,7 +18,8 @@ import ( "git.handmade.network/hmn/hmn/src/parsing" "git.handmade.network/hmn/hmn/src/utils" lorem "github.com/HandmadeNetwork/golorem" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/tracelog" ) // Applies a cloned db to the local db. @@ -54,7 +55,7 @@ func BareMinimumSeed() *models.Project { ctx := context.Background() conn := db.NewConnWithConfig(config.PostgresConfig{ - LogLevel: pgx.LogLevelWarn, + LogLevel: tracelog.LogLevelWarn, }) defer conn.Close(ctx) @@ -75,7 +76,7 @@ func SampleSeed() { ctx := context.Background() conn := db.NewConnWithConfig(config.PostgresConfig{ - LogLevel: pgx.LogLevelWarn, + LogLevel: tracelog.LogLevelWarn, }) defer conn.Close(ctx) diff --git a/src/migration/types/types.go b/src/migration/types/types.go index 3a16dd50..1f9d1b64 100644 --- a/src/migration/types/types.go +++ b/src/migration/types/types.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) type Migration interface { diff --git a/src/models/subforum.go b/src/models/subforum.go index ddf4e9b9..d4d29fc2 100644 --- a/src/models/subforum.go +++ b/src/models/subforum.go @@ -5,7 +5,7 @@ import ( "git.handmade.network/hmn/hmn/src/db" "git.handmade.network/hmn/hmn/src/oops" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" ) type Subforum struct { diff --git a/src/twitch/twitch.go b/src/twitch/twitch.go index ec787ab0..b9b994bd 100644 --- a/src/twitch/twitch.go +++ b/src/twitch/twitch.go @@ -16,7 +16,7 @@ import ( "git.handmade.network/hmn/hmn/src/oops" "git.handmade.network/hmn/hmn/src/perf" "git.handmade.network/hmn/hmn/src/utils" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" ) // NOTE(asaf): The twitch api madness: diff --git a/src/website/admin.go b/src/website/admin.go index ef19ef2e..669098f2 100644 --- a/src/website/admin.go +++ b/src/website/admin.go @@ -20,7 +20,7 @@ import ( "git.handmade.network/hmn/hmn/src/oops" "git.handmade.network/hmn/hmn/src/templates" "github.com/google/uuid" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" ) type AdminAtomFeedData struct { diff --git a/src/website/projects.go b/src/website/projects.go index ecfc1dd5..149ef38f 100644 --- a/src/website/projects.go +++ b/src/website/projects.go @@ -25,7 +25,7 @@ import ( "git.handmade.network/hmn/hmn/src/twitch" "git.handmade.network/hmn/hmn/src/utils" "github.com/google/uuid" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/teacat/noire" ) diff --git a/src/website/requesthandling.go b/src/website/requesthandling.go index 40390c01..5d4807ca 100644 --- a/src/website/requesthandling.go +++ b/src/website/requesthandling.go @@ -22,7 +22,7 @@ import ( "git.handmade.network/hmn/hmn/src/oops" "git.handmade.network/hmn/hmn/src/perf" "git.handmade.network/hmn/hmn/src/templates" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" "github.com/rs/zerolog" ) diff --git a/src/website/routes.go b/src/website/routes.go index 72310136..11f0e13a 100644 --- a/src/website/routes.go +++ b/src/website/routes.go @@ -14,7 +14,7 @@ import ( "git.handmade.network/hmn/hmn/src/models" "git.handmade.network/hmn/hmn/src/oops" "git.handmade.network/hmn/hmn/src/utils" - "github.com/jackc/pgx/v4/pgxpool" + "github.com/jackc/pgx/v5/pgxpool" ) func NewWebsiteRoutes(conn *pgxpool.Pool) http.Handler { diff --git a/src/website/user.go b/src/website/user.go index 2e6331ab..d3646066 100644 --- a/src/website/user.go +++ b/src/website/user.go @@ -21,7 +21,7 @@ import ( "git.handmade.network/hmn/hmn/src/twitch" "git.handmade.network/hmn/hmn/src/utils" "github.com/google/uuid" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) type UserProfileTemplateData struct {