Make the --force flag for reset command consistent with the others and deduplicate db truncation
This commit is contained in:
parent
e379ab8277
commit
16bdc2bcd0
|
@ -95,7 +95,15 @@ def run(["groups"]) do
|
|||
end)
|
||||
end
|
||||
|
||||
def run(["reset" | options]) do
|
||||
def run(["reset", "--force"]) do
|
||||
check_configdb(fn ->
|
||||
start_pleroma()
|
||||
truncatedb()
|
||||
shell_info("The ConfigDB settings have been removed from the database.")
|
||||
end)
|
||||
end
|
||||
|
||||
def run(["reset"]) do
|
||||
check_configdb(fn ->
|
||||
start_pleroma()
|
||||
|
||||
|
@ -108,13 +116,8 @@ def run(["reset" | options]) do
|
|||
|
||||
shell_error("\nTHIS CANNOT BE UNDONE!")
|
||||
|
||||
proceed? =
|
||||
"--force" in options or
|
||||
shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y)
|
||||
|
||||
if proceed? do
|
||||
Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
|
||||
Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
|
||||
if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
|
||||
truncatedb()
|
||||
|
||||
shell_info("The ConfigDB settings have been removed from the database.")
|
||||
else
|
||||
|
@ -189,8 +192,7 @@ def migrate_to_db(file_path \\ nil) do
|
|||
defp do_migrate_to_db(config_file) do
|
||||
if File.exists?(config_file) do
|
||||
shell_info("Migrating settings from file: #{Path.expand(config_file)}")
|
||||
Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
|
||||
Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
|
||||
truncatedb()
|
||||
|
||||
custom_config =
|
||||
config_file
|
||||
|
@ -376,4 +378,9 @@ defp delete_group(group) do
|
|||
end
|
||||
end)
|
||||
end
|
||||
|
||||
defp truncatedb() do
|
||||
Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
|
||||
Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue