Generate proper alias if --repo option is used, closes #5717

lib/mix/phoenix/schema.ex

@@ -5,6 +5,7 @@ defmodule Mix.Phoenix.Schema do
 
   defstruct module: nil,
             repo: nil,
+            repo_alias: nil,
             table: nil,
             collection: nil,
             embedded?: false,
@@ -78,6 +79,7 @@ defmodule Mix.Phoenix.Schema do
     basename = Phoenix.Naming.underscore(schema_name)
     module = Module.concat([base, schema_name])
     repo = opts[:repo] || Module.concat([base, "Repo"])
+    repo_alias = if String.ends_with?(Atom.to_string(repo), ".Repo"), do: "", else: ", as: Repo"
     file = Mix.Phoenix.context_lib_path(ctx_app, basename <> ".ex")
     table = opts[:table] || schema_plural
     {cli_attrs, uniques, redacts} = extract_attr_flags(cli_attrs)
@@ -88,6 +90,7 @@ defmodule Mix.Phoenix.Schema do
     api_prefix = Application.get_env(otp_app, :generators)[:api_prefix] || "/api"
     embedded? = Keyword.get(opts, :embedded, false)
     generate? = Keyword.get(opts, :schema, true)
+
     singular =
       module
       |> Module.split()
@@ -113,6 +116,7 @@ defmodule Mix.Phoenix.Schema do
       migration?: Keyword.get(opts, :migration, true),
       module: module,
       repo: repo,
+      repo_alias: repo_alias,
       table: table,
       embedded?: embedded?,
       alias: module |> Module.split() |> List.last() |> Module.concat(nil),

priv/templates/phx.gen.auth/confirmation_controller_test.exs

@@ -2,7 +2,7 @@ defmodule <%= inspect context.web_module %>.<%= inspect Module.concat(schema.web
   use <%= inspect context.web_module %>.ConnCase<%= test_case_options %>
 
   alias <%= inspect context.module %>
-  alias <%= inspect schema.repo %>
+  alias <%= inspect schema.repo %><%= schema.repo_alias %>
   import <%= inspect context.module %>Fixtures
 
   setup do

priv/templates/phx.gen.auth/confirmation_instructions_live_test.exs

@@ -5,7 +5,7 @@ defmodule <%= inspect context.web_module %>.<%= inspect Module.concat(schema.web
   import <%= inspect context.module %>Fixtures
 
   alias <%= inspect context.module %>
-  alias <%= inspect schema.repo %>
+  alias <%= inspect schema.repo %><%= schema.repo_alias %>
 
   setup do
     %{<%= schema.singular %>: <%= schema.singular %>_fixture()}

priv/templates/phx.gen.auth/confirmation_live_test.exs

@@ -5,7 +5,7 @@ defmodule <%= inspect context.web_module %>.<%= inspect Module.concat(schema.web
   import <%= inspect context.module %>Fixtures
 
   alias <%= inspect context.module %>
-  alias <%= inspect schema.repo %>
+  alias <%= inspect schema.repo %><%= schema.repo_alias %>
 
   setup do
     %{<%= schema.singular %>: <%= schema.singular %>_fixture()}

priv/templates/phx.gen.auth/forgot_password_live_test.exs

@@ -5,7 +5,7 @@ defmodule <%= inspect context.web_module %>.<%= inspect Module.concat(schema.web
   import <%= inspect context.module %>Fixtures
 
   alias <%= inspect context.module %>
-  alias <%= inspect schema.repo %>
+  alias <%= inspect schema.repo %><%= schema.repo_alias %>
 
   describe "Forgot password page" do
     test "renders email page", %{conn: conn} do

priv/templates/phx.gen.auth/reset_password_controller_test.exs

@@ -2,7 +2,7 @@ defmodule <%= inspect context.web_module %>.<%= inspect Module.concat(schema.web
   use <%= inspect context.web_module %>.ConnCase<%= test_case_options %>
 
   alias <%= inspect context.module %>
-  alias <%= inspect schema.repo %>
+  alias <%= inspect schema.repo %><%= schema.repo_alias %>
   import <%= inspect context.module %>Fixtures
 
   setup do

priv/templates/phx.gen.context/context.ex

@@ -4,5 +4,5 @@ defmodule <%= inspect context.module %> do
   """
 
   import Ecto.Query, warn: false
-  alias <%= inspect schema.repo %>
+  alias <%= inspect schema.repo %><%= schema.repo_alias %>
 end