diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-10-25 17:10:07 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-10-25 17:10:07 +0100 |
| commit | 0c774c7c0b01fd81f94562aaaa796af1c7ee703e (patch) | |
| tree | 21b8782287524b4ab863bd88ea8d75c43d0693a5 | |
| parent | 35983264171df2421fe48896607b9ee68ebee9ba (diff) | |
| download | rabbitmq-server-git-0c774c7c0b01fd81f94562aaaa796af1c7ee703e.tar.gz | |
Match more return values, and reindent
| -rw-r--r-- | src/rabbit_upgrade.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_upgrade_functions.erl | 42 |
2 files changed, 26 insertions, 22 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index f1af8bcbdf..d387795814 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -65,8 +65,8 @@ maybe_upgrade(Dir) -> write_version(Dir) -> G = load_graph(), - rabbit_misc:write_term_file(schema_filename(Dir), [heads(G)]), - digraph:delete(G), + ok = rabbit_misc:write_term_file(schema_filename(Dir), [heads(G)]), + true = digraph:delete(G), ok. %% ------------------------------------------------------------------- @@ -133,7 +133,7 @@ apply_upgrades(Upgrades, Dir) -> apply_upgrade({M, F}) -> info("Upgrades: Applying ~w:~w~n", [M, F]), - apply(M, F, []). + ok = apply(M, F, []). %% ------------------------------------------------------------------- diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl index 53a1624e18..c8a494b578 100644 --- a/src/rabbit_upgrade_functions.erl +++ b/src/rabbit_upgrade_functions.erl @@ -46,28 +46,32 @@ remove_user_scope() -> {atomic, ok} = mnesia:transform_table( - rabbit_user_permission, - fun (Perm = #user_permission{ - permission = {permission, _Scope, Conf, Write, Read}}) -> - Perm#user_permission{ - permission = #permission2{configure = Conf, - write = Write, - read = Read}} - end, - record_info(fields, user_permission)). + rabbit_user_permission, + fun (Perm = #user_permission{ + permission = {permission, + _Scope, Conf, Write, Read}}) -> + Perm#user_permission{ + permission = #permission2{configure = Conf, + write = Write, + read = Read}} + end, + record_info(fields, user_permission)), + ok. test_add_column() -> {atomic, ok} = mnesia:transform_table( - rabbit_user, - fun ({user, Username, Password, Admin}) -> - {user, Username, Password, Admin, something_else} - end, - [username, password, is_admin, something]). + rabbit_user, + fun ({user, Username, Password, Admin}) -> + {user, Username, Password, Admin, something_else} + end, + [username, password, is_admin, something]), + ok. test_remove_column() -> {atomic, ok} = mnesia:transform_table( - rabbit_user, - fun ({user, Username, Password, Admin, _SomethingElse}) -> - {user, Username, Password, Admin} - end, - record_info(fields, user)). + rabbit_user, + fun ({user, Username, Password, Admin, _SomethingElse}) -> + {user, Username, Password, Admin} + end, + record_info(fields, user)), + ok. |