test(coderd/database/dbtestutil): allow access to *sql.DB
#10238
Conversation
This file contains hidden or 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
johnstcn
reviewed
Oct 12, 2023
Comment on lines
+98
to
+100
| if o.returnSQLDB != nil { | ||
| o.returnSQLDB(sqlDB) | ||
| } |
There was a problem hiding this comment.
What happens if dbtestutil.WillUsePostgres is false? I could see this being a potential sharp edge. It would probably be a good idea to fail the test if this is defined and we're using the fakeDB.
There was a problem hiding this comment.
Good catch 👍🏻, I'll return an error.
johnstcn
reviewed
Oct 12, 2023
coderd/database/dbtestutil/db.go
Outdated
| @@ -49,6 +50,12 @@ func WithDumpOnFailure() Option { | |||
| } | |||
| } | |||
|
|
|||
| func WithReturnSQLDB(f func(*sql.DB)) Option { | |||
There was a problem hiding this comment.
Non-blocker: Alternatively, we could extract a new function dbtestutil.NewSQLDB(t testing.TB, opts ...Option) (database.Store, database.Pubsub, *sql.DB)? I feel that would be more immediately obvious and less annoying to use.
There was a problem hiding this comment.
Also a good idea, I'll do that instead.
60b1005 to
9e9aed4
Compare
9e9aed4 to
ee86b3a
Compare
johnstcn
reviewed
Oct 12, 2023
Comment on lines
+67
to
+69
| opts = append(opts, withReturnSQLDB(func(db *sql.DB) { | ||
| sqlDB = db | ||
| })) |
There was a problem hiding this comment.
Gotta love functional options <3
johnstcn
approved these changes
Oct 12, 2023
mtojek
approved these changes
Oct 12, 2023
*sql.DB
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change may be controversial, but on occasion I find it useful. I needed this whilst benchmarking a database change.
Sample usage: