Skip to content

Commit 4b81ea5

Browse files
committed
Remove dead code from storage_{up, down, status}
`Keyword.fetch!/2` raises. The runtime error the result coalesced to wasn't ever raised.
1 parent 32113be commit 4b81ea5

3 files changed

Lines changed: 9 additions & 18 deletions

File tree

lib/ecto/adapters/myxql.ex

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,7 @@ defmodule Ecto.Adapters.MyXQL do
174174

175175
@impl true
176176
def storage_up(opts) do
177-
database =
178-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
177+
database = Keyword.fetch!(opts, :database)
179178

180179
opts = Keyword.delete(opts, :database)
181180
charset = opts[:charset] || "utf8mb4"
@@ -213,8 +212,7 @@ defmodule Ecto.Adapters.MyXQL do
213212

214213
@impl true
215214
def storage_down(opts) do
216-
database =
217-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
215+
database = Keyword.fetch!(opts, :database)
218216

219217
opts = Keyword.delete(opts, :database)
220218
command = "DROP DATABASE `#{database}`"
@@ -242,8 +240,7 @@ defmodule Ecto.Adapters.MyXQL do
242240

243241
@impl Ecto.Adapter.Storage
244242
def storage_status(opts) do
245-
database =
246-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
243+
database = Keyword.fetch!(opts, :database)
247244

248245
opts = Keyword.delete(opts, :database)
249246

lib/ecto/adapters/postgres.ex

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ defmodule Ecto.Adapters.Postgres do
175175

176176
@impl true
177177
def storage_up(opts) do
178-
database =
179-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
178+
database = Keyword.fetch!(opts, :database)
180179

181180
encoding = if opts[:encoding] == :unspecified, do: nil, else: opts[:encoding] || "UTF8"
182181
maintenance_database = Keyword.get(opts, :maintenance_database, @default_maintenance_database)
@@ -215,8 +214,7 @@ defmodule Ecto.Adapters.Postgres do
215214

216215
@impl true
217216
def storage_down(opts) do
218-
database =
219-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
217+
database = Keyword.fetch!(opts, :database)
220218

221219
command =
222220
"DROP DATABASE \"#{database}\""
@@ -239,8 +237,7 @@ defmodule Ecto.Adapters.Postgres do
239237

240238
@impl Ecto.Adapter.Storage
241239
def storage_status(opts) do
242-
database =
243-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
240+
database = Keyword.fetch!(opts, :database)
244241

245242
maintenance_database = Keyword.get(opts, :maintenance_database, @default_maintenance_database)
246243
opts = Keyword.put(opts, :database, maintenance_database)

lib/ecto/adapters/tds.ex

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ defmodule Ecto.Adapters.Tds do
172172
@doc false
173173
@impl true
174174
def storage_up(opts) do
175-
database =
176-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
175+
database = Keyword.fetch!(opts, :database)
177176

178177
command =
179178
~s(CREATE DATABASE [#{database}])
@@ -197,8 +196,7 @@ defmodule Ecto.Adapters.Tds do
197196
@doc false
198197
@impl true
199198
def storage_down(opts) do
200-
database =
201-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
199+
database = Keyword.fetch!(opts, :database)
202200

203201
case run_query(Keyword.put(opts, :database, "master"), "DROP DATABASE [#{database}]") do
204202
{:ok, _} ->
@@ -214,8 +212,7 @@ defmodule Ecto.Adapters.Tds do
214212

215213
@impl Ecto.Adapter.Storage
216214
def storage_status(opts) do
217-
database =
218-
Keyword.fetch!(opts, :database) || raise ":database is nil in repository configuration"
215+
database = Keyword.fetch!(opts, :database)
219216

220217
opts = Keyword.put(opts, :database, "master")
221218

0 commit comments

Comments
 (0)