diff options
| author | Badlop <badlop@process-one.net> | 2021-05-10 17:25:55 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2021-05-14 16:06:43 +0200 |
| commit | ee3796b92569d42b430f11b43532d41b9c6eb911 (patch) | |
| tree | a0f854e7ecf1f07c2e64a9cb855ed1df9487dd37 /src | |
| parent | Tell io_lib:print to not care about line length, to avoid newlines in SQL export (diff) | |
When exporting for SQLite, use its specific escape options (#2576)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_sql.erl | 6 | ||||
| -rw-r--r-- | src/ejd2sql.erl | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ejabberd_sql.erl b/src/ejabberd_sql.erl index 32148934c..afca5b183 100644 --- a/src/ejabberd_sql.erl +++ b/src/ejabberd_sql.erl @@ -39,6 +39,7 @@ restart/1, use_new_schema/0, sql_query_to_iolist/1, + sql_query_to_iolist/2, escape/1, standard_escape/1, escape_like/1, @@ -832,6 +833,11 @@ sql_query_format_res(Res, _SQLQuery) -> sql_query_to_iolist(SQLQuery) -> generic_sql_query_format(SQLQuery). +sql_query_to_iolist(sqlite, SQLQuery) -> + sqlite_sql_query_format(SQLQuery); +sql_query_to_iolist(_DbType, SQLQuery) -> + generic_sql_query_format(SQLQuery). + sql_begin() -> sql_query_internal( [{mssql, [<<"begin transaction;">>]}, diff --git a/src/ejd2sql.erl b/src/ejd2sql.erl index e98dd071a..f5c87ffcd 100644 --- a/src/ejd2sql.erl +++ b/src/ejd2sql.erl @@ -154,6 +154,7 @@ import_info(Mod) -> %%% Internal functions %%%---------------------------------------------------------------------- export(LServer, Table, IO, ConvertFun) -> + DbType = ejabberd_option:sql_type(LServer), F = fun () -> mnesia:read_lock_table(Table), {_N, SQLs} = @@ -163,7 +164,7 @@ export(LServer, Table, IO, ConvertFun) -> [] -> Acc; SQL1 -> - SQL = format_queries(SQL1), + SQL = format_queries(DbType, SQL1), if N < (?MAX_RECORDS_PER_TRANSACTION) - 1 -> {N + 1, [SQL | SQLs]}; true -> @@ -368,10 +369,10 @@ format_error({error, eof}) -> format_error({error, Posix}) -> file:format_error(Posix). -format_queries(SQLs) -> +format_queries(DbType, SQLs) -> lists:map( fun(#sql_query{} = SQL) -> - ejabberd_sql:sql_query_to_iolist(SQL); + ejabberd_sql:sql_query_to_iolist(DbType, SQL); (SQL) -> SQL end, SQLs). |