format + small logging cleanup

Author: greg-rychlewski

lib/ecto/adapters/myxql/connection.ex

@@ -1380,7 +1380,13 @@ if Code.ensure_loaded?(MyXQL) do
 
     defp modifiers_expr(nil), do: []
     defp modifiers_expr(modifiers) when is_binary(modifiers), do: [modifiers, ?\s]
-    defp modifiers_expr(other), do: error!(nil, "MySQL adapter expects :modifiers to be a string or nil, got #{inspect(other)}")
+
+    defp modifiers_expr(other),
+      do:
+        error!(
+          nil,
+          "MySQL adapter expects :modifiers to be a string or nil, got #{inspect(other)}"
+        )
 
     defp options_expr(nil),
       do: []

lib/ecto/adapters/postgres/connection.ex

@@ -1764,7 +1764,13 @@ if Code.ensure_loaded?(Postgrex) do
 
     defp modifiers_expr(nil), do: []
     defp modifiers_expr(modifiers) when is_binary(modifiers), do: [modifiers, ?\s]
-    defp modifiers_expr(other), do: error!(nil, "PostgreSQL adapter expects :modifiers to be a string or nil, got #{inspect(other)}")
+
+    defp modifiers_expr(other),
+      do:
+        error!(
+          nil,
+          "PostgreSQL adapter expects :modifiers to be a string or nil, got #{inspect(other)}"
+        )
 
     defp options_expr(nil),
       do: []

lib/ecto/migration.ex

@@ -479,7 +479,13 @@ defmodule Ecto.Migration do
 
     To define a table in a migration, see `Ecto.Migration.table/2`.
     """
-    defstruct name: nil, prefix: nil, comment: nil, primary_key: true, engine: nil, options: nil, modifiers: nil
+    defstruct name: nil,
+              prefix: nil,
+              comment: nil,
+              primary_key: true,
+              engine: nil,
+              options: nil,
+              modifiers: nil
 
     @type t :: %__MODULE__{
             name: String.t(),

lib/ecto/migration/runner.ex

@@ -434,14 +434,12 @@ defmodule Ecto.Migration.Runner do
   defp command(ddl) when is_binary(ddl) or is_list(ddl),
     do: "execute #{inspect(ddl)}"
 
-  defp command({:create, %Table{modifiers: <<_::binary>>} = table, _}),
-    do: "create #{render_modifiers(table.modifiers)} table #{quote_name(table.prefix, table.name)}"
-
   defp command({:create, %Table{} = table, _}),
-    do: "create table #{quote_name(table.prefix, table.name)}"
+    do: "create #{table_modifiers(table.modifiers)} #{quote_name(table.prefix, table.name)}"
 
   defp command({:create_if_not_exists, %Table{} = table, _}),
-    do: "create table if not exists #{quote_name(table.prefix, table.name)}"
+    do:
+      "create #{table_modifiers(table.modifiers)} if not exists #{quote_name(table.prefix, table.name)}"
 
   defp command({:alter, %Table{} = table, _}),
     do: "alter table #{quote_name(table.prefix, table.name)}"
@@ -506,5 +504,6 @@ defmodule Ecto.Migration.Runner do
   defp quote_name(name) when is_atom(name), do: quote_name(Atom.to_string(name))
   defp quote_name(name), do: name
 
-  defp render_modifiers(value), do: String.downcase(String.trim(value))
+  defp table_modifiers(value) when is_binary(value), do: "#{value} table"
+  defp table_modifiers(_), do: "table"
 end

test/ecto/migrator_test.exs

@@ -356,7 +356,7 @@ defmodule Ecto.MigratorTest do
       end)
 
     assert output =~ "== Running 13 Ecto.MigratorTest.CreateTableWithModifiersMigration.change/0"
-    assert output =~ "create unlogged table sessions"
+    assert output =~ ~r/create unlogged table sessions/i
     assert output =~ ~r"== Migrated 13 in \d.\ds"
   end