Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/functions/fragment.ex
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ defmodule AshPostgres.Functions.Fragment do
def new([fragment | rest]) do
split = split_fragment(fragment)

if Enum.count(split, &(&1 == "")) != length(rest) do
if Enum.count(split, &(&1 == :slot)) != length(rest) do
{:error,
"fragment(...) expects extra arguments in the same amount of question marks in string. " <>
"It received #{Enum.count(split, &(&1 == ""))} extra argument(s) but expected #{
"It received #{Enum.count(split, &(&1 == :slot))} extra argument(s) but expected #{
length(rest)
}"}
else
Expand All @@ -33,7 +33,7 @@ defmodule AshPostgres.Functions.Fragment do

defp merge_fragment([], []), do: []

defp merge_fragment(["" | rest], [arg | rest_args]) do
defp merge_fragment([:slot | rest], [arg | rest_args]) do
[{:expr, arg} | merge_fragment(rest, rest_args)]
end

Expand All @@ -47,7 +47,7 @@ defmodule AshPostgres.Functions.Fragment do
do: [consumed]

defp split_fragment(<<??, rest::binary>>, consumed),
do: [consumed | split_fragment(rest, "")]
do: [consumed, :slot | split_fragment(rest, "")]

defp split_fragment(<<?\\, ??, rest::binary>>, consumed),
do: split_fragment(rest, consumed <> <<??>>)
Expand Down
23 changes: 23 additions & 0 deletions test/filter_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -386,4 +386,27 @@ defmodule AshPostgres.FilterTest do
assert [] = results
end
end

describe "fragments" do
test "double replacement works" do
post =
Post
|> Ash.Changeset.new(%{title: "match", score: 4})
|> Api.create!()

Post
|> Ash.Changeset.new(%{title: "non_match", score: 2})
|> Api.create!()

assert [%{title: "match"}] =
Post
|> Ash.Query.filter(fragment("? = ?", title, ^post.title))
|> Api.read!()

assert [] =
Post
|> Ash.Query.filter(fragment("? = ?", title, "nope"))
|> Api.read!()
end
end
end