release 1.1.4

Author: mithereal

README.md

@@ -30,6 +30,18 @@ def deps do
 end
 ```
 
+## Configuration
+```elixir
+config :ex_dbmigrate, ExDbmigrate.Repo,
+  adapter: Ecto.Adapters.Postgres,
+  username: "postgres",
+  password: "postgres",
+  database: "postgres",
+  hostname: "localhost",
+  pool_size: 10,
+  primary_key_type: :uuid
+#   port: 5543
+```
 ## Usage: 
 ```bash
 mix ExDbmigrate.Gen.Migration

config/config.exs

@@ -27,6 +27,4 @@ import Config
 #
 #     import_config "#{Mix.env()}.exs"
 
-config :ex_dbmigrate, :ecto_repos, [ExDbmigrate.Repo]
-
 import_config "#{Mix.env()}.exs"

config/dev.exs

@@ -2,8 +2,6 @@ import Config
 # Do not include metadata nor timestamps in development logs
 config :logger, :console, format: "[$level] $message\n"
 
-config :ex_dbmigrate, :ecto_repos, [ExDbmigrate.Repo]
-
 config :ex_dbmigrate, ExDbmigrate.Repo,
   adapter: Ecto.Adapters.Postgres,
   username: "postgres",

ex_dbmigrate.iml

@@ -126,5 +126,10 @@
     <orderEntry type="library" name="exflect" level="project" />
     <orderEntry type="library" name="inflex" level="project" />
     <orderEntry type="library" name="httpoison" level="project" />
+    <orderEntry type="library" name="bypass" level="project" />
+    <orderEntry type="library" name="meck" level="project" />
+    <orderEntry type="library" name="mock" level="project" />
+    <orderEntry type="library" name="sax_map" level="project" />
+    <orderEntry type="library" name="saxy" level="project" />
   </component>
 </module>

lib/application.ex

@@ -5,14 +5,10 @@ defmodule ExDbmigrate.Application do
 
   use Application
 
-  alias ExDbmigrate.Config
-
   @impl true
   def start(_type, args) do
