Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Only attempt to migrate an old ODBC table if it still exists

This commit is contained in:
Badlop 2011-03-10 19:47:14 +01:00
parent 38bf3bfc1c
commit 102dabdefc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gen_storage_migration.erl
View File

@ -137,8 +137,13 @@ migrate_odbc1(Host, Tables, {OldTablesColumns, MigrateFun}) ->
{[OldTable | _] = OldTables,
[OldColumns | _] = OldColumnsAll} = lists:unzip(OldTablesColumns),
OldTablesA = [list_to_atom(Table) || Table <- OldTables],
ColumnsT = [odbc_table_columns_t(OldTable1) || OldTable1 <- OldTables],
migrate_odbc2(Host, Tables, OldTable, OldTables, OldColumns, OldColumnsAll, OldTablesA, ColumnsT, MigrateFun).
case is_table_exists(OldTable, odbc) of
true ->
ColumnsT = [odbc_table_columns_t(OldTable1) || OldTable1 <- OldTables],
migrate_odbc2(Host, Tables, OldTable, OldTables, OldColumns, OldColumnsAll, OldTablesA, ColumnsT, MigrateFun);
false ->
ignored
end.
migrate_odbc2(Host, Tables, OldTable, OldTables, OldColumns, OldColumnsAll, OldTablesA, ColumnsT, MigrateFun)
when ColumnsT == OldColumnsAll ->
@ -236,3 +241,10 @@ odbc_table_columns_t(Table) ->
Columns2
end.
is_table_exists(Table, odbc) ->
case catch ejabberd_odbc:sql_query_t("SELECT COUNT(*) FROM " ++ Table) of
{selected, _, _} ->
true;
_ ->
false
end.