fix tuple-list-tuple conversion-related eunit tests once again

basho · Apr 15, 2016 · 549d98b · 549d98b
1 parent 467d814
commit 549d98b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/riak_kv_qry.erl b/src/riak_kv_qry.erl
@@ -298,12 +298,12 @@ describe_table_columns_test() ->
             " f, s, t))")),
     Res = do_describe(DDL),
     ?assertMatch(
-       {ok, [_, _,
-             [{<<"f">>, <<"varchar">>,   false, 1,  1},
-              {<<"s">>, <<"varchar">>,   false, 2,  2},
-              {<<"t">>, <<"timestamp">>, false, 3,  3},
-              {<<"w">>, <<"sint64">>, false, [], []},
-              {<<"p">>, <<"double">>, true,  [], []}]]},
+       {ok, {_, _,
+             [[<<"f">>, <<"varchar">>,   false, 1,  1],
+              [<<"s">>, <<"varchar">>,   false, 2,  2],
+              [<<"t">>, <<"timestamp">>, false, 3,  3],
+              [<<"w">>, <<"sint64">>, false, [], []],
+              [<<"p">>, <<"double">>, true,  [], []]]}},
        Res).
 
 validate_make_insert_row_basic_test() ->

diff --git a/src/riak_kv_qry_worker.erl b/src/riak_kv_qry_worker.erl
@@ -292,10 +292,8 @@ prepare_final_results2(#riak_sel_clause_v1{col_return_types = ColTypes,
 
 prepare_final_results_test() ->
     Rows = [[12, <<"windy">>], [13, <<"windy">>]],
-    RowsAsTuples = [{12, <<"windy">>}, {13, <<"windy">>}],
-    % IndexedChunks = [{1, Rows}],
     ?assertEqual(
-        {[<<"a">>, <<"b">>], [sint64, varchar], RowsAsTuples},
+        {[<<"a">>, <<"b">>], [sint64, varchar], Rows},
         prepare_final_results(
             #state{
                 qry =