Ironically our dummy upgrades now need to be upgraded.

1 files changed, 14 insertions, 13 deletions

diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl
index 8fee70af1f..1806c40f03 100644
--- a/src/rabbit_upgrade_functions.erl
+++ b/src/rabbit_upgrade_functions.erl
@@ -91,11 +91,21 @@ internal_exchanges() ->
       || T <- Tables ],
     ok.
 
+user_to_internal_user() ->
+    mnesia(
+      rabbit_user,
+      fun({user, Username, PasswordHash, IsAdmin}) ->
+              {internal_user, Username, PasswordHash, IsAdmin}
+      end,
+      [username, password_hash, is_admin], internal_user).
+
+
+
 one() ->
     mnesia(
       rabbit_user,
-      fun ({user, Username, Hash, IsAdmin}) ->
-              {user, Username, Hash, IsAdmin, foo}
+      fun ({internal_user, Username, Hash, IsAdmin}) ->
+              {internal_user, Username, Hash, IsAdmin, foo}
       end,
       [username, password_hash, is_admin, extra]).
 
@@ -106,20 +116,11 @@ two() ->
 three() ->
     mnesia(
       rabbit_user,
-      fun ({user, Username, Hash, IsAdmin, _}) ->
-              {user, Username, Hash, IsAdmin}
+      fun ({internal_user, Username, Hash, IsAdmin, _}) ->
+              {internal_user, Username, Hash, IsAdmin}
       end,
       [username, password_hash, is_admin]).
 
-
-user_to_internal_user() ->
-    mnesia(
-      rabbit_user,
-      fun({user, Username, PasswordHash, IsAdmin}) ->
-              {internal_user, Username, PasswordHash, IsAdmin}
-      end,
-      [username, password_hash, is_admin], internal_user).
-
 %%--------------------------------------------------------------------
 
 mnesia(TableName, Fun, FieldList) ->