Skip to content

Commit

Permalink
chore: pluralize table names (#463)
Browse files Browse the repository at this point in the history
  • Loading branch information
coadler committed Mar 17, 2022
1 parent edd8345 commit 706e60b
Show file tree
Hide file tree
Showing 21 changed files with 339 additions and 247 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: "3.6.1"
version: "3.19.4"
- uses: actions/setup-go@v2
with:
go-version: "^1.17"
Expand Down Expand Up @@ -370,4 +370,4 @@ jobs:
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
DD_CATEGORY: e2e
GIT_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
run: go run scripts/datadog-cireport/main.go site/test-results/junit.xml
run: go run scripts/datadog-cireport/main.go site/test-results/junit.xml
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,15 @@ linters-settings:
- r
- i
- db
- t
# Optional list of variable declarations that should be ignored completely. (defaults to empty list)
# Entries must be in the form of "<variable name> <type>" or "<variable name> *<type>" for
# variables, or "const <name>" for constants.
ignore-decls:
- rw http.ResponseWriter
- r *http.Request
- t testing.T
- t testing.TB

issues:
# Rules listed here: https://github.com/securego/gosec#available-rules
Expand Down
4 changes: 2 additions & 2 deletions coderd/coderd.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ type Options struct {

// New constructs the Coder API into an HTTP handler.
//
// A wait function is returned to handle awaiting closure
// of hijacked HTTP requests.
// A wait function is returned to handle awaiting closure of hijacked HTTP
// requests.
func New(options *Options) (http.Handler, func()) {
api := &api{
Options: options,
Expand Down
2 changes: 1 addition & 1 deletion coderd/coderdtest/coderdtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func New(t *testing.T, options *Options) *codersdk.Client {
t.Cleanup(func() {
_ = sqlDB.Close()
})
err = database.Migrate(sqlDB)
err = database.MigrateUp(sqlDB)
require.NoError(t, err)
db = database.New(sqlDB)

Expand Down
190 changes: 95 additions & 95 deletions database/dump.sql

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion database/dump/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func main() {
if err != nil {
panic(err)
}
err = database.Migrate(db)
err = database.MigrateUp(db)
if err != nil {
panic(err)
}
Expand Down

0 comments on commit 706e60b

Please sign in to comment.