-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## tl;dr - Adds DB setup via PGX - Adds migrations using [golang-migrate](https://github.com/golang-migrate/migrate?tab=readme-ov-file) - Adds a test for running the migrations
- Loading branch information
Showing
12 changed files
with
166 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| migrate create -dir pkg/migrations -seq -digits=5 -ext sql $1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| ulimit -n 2048 | ||
|
|
||
| go test ./... "$@" | ||
|
|
||
| if [ -n "${RACE:-}" ]; then | ||
| echo | ||
| echo "Running race tests" | ||
| go test ./... "$@" -race | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package db | ||
|
|
||
| import ( | ||
| "context" | ||
| "database/sql" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/jackc/pgx/v5/pgxpool" | ||
| "github.com/jackc/pgx/v5/stdlib" | ||
| ) | ||
|
|
||
| func NewDB(ctx context.Context, dsn string, waitForDB, statementTimeout time.Duration) (*sql.DB, error) { | ||
| config, err := pgxpool.ParseConfig(dsn) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| config.ConnConfig.RuntimeParams["statement_timeout"] = fmt.Sprint(statementTimeout.Milliseconds()) | ||
|
|
||
| dbPool, err := pgxpool.NewWithConfig(ctx, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| db := stdlib.OpenDBFromPool(dbPool) | ||
|
|
||
| waitUntil := time.Now().Add(waitForDB) | ||
|
|
||
| err = db.Ping() | ||
| for err != nil && time.Now().Before(waitUntil) { | ||
| time.Sleep(3 * time.Second) | ||
| err = db.Ping() | ||
| } | ||
|
|
||
| return db, err | ||
| } |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SELECT | ||
| 1; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package migrations | ||
|
|
||
| import ( | ||
| "database/sql" | ||
| "embed" | ||
|
|
||
| "github.com/golang-migrate/migrate/v4" | ||
| "github.com/golang-migrate/migrate/v4/database/postgres" | ||
| "github.com/golang-migrate/migrate/v4/source/iofs" | ||
| ) | ||
|
|
||
| //go:embed *.sql | ||
| var migrationFs embed.FS | ||
|
|
||
| func Migrate(db *sql.DB) error { | ||
| migrationFs, err := iofs.New(migrationFs, ".") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| driver, err := postgres.WithInstance(db, &postgres.Config{}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| migrator, err := migrate.NewWithInstance("iofs", migrationFs, "postgres", driver) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = migrator.Up() | ||
| if err != nil && err != migrate.ErrNoChange { | ||
| return err | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters