Ensuring that flush() will raise on rollback if called from change/0. #159
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
josevalim
reviewed
Nov 1, 2019
lib/ecto/migration.ex
Outdated
| Runner.flush | ||
| @doc "Executes queue migration commands." | ||
| defmacro flush do | ||
| quote bind_quoted: [caller: __CALLER__.module] do |
Member
There was a problem hiding this comment.
You don't need bind_quoted, the module inside the quote will be __MODULE__.
josevalim
reviewed
Nov 1, 2019
lib/ecto/migration.ex
Outdated
| @doc "Executes queue migration commands." | ||
| defmacro flush do | ||
| quote bind_quoted: [caller: __CALLER__.module] do | ||
| if direction() == :down and function_exported?(caller, :change, 0) do |
Member
There was a problem hiding this comment.
The migrator checks for down first and then falls back to :change, so we should express this here:
Suggested change
| if direction() == :down and function_exported?(caller, :change, 0) do | |
| if direction() == :down and not function_exported?(caller, :down, 0) do |
josevalim
reviewed
Nov 1, 2019
lib/ecto/migration.ex
Outdated
| defmacro flush do | ||
| quote bind_quoted: [caller: __CALLER__.module] do | ||
| if direction() == :down and function_exported?(caller, :change, 0) do | ||
| message = "Calling flush() inside change when doing rollback is not supported." |
Member
There was a problem hiding this comment.
Error messages start with lowercase:
Suggested change
| message = "Calling flush() inside change when doing rollback is not supported." | |
| message = "calling flush() inside change when doing rollback is not supported." |
josevalim
reviewed
Nov 1, 2019
lib/ecto/migration.ex
Outdated
| quote bind_quoted: [caller: __CALLER__.module] do | ||
| if direction() == :down and function_exported?(caller, :change, 0) do | ||
| message = "Calling flush() inside change when doing rollback is not supported." | ||
| raise ArgumentError, message |
Member
There was a problem hiding this comment.
Not an ArgumentError in this case, so this is enough:
Suggested change
| raise ArgumentError, message | |
| raise message |
Member
|
Thanks @Eiji7, I have dropped some comments. Also, instead of adding an integration test, can you please add a unit test? See test/ecto/migrator_test.exs. |
1. Use __MODULE__ inside quote instead of __CALLER__ in bind_quoted 2. Fix check in if 3. Changed error message to start with lowercase 4. Use raise/1 instead of raise/2 with ArgumentError 5. Moved test from integration_test/sql/migration.ex to test/ecto/migrator_test.exs
Contributor
Author
|
@josevalim Thanks, everything makes sense for me. I have send all suggested changes as well as moved test. |
Member
|
❤️ 💚 💙 💛 💜 |
zachdaniel
pushed a commit
to zachdaniel/ecto_sql
that referenced
this pull request
Sep 19, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
ping @josevalim