Fix finding primary key when a query is passed

Author: joshrieken

lib/plasm.ex

@@ -453,7 +453,7 @@ defmodule Plasm do
     key
   end
 
-  defp model(%Ecto.Query{from: {_table_name, model_or_query}}) do
+  defp model(%Ecto.Query{from: %Ecto.Query.FromExpr{source: {_, model_or_query}}}) do
     model(model_or_query)
   end
   defp model(model), do: model

test/plasm/find_test.exs

@@ -33,4 +33,17 @@ defmodule Plasm.FindTest do
     # Assert
     assert user == user1
   end
+
+  test ".find with an integer and a prior query" do
+    # Arrange
+    user1 = insert(:user, age: 18)
+    insert(:user, age: 18)
+    insert(:user, age: 81)
+
+    # Act
+    user = User |> User.for_age(18) |> Plasm.find(user1.id) |> Repo.one
+
+    # Assert
+    assert user == user1
+  end
 end

test/support/models.ex

@@ -1,5 +1,6 @@
 defmodule Plasm.User do
   use Ecto.Schema
+  import Ecto.Query
 
   schema "users" do
     field :name, :string
@@ -8,4 +9,9 @@ defmodule Plasm.User do
 
     timestamps(type: :utc_datetime)
   end
+
+  def for_age(query, age) do
+    from u in query,
+      where: u.age == ^age
+  end
 end