-    repo = Config.repo()
-
     children = [
-      {repo, args},
+      {ExDbmigrate.Repo, args},
       # Starts a worker by calling: ExDbmigrate.Worker.start_link(arg)
       {Registry, keys: :unique, name: :tables},
       {ExDbmigrate.Table.Supervisor, args}

lib/config.ex

@@ -2,8 +2,8 @@ defmodule ExDbmigrate do
   @moduledoc """
   Documentation for `ExDbmigrate`.
   """
-
-  @repo ExDbmigrate.Config.repo()
+  @repo ExDbmigrate.Repo
+  @ignore ["information_schema", "pg_catalog"]
 
   import Exflect
 
@@ -57,15 +57,15 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='#{table}';
 
   ## Examples
 
-      iex> ExDbmigrate.migration()
+      iex> ExDbmigrate.migration("public")
       ["mix phx.gen.migration CatalogMetas CatalogMeta catalog_metas key:string data:string product_id:uuid",
       "mix phx.gen.migration CatalogVideosToProducts CatalogVideosToProduct catalog_videos_to_product product_id:uuid video_id:uuid",
       "mix phx.gen.migration CatalogProducts CatalogProduct catalog_products name:string",
       "mix phx.gen.migration CatalogVideos CatalogVideo catalog_videos path:string"]
 
   """
-  def migration() do
-    results = fetch_results()
+  def migration(schema \\ "public") do
+    results = fetch_results(schema)
 
     Enum.map(results.rows, fn r ->
       fetch_table_data(r)
@@ -79,14 +79,14 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='#{table}';
   ## Examples
 
       iex> ExDbmigrate.migration_relations()
-      ["mix phx.gen.schema CatalogMetas CatalogMeta catalog_metas product_id:references:catalog_products",
-      "mix phx.gen.schema CatalogVideosToProducts CatalogVideosToProduct catalog_videos_to_product product_id:references:catalog_products video_id:references:catalog_videos",
-      "mix phx.gen.schema CatalogProducts CatalogProduct catalog_products ",
-      "mix phx.gen.schema CatalogVideos CatalogVideo catalog_videos "]
+      ["mix phx.gen.schema CatalogMetas.CatalogMeta catalog_metas product_id:references:catalog_products",
+      "mix phx.gen.schema CatalogVideosToProducts.CatalogVideosToProduct catalog_videos_to_product product_id:references:catalog_products video_id:references:catalog_videos",
+      "mix phx.gen.schema CatalogProducts.CatalogProduct catalog_products ",
+      "mix phx.gen.schema CatalogVideos.CatalogVideo catalog_videos "]
 
   """
-  def migration_relations() do
-    results = fetch_results()
+  def migration_relations(schema \\ "public") do
+    results = fetch_results(schema)
 
     Enum.map(results.rows, fn r ->
       list_foreign_keys(r)
@@ -100,14 +100,14 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='#{table}';
   ## Examples
 
       iex> ExDbmigrate.schema()
-      ["mix phx.gen.schema CatalogMetas CatalogMeta catalog_metas key:string data:string product_id:integer --no-migration",
-      "mix phx.gen.schema CatalogVideosToProducts CatalogVideosToProduct catalog_videos_to_product product_id:integer video_id:integer --no-migration",
-      "mix phx.gen.schema CatalogProducts CatalogProduct catalog_products name:string --no-migration",
-      "mix phx.gen.schema CatalogVideos CatalogVideo catalog_videos path:string --no-migration"]
+      ["mix phx.gen.schema CatalogMetas.CatalogMeta catalog_metas key:string data:string product_id:integer --no-migration",
+      "mix phx.gen.schema CatalogVideosToProducts.CatalogVideosToProduct catalog_videos_to_product product_id:integer video_id:integer --no-migration",
+      "mix phx.gen.schema CatalogProducts.CatalogProduct catalog_products name:string --no-migration",
+      "mix phx.gen.schema CatalogVideos.CatalogVideo catalog_videos path:string --no-migration"]
 
   """
-  def schema() do
-    results = fetch_results()
+  def schema(schema \\ "public") do
+    results = fetch_results(schema)
 
     Enum.map(results.rows, fn r ->
       fetch_table_data(r)
@@ -128,8 +128,8 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='#{table}';
       ]
 
   """
-  def html() do
-    results = fetch_results()
+  def html(schema \\ "public") do
+    results = fetch_results(schema)
 
     Enum.map(results.rows, fn r ->
       fetch_table_data(r)
@@ -149,8 +149,8 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='#{table}';
       "mix phx.gen.json CatalogVideos CatalogVideo catalog_videos path:string"]
 
   """
-  def json() do
-    results = fetch_results()
+  def json(schema \\ "public") do
+    results = fetch_results(schema)
 
     Enum.map(results.rows, fn r ->
       fetch_table_data(r)
@@ -170,26 +170,33 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='#{table}';
       "mix phx.gen.live CatalogVideos CatalogVideo catalog_videos path:string"]
 
   """
-  def live() do
-    results = fetch_results()
+  def live(schema \\ "public") do
+    results = fetch_results(schema)
 
     Enum.map(results.rows, fn r ->
       fetch_table_data(r)
       |> generate_lives_command(r)
     end)
   end
 
-  def fetch_results() do
+  def fetch_table_schemas(ignore \\ @ignore) do
+    query = "SELECT schema_name
+      FROM information_schema.schemata;"
+
+    Ecto.Adapters.SQL.query!(@repo, query, []) |> Enum.reject(fn x -> Enum.member?(ignore, x) end)
+  end
+
+  def fetch_results(schema \\ "public") do
     query =
-      "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public' and table_name != 'schema_migrations';"
+      "SELECT table_name FROM information_schema.tables WHERE table_schema = '#{schema}' and table_name != 'schema_migrations';"
 
     Ecto.Adapters.SQL.query!(@repo, query, [])
   end
 
-  def fetch_table_data(r) do
+  def fetch_table_data(r, schema \\ "public") do
     query =
       "SELECT column_name, is_nullable, data_type, ordinal_position, character_maximum_length FROM information_schema.columns
-WHERE table_schema = 'public'
+WHERE table_schema = '#{schema}'
   AND table_name   = '#{r}'"
 
     Ecto.Adapters.SQL.query!(@repo, query, [])
@@ -300,7 +307,7 @@ WHERE table_schema = 'public'
 
     migration_name = String.downcase(migration_name <> "relations")
 
-    "mix phx.gen.schema #{module} #{module_name} #{table} #{migration_string}"
+    "mix phx.gen.schema #{module}.#{module_name} #{table} #{migration_string}"
   end
 
   def generate_schema_relations_command(fk_data, [migration_name]) do
@@ -324,7 +331,7 @@ WHERE table_schema = 'public'
 
     module_name = String.downcase(module_name <> "relations")
 
-    "mix phx.gen.schema #{module} #{module_name} #{table} #{migration_string}"
+    "mix phx.gen.schema #{module}.#{module_name} #{table} #{migration_string}"
   end
 
   def generate_schemas_command(data, [migration_name]) do
@@ -338,7 +345,7 @@ WHERE table_schema = 'public'
 
     module = migration_module |> pluralize()
 
-    "mix phx.gen.schema #{module} #{module_name} #{table} #{migration_string} --no-migration"
+    "mix phx.gen.schema #{module}.#{module_name} #{table} #{migration_string} --no-migration"
   end
 
   def type_select(t) do

lib/ex_dbmigrate.ex

@@ -3,18 +3,6 @@ defmodule ExDbmigrate.Repo do
     otp_app: :ex_dbmigrate,
     adapter: Ecto.Adapters.Postgres
 
-  @doc """
-  Dynamically loads the repository url from the
-  DATABASE_URL environment variable.
-  """
-  def init(arg, nil) do
-    init(arg, [])
-  end
-
-  def init(_, opts) do
-    {:ok, Keyword.put(opts, :url, System.get_env("DATABASE_URL"))}
-  end
-
   @doc """
   Empty the Database Table
   """

lib/repo.ex

@@ -43,7 +43,7 @@ defmodule ExDbmigrate.Table.Server do
   def init(init_arg) do
     data = ExDbmigrate.list_foreign_keys(init_arg)
 
-    ref_type = ExDbmigrate.Config.key_type()
+    ref_type = key_type()
 
     timestamp_fields =
       Application.get_env(:ex_dbmigrate, :timestamp_fields, [:updated_at, :inserted_at])
@@ -145,7 +145,7 @@ defmodule ExDbmigrate.Table.Server do
         _from,
         state
       ) do
-    ref_type = ExDbmigrate.Config.key_type()
+    ref_type = key_type()
 
     assoc_type =
       case Enum.count(state.links) do
@@ -166,7 +166,7 @@ defmodule ExDbmigrate.Table.Server do
       ) do
     link_data =
       Enum.map(data, fn x ->
-        ref_type = ExDbmigrate.Config.key_type()
+        ref_type = key_type()
 
         %{
           column_name: x.column_name,
@@ -243,4 +243,18 @@ defmodule ExDbmigrate.Table.Server do
   def handle_info(_msg, state) do
     {:noreply, state}
   end
+
+  def key_type() do
+    case Application.get_env(:ex_dbmigrate, ExDbmigrate.Repo)[:primary_key_type] do
+      nil -> :integer
+      _ -> :binary_id
+    end
+  end
+
+  def key_type(:migration) do
+    case Application.get_env(:ex_dbmigrate, repo())[:primary_key_type] do
+      nil -> :integer
+      _ -> :uuid
+    end
+  end
 end

lib/table.ex

@@ -1,6 +1,6 @@
 defmodule ExDbmigrate.MixProject do
   use Mix.Project
-  @version "1.1.3"
+  @version "1.1.4"
   @source_url "https://github.com/mithereal/ExDbmigrate"
 
   def project do