[#192] Make Riak store take care of every condition when building the…

… query

src/sumo_store_riak.erl

@@ -228,10 +228,12 @@ find_by(DocName, Conditions, State) ->
 ) -> sumo_store:result([sumo_internal:doc()], state()).
 find_by(DocName, Conditions, Limit, Offset, State) when is_list(Conditions) ->
   IdField = sumo_internal:id_field_name(DocName),
-  %% If the key field is present in the conditions, we are looking for a
-  %% particular document. If not, it is a general query.
-  case lists:keyfind(IdField, 1, Conditions) of
-    {_K, Key} ->
+  %% If **ONLY** the key field is present in the conditions, we are looking
+  %% for a particular document. Otherwise, it is a general query.
+  IdFieldFound = lists:keymember(IdField, 1, Conditions),
+  case {IdFieldFound, length(Conditions)} of
+    {true, 1} ->
+      {_K, Key} = lists:keyfind(IdField, 1, Conditions),
       find_by_id_field(DocName, Key, State);
     _ ->
       find_by_query(DocName, Conditions, Limit, Offset, State)

test/sumo_basic_SUITE.erl

@@ -145,7 +145,11 @@ find_by_module(Module) ->
   {Today, _} = Module:created_at(LastPerson),
 
   %% Check find_by ID
-  [First1] = sumo:find_by(Module, [{id, Module:id(First)}]),
+  FirstId = Module:id(First),
+  [First1] = sumo:find_by(Module, [{id, FirstId}]),
+  [First1] = sumo:find_by(Module, [{last_name, <<"D">>},
+                                   {id, FirstId}]),
+  [] = sumo:find_by(Module, [{name, <<"NotB">>}, {id, FirstId}]),
   First1 = First,
   %% Check pagination
   Results1 = sumo:find_by(Module, [], 3, 1),