cr suggestions

lib/ayesql/runner.ex

@@ -21,31 +21,33 @@ defmodule AyeSQL.Runner do
 
   # Handles the result.
   @doc false
-  @spec handle_result(map()) :: [map() | struct()]
-  @spec handle_result(map(), keyword()) :: [map() | struct()]
+  @spec handle_result(map()) :: [map() | struct() | keyword()]
+  @spec handle_result(map(), keyword()) :: [map() | struct() | keyword()]
   def handle_result(result, options \\ [])
 
+  def handle_result(data, options) when is_list(options) do
+    handle_result(data, Map.new(options))
+  end
+
+  def handle_result(raw_data, %{into: :raw}) do
+    raw_data
+  end
+
   def handle_result(%{columns: nil}, _options) do
     []
   end
 
-  def handle_result(%{columns: columns, rows: rows} = raw_data, options) do
-    if options[:into] == :raw do
-      raw_data
-    else
-      atom_columns = Stream.map(columns, &String.to_atom/1)
-
-      rows
-      |> Stream.map(&Stream.zip(atom_columns, &1))
-      |> Enum.map(fn row ->
-        case options[:into] do
-          nil -> Enum.into(row, %{})
-          Map -> Enum.into(row, %{})
-          Keyword -> Enum.into(row, [])
-          enum when enum == [] or enum == %{} -> Enum.into(row, enum)
-          struct -> struct(struct, row)
-        end
-      end)
-    end
+  def handle_result(%{columns: columns, rows: rows}, options) do
+    atom_columns = Stream.map(columns, &String.to_atom/1)
+
+    rows
+    |> Stream.map(&Stream.zip(atom_columns, &1))
+    |> Enum.map(fn row ->
+      case options[:into] do
+        struct when is_struct(struct) -> struct(struct, row)
+        [] -> Enum.into(row, [])
+        _ -> Enum.into(row, %{})
+      end
+    end)
   end
 end

test/ayesql/runner_test.exs

@@ -28,7 +28,6 @@ defmodule AyeSQL.RunnerTest do
         %{username: "alice", email: "[email protected]"}
       ]
 
-      assert ^expected = Runner.handle_result(data, into: Map)
       assert ^expected = Runner.handle_result(data, into: %{})
     end
 
@@ -46,7 +45,6 @@ defmodule AyeSQL.RunnerTest do
         [username: "alice", email: "[email protected]"]
       ]
 
-      assert expected == Runner.handle_result(data, into: Keyword)
       assert expected == Runner.handle_result(data, into: [])
     end
 
@@ -64,7 +62,7 @@ defmodule AyeSQL.RunnerTest do
         %User{username: "alice", email: "[email protected]"}
       ]
 
-      assert expected == Runner.handle_result(data, into: User)
+      assert expected == Runner.handle_result(data, into: %User{})
     end
 
     test "when rows are not empty, returns a raw result with columns and rows" do