diff options
| author | feld <feld@feld.me> | 2020-01-23 17:18:11 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-01-23 17:18:11 +0000 |
| commit | 362295358a778c08d7e3604890be0fa65ab38c33 (patch) | |
| tree | b234691a0eada317fcc89c372129b4e2f7f509bf /lib | |
| parent | dddebee047efc4ab1dff6565bef32954695846a7 (diff) | |
| parent | 6cd2e851d9d61ce82edf83ced79c9d4c613c0373 (diff) | |
| download | pleroma-362295358a778c08d7e3604890be0fa65ab38c33.tar.gz | |
Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop'
Truncate config table on migrate to db task and fix for parsing Swoosh adapters
Closes #1529
See merge request pleroma/pleroma!2136
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/pleroma/config.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/config/config_db.ex | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex index 861832451..3e76d2c97 100644 --- a/lib/mix/tasks/pleroma/config.ex +++ b/lib/mix/tasks/pleroma/config.ex @@ -52,6 +52,9 @@ defmodule Mix.Tasks.Pleroma.Config do defp do_migrate_to_db(config_file) do if File.exists?(config_file) do + Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;") + Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;") + custom_config = config_file |> read_file() diff --git a/lib/pleroma/config/config_db.ex b/lib/pleroma/config/config_db.ex index 91a1aa0cc..be6688095 100644 --- a/lib/pleroma/config/config_db.ex +++ b/lib/pleroma/config/config_db.ex @@ -416,7 +416,7 @@ defmodule Pleroma.ConfigDB do @spec is_module_name?(String.t()) :: boolean() def is_module_name?(string) do - Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth)\./, string) or + Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth|Swoosh)\./, string) or string in ["Oban", "Ueberauth", "ExSyslogger"] end end |