Skip to content

test(coderd/database/dbtestutil): allow access to *sql.DB #10238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 12, 2023
Merged

test(coderd/database/dbtestutil): allow access to *sql.DB #10238

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8abb2ae
test(coderd/database/dbtestutil): allow access to *sql.DB
mafredri Oct 12, 2023
866d3d9
fatal if returnsqldb and no postgres
mafredri Oct 12, 2023
ee86b3a
use separate initializer
mafredri Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
use separate initializer
  • Loading branch information
@mafredri
mafredri committed Oct 12, 2023
commit ee86b3a1bbe9128146cfa65ef74ab2f0ffd16aee
20 changes: 16 additions & 4 deletions coderd/database/dbtestutil/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,34 @@ func WithDumpOnFailure() Option {
}
}

func WithReturnSQLDB(f func(*sql.DB)) Option {
func withReturnSQLDB(f func(*sql.DB)) Option {
return func(o *options) {
o.returnSQLDB = f
}
}

func NewDBWithSQLDB(t testing.TB, opts ...Option) (database.Store, pubsub.Pubsub, *sql.DB) {
t.Helper()

if !WillUsePostgres() {
t.Fatal("cannot use NewDBWithSQLDB without PostgreSQL, consider adding `if !dbtestutil.WillUsePostgres() { t.Skip() }` to this test")
}

var sqlDB *sql.DB
opts = append(opts, withReturnSQLDB(func(db *sql.DB) {
sqlDB = db
}))
Comment on lines +67 to +69
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotta love functional options <3

db, ps := NewDB(t, opts...)
return db, ps, sqlDB
}

func NewDB(t testing.TB, opts ...Option) (database.Store, pubsub.Pubsub) {
t.Helper()

var o options
for _, opt := range opts {
opt(&o)
}
if o.returnSQLDB && !WillUsePostgres() {
t.Fatalf("cannot use WithReturnSQLDB without PostgreSQL, consider adding `if !dbtestutil.WillUsePostgres() { t.Skip() }` to this test")
}

db := dbfake.New()
ps := pubsub.NewInMemory()
Expand Down