Renamed :where to :ordered_by to be a bit more clear.

Author: thaterikperson

lib/graphql/relay/connection/ecto.ex

@@ -63,17 +63,17 @@ if Code.ensure_loaded?(Ecto) do
       a_after = cursor_to_offset(args[:after])
       first = args[:first]
       last = args[:last]
-      where_property = args[:where] || :id
+      ordered_by_property = args[:ordered_by] || :id
       limit = Enum.min([first, last, connection_count(repo, query)])
 
       query = if a_after do
-        query |> where([a], field(a, ^where_property) > ^a_after)
+        query |> where([a], field(a, ^ordered_by_property) > ^a_after)
       else
         query
       end
 
       query = if before do
-        query |> where([a], field(a, ^where_property) < ^before)
+        query |> where([a], field(a, ^ordered_by_property) < ^before)
       else
         query
       end
@@ -98,13 +98,13 @@ if Code.ensure_loaded?(Ecto) do
       end
 
       query = if first do
-        query |> order_by(asc: ^where_property) |> limit(^limit)
+        query |> order_by(asc: ^ordered_by_property) |> limit(^limit)
       else
         query
       end
 
       query = if last do
-        query |> order_by(desc: ^where_property) |> limit(^limit)
+        query |> order_by(desc: ^ordered_by_property) |> limit(^limit)
       else
         query
       end
@@ -113,7 +113,7 @@ if Code.ensure_loaded?(Ecto) do
 
       edges = Enum.map(records, fn(record) ->
         %{
-          cursor: cursor_for_object_in_connection(record, where_property),
+          cursor: cursor_for_object_in_connection(record, ordered_by_property),
           node: record
         }
       end)

test/graphql/relay/connection/ecto_test.exs

@@ -91,10 +91,10 @@ defmodule GraphQL.Relay.Connection.EctoTest do
   end
 
   defp edge_for_object(obj), do: edge_for_object(obj, :id)
-  defp edge_for_object(obj, where) do
+  defp edge_for_object(obj, ordered_by) do
     %{
       node: obj,
-      cursor: Base.encode64("ectoconnection:#{Map.get(obj, where)}")
+      cursor: Base.encode64("ectoconnection:#{Map.get(obj, ordered_by)}")
     }
   end
 
@@ -109,7 +109,7 @@ defmodule GraphQL.Relay.Connection.EctoTest do
     query = letters_query
     |> join(:inner, [l], n in assoc(l, :number))
     |> preload(:number)
-    assert(Connection.Ecto.resolve(query, %{repo: Repo}))
+    assert(Connection.Ecto.resolve(Repo, query))
   end
 
   test "basic slicing: returns all elements without filters" do
@@ -216,10 +216,10 @@ defmodule GraphQL.Relay.Connection.EctoTest do
         hasNextPage: true,
       }
     }
-    assert(Connection.Ecto.resolve(Repo, letters_query, %{first: 2, after: edge_for_object(b).cursor,}) == expected)
+    assert(Connection.Ecto.resolve(Repo, letters_query, %{first: 2, after: edge_for_object(b).cursor}) == expected)
   end
 
-  test "pagination: respects first and after with non-default where property" do
+  test "pagination: respects first and after with non-default ordered_by property" do
     expected = %{
       edges: [
         edge_for_object(c, :order),
@@ -232,7 +232,7 @@ defmodule GraphQL.Relay.Connection.EctoTest do
         hasNextPage: true,
       }
     }
-    assert(Connection.Ecto.resolve(Repo, letters_query, %{first: 2, after: edge_for_object(b, :order).cursor, where: :order}) == expected)
+    assert(Connection.Ecto.resolve(Repo, letters_query, %{first: 2, after: edge_for_object(b, :order).cursor, ordered_by: :order}) == expected)
   end
 
   test "respects first and after with long first" do