Просмотр исходного кода

Made db tests more cannonical.

Heinz N. Gies 12 лет назад
Родитель
Сommit
29298c33bd
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      cowboy/src/db_handler.erl

+ 4 - 4
cowboy/src/db_handler.erl

@@ -14,12 +14,12 @@ handle(Req, State) ->
         random:seed(erlang:now()),
         {JSON, Req2} = case cowboy_req:qs_val(<<"queries">>, Req) of
 		{undefined, Req1} ->
-			{result_packet, _, _, [Res], _} = emysql:execute(test_pool, db_stmt, [random:uniform(10000)]),
-			{Res, Req1};
+			{result_packet, _, _, [[ID, Rand]], _} = emysql:execute(test_pool, db_stmt, [random:uniform(10000)]),
+			{[{[{<<"id">>, ID}, {<<"randomNumber">>, Rand}]}], Req1};
 		{N, Req1} ->
 			I = list_to_integer(binary_to_list(N)),
-			Res = [ Res || 
-			        {result_packet, _, _, [Res], _} <- [emysql:execute(test_pool, db_stmt, [random:uniform(10000)]) || _ <- lists:seq(1, I) ]],
+			Res = [ {[{<<"id">>, ID}, {<<"randomNumber">>, Rand}]} || 
+			        {result_packet, _, _, [[ID, Rand]], _} <- [emysql:execute(test_pool, db_stmt, [random:uniform(10000)]) || _ <- lists:seq(1, I) ]],
 			{Res, Req1}
 		end,
 	{ok, Req3} = cowboy_req:reply(200, [{<<"Content-Type">>, <<"application/json">>}], jiffy:encode(JSON), Req2),