diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-29 11:39:40 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-29 11:39:40 +0300 |
| commit | b82b93f8f0c229e94a89469b0754bab0e28cd17c (patch) | |
| tree | 56f5c7a25aa19254b4f30b1cf33fc34dcbadcbb7 /src/mod_mam_sql.erl | |
| parent | Don't re-define validation functions in multiple places (diff) | |
Don't validate an option in ejabberd_config:get_option() functions
The commit introduces the following changes:
* Now there is no need to pass validating function in
ejabberd_config:get_option() functions, because the configuration
keeps already validated values.
* New function ejabberd_config:get_option/1 is introduced
* Function ejabberd_config:get_option/3 is deprecated. If the function
is still called, the second argument (validating function) is simply
ignored.
* The second argument for ejabberd_config:get_option/2 is now
a default value, not a validating function.
Diffstat (limited to 'src/mod_mam_sql.erl')
| -rw-r--r-- | src/mod_mam_sql.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl index 93bf2f2f2..d2fd48a9f 100644 --- a/src/mod_mam_sql.erl +++ b/src/mod_mam_sql.erl @@ -200,9 +200,7 @@ make_sql_query(User, LServer, MAMQuery, RSM) -> With = proplists:get_value(with, MAMQuery), WithText = proplists:get_value(withtext, MAMQuery), {Max, Direction, ID} = get_max_direction_id(RSM), - ODBCType = ejabberd_config:get_option( - {sql_type, LServer}, - ejabberd_sql:opt_type(sql_type)), + ODBCType = ejabberd_config:get_option({sql_type, LServer}), Escape = case ODBCType of mssql -> fun ejabberd_sql:standard_escape/1; |