Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0a61ba8

Browse files
mafredrimafredri
committed
refactor(coderd/database): generate dbresetpw with queries for reset-password command
This change removes 1 MB from the slim binary, and combined with the following PRs: #9481, #9506, #9508, #9517, a total of 4 MB. Ref: #9380
1 parent ad23d33 commit 0a61ba8

File tree

9 files changed

+332
-80
lines changed

9 files changed

+332
-80
lines changed

‎Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,9 @@ coderd/database/dump.sql: coderd/database/gen/dump/main.go $(wildcard coderd/dat
516516
coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
517517
./coderd/database/generate.sh
518518

519+
coderd/database/dbresetpw/users_resetpw.sql.go: coderd/database/querier.go coderd/database/dbresetpw/sqlc.yaml
520+
sqlc generate -f ./coderd/database/dbresetpw/sqlc.yaml
521+
519522
coderd/database/dbmock/dbmock.go: coderd/database/db.go coderd/database/querier.go
520523
go generate ./coderd/database/dbmock/
521524

‎cli/resetpassword.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/coder/coder/v2/cli/clibase"
1010
"github.com/coder/coder/v2/cli/cliui"
11-
"github.com/coder/coder/v2/coderd/database"
11+
"github.com/coder/coder/v2/coderd/database/dbresetpw"
1212
"github.com/coder/coder/v2/coderd/database/migrations"
1313
"github.com/coder/coder/v2/coderd/userpassword"
1414
)
@@ -37,9 +37,9 @@ func (*RootCmd) resetPassword() *clibase.Cmd {
3737
if err != nil {
3838
return xerrors.Errorf("database needs migration: %w", err)
3939
}
40-
db := database.New(sqlDB)
40+
db := dbresetpw.New(sqlDB)
4141

42-
user, err := db.GetUserByEmailOrUsername(inv.Context(), database.GetUserByEmailOrUsernameParams{
42+
user, err := db.GetUserByEmailOrUsername(inv.Context(), dbresetpw.GetUserByEmailOrUsernameParams{
4343
Username: username,
4444
})
4545
if err != nil {
@@ -73,7 +73,7 @@ func (*RootCmd) resetPassword() *clibase.Cmd {
7373
return xerrors.Errorf("hash password: %w", err)
7474
}
7575

76-
err = db.UpdateUserHashedPassword(inv.Context(), database.UpdateUserHashedPasswordParams{
76+
err = db.UpdateUserHashedPassword(inv.Context(), dbresetpw.UpdateUserHashedPasswordParams{
7777
ID: user.ID,
7878
HashedPassword: []byte(hashedPassword),
7979
})

‎coderd/database/dbresetpw/db.go

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbresetpw/models.go

Lines changed: 121 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbresetpw/sqlc.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# This sqlc.yaml file is used by sqlc to generate a subset of the coderd
2+
# database interface that can be used for the reset-password command.
3+
version: "2"
4+
5+
sql:
6+
- schema: "../dump.sql"
7+
queries: "../queries/users_resetpw.sql"
8+
engine: "postgresql"
9+
gen:
10+
go:
11+
package: "dbresetpw"
12+
out: "."
13+
omit_unused_structs: true

‎coderd/database/dbresetpw/users_resetpw.sql.go

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)