Add config transformer from use_new_schema -> sql_multihost_schema

Author: prefiks

src/ejabberd_config_transformer.erl

@@ -232,6 +232,9 @@ filter(_Host, route_subdomains, _, _) ->
     false;
 filter(_Host, auth_password_types_hidden_in_scram1, Val, _) ->
     {true, {auth_password_types_hidden_in_sasl1, Val}};
+filter(_Host, new_sql_schema, Val, _) ->
+    warn_replaced_option(new_sql_schema, sql_schema_multihost),
+    {true, {sql_schema_multihost, Val}};
 filter(Host, modules, ModOpts, State) ->
     NoDialbackHosts = maps:get(remove_s2s_dialback, State, []),
     ModOpts1 = lists:filter(

src/ejabberd_option.erl

@@ -89,7 +89,6 @@
 -export([modules/0, modules/1]).
 -export([negotiation_timeout/0]).
 -export([net_ticktime/0]).
--export([new_sql_schema/0]).
 -export([oauth_access/0, oauth_access/1]).
 -export([oauth_cache_life_time/0]).
 -export([oauth_cache_missed/0]).
@@ -687,10 +686,6 @@ negotiation_timeout() ->
 net_ticktime() ->
     ejabberd_config:get_option({net_ticktime, global}).
 
--spec new_sql_schema() -> boolean().
-new_sql_schema() ->
-    ejabberd_config:get_option({new_sql_schema, global}).
-
 -spec oauth_access() -> 'none' | acl:acl().
 oauth_access() ->
     oauth_access(global).

src/ejabberd_options.erl

@@ -266,8 +266,6 @@ opt_type(negotiation_timeout) ->
     econf:timeout(second);
 opt_type(net_ticktime) ->
     econf:timeout(second);
-opt_type(new_sql_schema) ->
-    econf:bool();
 opt_type(sql_schema_multihost) ->
     econf:bool();
 opt_type(update_sql_schema) ->
@@ -634,7 +632,6 @@ options() ->
      {modules, []},
      {negotiation_timeout, timer:seconds(120)},
      {net_ticktime, timer:seconds(60)},
-     {new_sql_schema, ?USE_MULTIHOST_SQL_SCHEMA_DEFAULT},
      {sql_schema_multihost, ?USE_MULTIHOST_SQL_SCHEMA_DEFAULT},
      {update_sql_schema, true},
      {update_sql_schema_timeout, timer:minutes(5)},
@@ -792,7 +789,6 @@ globals() ->
      log_modules_fully,
      negotiation_timeout,
      net_ticktime,
-     new_sql_schema,
      update_sql_schema,
      node_start,
      oauth_cache_life_time,