Support maps in provided values

cqerl · Jan 24, 2016 · b205ee6 · b205ee6
1 parent ef658a2
commit b205ee6
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/cqerl_datatypes.erl b/src/cqerl_datatypes.erl
@@ -419,7 +419,7 @@ encode_data({{ColType, Type}, List}, _Query) when ColType == list; ColType == se
     Entries = << << (GetValueBinary(Value))/binary >> || Value <- List2 >>,
     << Length:?INT, Entries/binary >>;
 
-encode_data({{map, KeyType, ValType}, List}, _Query) ->
+encode_data({{map, KeyType, ValType}, List}, _Query) when is_list(List) ->
     Length = length(List),
     GetElementBinary = fun(Type, Value) ->
         Bin = encode_data({Type, Value}, _Query),
@@ -430,6 +430,17 @@ encode_data({{map, KeyType, ValType}, List}, _Query) ->
                     (GetElementBinary(ValType, Value))/binary >> || {Key, Value} <- List >>,
     << Length:?INT, Entries/binary >>;
 
+encode_data({{map, KeyType, ValType}, List}, _Query) ->
+    Length = map_size(List),
+    GetElementBinary = fun(Type, Value) ->
+        Bin = encode_data({Type, Value}, _Query),
+        {ok, Bytes} = encode_bytes(Bin),
+        Bytes
+    end,
+    Entries = << << (GetElementBinary(KeyType, Key))/binary,
+                    (GetElementBinary(ValType, Value))/binary >> || {Key, Value} <- maps:to_list(List) >>,
+    << Length:?INT, Entries/binary >>;
+
 encode_data({{tuple, Types}, Tuple}, _Query) when is_tuple(Tuple) ->
     encode_data({{tuple, Types}, tuple_to_list(Tuple)}, _Query);
 encode_data({{tuple, Types}, List}, _Query) when is_list(List) ->