Skip to content

Mix.Ecto.Gen.Repo task fix #3149

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 2 commits into from
Oct 26, 2019
Merged

Mix.Ecto.Gen.Repo task fix #3149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b674602
Proposed fix for #3148
Eiji7 Oct 26, 2019
6ec54fb
Update changes to pass tests:
Eiji7 Oct 26, 2019
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
14 changes: 9 additions & 5 deletions lib/mix/tasks/ecto.gen.repo.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,14 @@ defmodule Mix.Tasks.Ecto.Gen.Repo do

case File.read(config_path) do
{:ok, contents} ->
check = String.contains?(contents, "import Config")
config_first_line = get_first_config_line(check) <> "\n"
new_contents = config_first_line <> "\n" <> config_template(opts)
Mix.shell.info [:green, "* updating ", :reset, "config/config.exs"]
File.write! "config/config.exs",
String.replace(contents, "use Mix.Config\n", config_template(opts))
File.write! "config/config.exs", String.replace(contents, config_first_line, new_contents)
{:error, _} ->
create_file "config/config.exs", config_template(opts)
config_first_line = Config |> Code.ensure_loaded?() |> get_first_config_line()
create_file "config/config.exs", config_first_line <> "\n\n" <> config_template(opts)
end

open?("config/config.exs")
Expand All @@ -74,6 +77,9 @@ defmodule Mix.Tasks.Ecto.Gen.Repo do
"""
end

defp get_first_config_line(true), do: "import Config"
defp get_first_config_line(false), do: "use Mix.Config"

embed_template :repo, """
defmodule <%= inspect @mod %> do
use Ecto.Repo,
Expand All @@ -83,8 +89,6 @@ defmodule Mix.Tasks.Ecto.Gen.Repo do
"""

embed_template :config, """
use Mix.Config

config <%= inspect @app %>, <%= inspect @mod %>,
database: "<%= @app %>_<%= @base %>",
username: "user",
Expand Down
4 changes: 3 additions & 1 deletion test/mix/tasks/ecto.gen.repo_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ defmodule Mix.Tasks.Ecto.Gen.RepoTest do
end
"""

first_line = if Code.ensure_loaded?(Config), do: "import Config", else: "use Mix.Config"

assert_file "config/config.exs", """
use Mix.Config
#{first_line}

config :ecto, Repo,
database: "ecto_repo",
Expand Down