Remove gorm from the migrator #3006
Merged
Conversation
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
dnephin
force-pushed
the
dnephin/data-remove-gorm-from-migrator
branch
from
1cef953
to
fcffa8a
Compare
dnephin
commented
Aug 22, 2022
Add a shim that allows it to continue to test using the gorm DB. When we change the data package to create a postgres connection directly we can change the migrator as well. Also remove transactions from migrator Transactions can be managed by the caller. This will make it easier to switch away from gorm.
dnephin
force-pushed
the
dnephin/data-remove-gorm-from-migrator
branch
from
fcffa8a
to
0c96d3f
Compare
BruceMacD
approved these changes
Aug 23, 2022
|
|
||
| opts := migrator.Options{ | ||
| InitSchema: initializeSchema, | ||
| LoadKey: loadDBKey, | ||
| LoadKey: func(tx migrator.DB) error { | ||
| if loadDBKey == nil { |
There was a problem hiding this comment.
This is nil in the case of tests?
| stmt := `ALTER TABLE settings DROP COLUMN IF EXISTS signup_enabled` | ||
| if tx.Dialector.Name() == "sqlite" { | ||
| if tx.DriverName() == "sqlite" { |
There was a problem hiding this comment.
Not related to this change but you mentioned it in the description, I think we should drop the sqlite checks soon. The table alterations already don't work.
ssoroka
approved these changes
Aug 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Previously the
data/migratorusedgorm.DBto perform queries. This PR changes it to accept an interface that closely resembles the interface provided by the stdlib. The only difference from the stdlib is aDriverNamemethod. That extra method should be easy to implement by checking the type of the driver, or we may decide to remove sqlite support and remove the need for that method.This change is done first before converting the query functions because
migratoris a separate package whichdatadepends on. So it has to be converted first.This PR also removes the
UseTransactionoption from the migrator. We were not using this option, and it made it more difficult to accept an interface. In the future if we want to use a transaction for applying migrations we can manage the transaction fromdata.NewDBand it will behave the same as the transaction managed by the migrator itself.Best viewed by individual commit.
Related to #2415