improvement: propagate -r flag to Ecto (#521)

* Propagate r flag to ecto

* Make repos helper function return opts repos when provided

Author: ken-kost

lib/mix/helpers.ex

@@ -38,61 +38,81 @@ defmodule AshPostgres.Mix.Helpers do
   end
 
   def repos!(opts, args) do
-    if opts[:domains] && opts[:domains] != "" do
-      domains = domains!(opts, args)
+    cond do
+      opts[:repo] && opts[:repo] != "" ->
+        ensure_load(args)
 
-      resources =
-        domains
-        |> Enum.flat_map(&Ash.Domain.Info.resources/1)
-        |> Enum.filter(&(Ash.DataLayer.data_layer(&1) == AshPostgres.DataLayer))
+        opts[:repo]
+        |> Kernel.||("")
+        |> String.split(",")
+        |> Enum.flat_map(fn
+          "" ->
+            []
+
+          repo ->
+            [Module.concat([repo])]
+        end)
+        |> Enum.map(fn repo ->
+          case Code.ensure_compiled(repo) do
+            {:module, _} ->
+              repo
+
+            {:error, error} ->
+              Mix.raise("Could not load #{inspect(repo)}, error: #{inspect(error)}. ")
+          end
+        end)
+
+      opts[:domains] && opts[:domains] != "" ->
+        domains = domains!(opts, args)
+
+        resources =
+          domains
+          |> Enum.flat_map(&Ash.Domain.Info.resources/1)
+          |> Enum.filter(&(Ash.DataLayer.data_layer(&1) == AshPostgres.DataLayer))
+          |> case do
+            [] ->
+              raise """
+              No resources with `data_layer: AshPostgres.DataLayer` found in the domains #{Enum.map_join(domains, ",", &inspect/1)}.
+
+              Must be able to find at least one resource with `data_layer: AshPostgres.DataLayer`.
+              """
+
+            resources ->
+              resources
+          end
+
+        resources
+        |> Enum.flat_map(
+          &[
+            AshPostgres.DataLayer.Info.repo(&1, :read),
+            AshPostgres.DataLayer.Info.repo(&1, :mutate)
+          ]
+        )
+        |> Enum.uniq()
         |> case do
           [] ->
             raise """
-            No resources with `data_layer: AshPostgres.DataLayer` found in the domains #{Enum.map_join(domains, ",", &inspect/1)}.
+            No repos could be found configured on the resources in the domains: #{Enum.map_join(domains, ",", &inspect/1)}
 
-            Must be able to find at least one resource with `data_layer: AshPostgres.DataLayer`.
-            """
+            At least one resource must have a repo configured.
 
-          resources ->
-            resources
-        end
+            The following resources were found with `data_layer: AshPostgres.DataLayer`:
 
-      resources
-      |> Enum.flat_map(
-        &[
-          AshPostgres.DataLayer.Info.repo(&1, :read),
-          AshPostgres.DataLayer.Info.repo(&1, :mutate)
-        ]
-      )
-      |> Enum.uniq()
-      |> case do
-        [] ->
-          raise """
-          No repos could be found configured on the resources in the domains: #{Enum.map_join(domains, ",", &inspect/1)}
-
-          At least one resource must have a repo configured.
+            #{Enum.map_join(resources, "\n", &"* #{inspect(&1)}")}
+            """
 
-          The following resources were found with `data_layer: AshPostgres.DataLayer`:
+          repos ->
+            repos
+        end
 
-          #{Enum.map_join(resources, "\n", &"* #{inspect(&1)}")}
-          """
+      true ->
+        ensure_load(args)
 
-        repos ->
-          repos
-      end
-    else
-      if Code.ensure_loaded?(Mix.Tasks.App.Config) do
-        Mix.Task.run("app.config", args)
-      else
-        Mix.Task.run("loadpaths", args)
-        "--no-compile" not in args && Mix.Task.run("compile", args)
-      end
-
-      Mix.Project.config()[:app]
-      |> Application.get_env(:ecto_repos, [])
-      |> Enum.filter(fn repo ->
-        Spark.implements_behaviour?(repo, AshPostgres.Repo)
-      end)
+        Mix.Project.config()[:app]
+        |> Application.get_env(:ecto_repos, [])
+        |> Enum.filter(fn repo ->
+          Spark.implements_behaviour?(repo, AshPostgres.Repo)
+        end)
     end
   end
 
@@ -117,12 +137,7 @@ defmodule AshPostgres.Mix.Helpers do
   end
 
   defp ensure_compiled(domain, args) do
-    if Code.ensure_loaded?(Mix.Tasks.App.Config) do
-      Mix.Task.run("app.config", args)
-    else
-      Mix.Task.run("loadpaths", args)
-      "--no-compile" not in args && Mix.Task.run("compile", args)
-    end
+    ensure_load(args)
 
     case Code.ensure_compiled(domain) do
       {:module, _} ->
@@ -139,6 +154,15 @@ defmodule AshPostgres.Mix.Helpers do
     end
   end
 
+  defp ensure_load(args) do
+    if Code.ensure_loaded?(Mix.Tasks.App.Config) do
+      Mix.Task.run("app.config", args)
+    else
+      Mix.Task.run("loadpaths", args)
+      "--no-compile" not in args && Mix.Task.run("compile", args)
+    end
+  end
+
   def tenants(repo, opts) do
     tenants = repo.all_tenants()
 

lib/mix/tasks/ash_postgres.create.ex

@@ -7,11 +7,14 @@ defmodule Mix.Tasks.AshPostgres.Create do
     quiet: :boolean,
     domains: :string,
     no_compile: :boolean,
-    no_deps_check: :boolean
+    no_deps_check: :boolean,
+    repo: :string,
+    r: :string
   ]
 
   @aliases [
-    q: :quiet
+    q: :quiet,
+    r: :repo
   ]
 
   @moduledoc """

lib/mix/tasks/ash_postgres.drop.ex

@@ -6,7 +6,8 @@ defmodule Mix.Tasks.AshPostgres.Drop do
 
   @aliases [
     f: :force,
-    q: :quiet
+    q: :quiet,
+    r: :repo
   ]
 
   @switches [
@@ -15,7 +16,8 @@ defmodule Mix.Tasks.AshPostgres.Drop do
     quiet: :boolean,
     domains: :string,
     no_compile: :boolean,
-    no_deps_check: :boolean
+    no_deps_check: :boolean,
+    repo: :string
   ]
 
   @moduledoc """

lib/mix/tasks/ash_postgres.migrate.ex

@@ -7,7 +7,8 @@ defmodule Mix.Tasks.AshPostgres.Migrate do
   @shortdoc "Runs the repository migrations for all repositories in the provided (or congigured) domains"
 
   @aliases [
-    n: :step
+    n: :step,
+    r: :repo
   ]
 
   @switches [
@@ -26,7 +27,8 @@ defmodule Mix.Tasks.AshPostgres.Migrate do
     no_deps_check: :boolean,
     migrations_path: :keep,
     only_tenants: :string,
-    except_tenants: :string
+    except_tenants: :string,
+    repo: :string
   ]
 
   @moduledoc """

lib/mix/tasks/ash_postgres.rollback.ex

@@ -59,9 +59,10 @@ defmodule Mix.Tasks.AshPostgres.Rollback do
           log_migrations_sql: :boolean,
           log_migrator_sql: :boolean,
           only_tenants: :string,
-          except_tenants: :string
+          except_tenants: :string,
+          repo: :string
         ],
-        aliases: [n: :step, v: :to]
+        aliases: [n: :step, v: :to, r: :repo]
       )
 
     repos = AshPostgres.Mix.Helpers.repos!(opts, args)