Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/error_tracker/migration.ex
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ defmodule ErrorTracker.Migration do
end

defp migrator do
case ErrorTracker.Repo.__adapter__() do
Ecto.Adapters.Postgres -> ErrorTracker.Migration.Postgres
Ecto.Adapters.SQLite3 -> ErrorTracker.Migration.SQLite
ErrorTracker.Repo.with_adapter(fn
:postgres -> ErrorTracker.Migration.Postgres
:sqlite -> ErrorTracker.Migration.SQLite
adapter -> raise "ErrorTracker does not support #{adapter}"
end
end)
end
end
12 changes: 6 additions & 6 deletions lib/error_tracker/migration/sql_migrator.ex
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ defmodule ErrorTracker.Migration.SQLMigrator do
defp record_version(opts, version) do
timestamp = DateTime.utc_now() |> DateTime.to_unix()

case repo().__adapter__() do
Ecto.Adapters.Postgres ->
ErrorTracker.Repo.with_adapter(fn
:postgres ->
prefix = opts[:prefix]

execute """
Expand All @@ -79,12 +79,12 @@ defmodule ErrorTracker.Migration.SQLMigrator do
VALUES ('migration_version', '#{version}'), ('migration_timestamp', '#{timestamp}')
ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value
"""
end
end)
end

defp meta_table_exists?(repo, opts) do
case repo.__adapter__() do
Ecto.Adapters.Postgres ->
ErrorTracker.Repo.with_adapter(fn
:postgres ->
Ecto.Adapters.SQL.query!(
repo,
"SELECT TRUE FROM information_schema.tables WHERE table_name = 'error_tracker_meta' AND table_schema = $1",
Expand All @@ -96,6 +96,6 @@ defmodule ErrorTracker.Migration.SQLMigrator do

_other ->
Ecto.Adapters.SQL.table_exists?(repo, "error_tracker_meta", log: false)
end
end)
end
end
21 changes: 13 additions & 8 deletions lib/error_tracker/repo.ex
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,24 @@ defmodule ErrorTracker.Repo do
dispatch(:aggregate, [queryable, aggregate], opts)
end

def __adapter__, do: repo().__adapter__()
def with_adapter(fun) do
adapter =
case repo().__adapter__() do
Ecto.Adapters.Postgres -> :postgres
Ecto.Adapters.SQLite3 -> :sqlite
end

fun.(adapter)
end

defp dispatch(action, args, opts) do
repo = repo()

defaults =
case repo.__adapter__() do
Ecto.Adapters.Postgres ->
[prefix: Application.get_env(:error_tracker, :prefix, "public")]

_ ->
[]
end
with_adapter(fn
:postgres -> [prefix: Application.get_env(:error_tracker, :prefix, "public")]
_ -> []
end)

opts_w_defaults = Keyword.merge(defaults, opts)

Expand Down