Handle new Macro.to_string results on tests (#3758)

* Handle new Macro.to_string results on tests

Ecto frequently prints AST as code, and some tests were breaking because
they do assumptions about how `Macro.to_string/1` will represent exprs.

* Update test/ecto/query/inspect_test.exs

Co-authored-by: José Valim <[email protected]>

* Update test/ecto/changeset_test.exs

Co-authored-by: José Valim <[email protected]>

* Update test/ecto/query/builder/dynamic_test.exs

Co-authored-by: José Valim <[email protected]>

Co-authored-by: José Valim <[email protected]>

Author: v0idpwn

test/ecto/changeset_test.exs

@@ -1590,46 +1590,91 @@ defmodule Ecto.ChangesetTest do
       assert Macro.to_string(check_expr) == "&0.body() == ^0"
     end
 
-    test "generates correct where clause for single primary key without query option" do
-      body_change = cast(%SinglePkSchema{id: 0, body: "hi"}, %{body: "ho"}, [:body])
-      unsafe_validate_unique(body_change, :body, MockRepo)
-      assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
-      assert [%{expr: pk_expr}, %{expr: check_expr}] = wheres
+    # TODO: AST is represented as string differently on versions pre 1.13
+    if Version.match?(System.version(), ">= 1.13.0-dev") do
+      test "generates correct where clause for single primary key without query option" do
+        body_change = cast(%SinglePkSchema{id: 0, body: "hi"}, %{body: "ho"}, [:body])
+        unsafe_validate_unique(body_change, :body, MockRepo)
+        assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
+        assert [%{expr: pk_expr}, %{expr: check_expr}] = wheres
+
+        assert Macro.to_string(pk_expr) == "not (&0.id() == ^0)"
+        assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      end
 
-      assert Macro.to_string(pk_expr) == "not(&0.id() == ^0)"
-      assert Macro.to_string(check_expr) == "&0.body() == ^0"
-    end
+      test "generates correct where clause for composite primary keys without query option" do
+        body_change = changeset(%Post{id: 0, token: 1, body: "hi"}, %{body: "ho"})
+        unsafe_validate_unique(body_change, :body, MockRepo)
+        assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
+        assert [%{expr: pk_expr}, %{expr: check_expr}] = wheres
 
-    test "generates correct where clause for composite primary keys without query option" do
-      body_change = changeset(%Post{id: 0, token: 1, body: "hi"}, %{body: "ho"})
-      unsafe_validate_unique(body_change, :body, MockRepo)
-      assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
-      assert [%{expr: pk_expr}, %{expr: check_expr}] = wheres
+        assert Macro.to_string(pk_expr) == "not (&0.id() == ^0 and &0.token() == ^1)"
+        assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      end
 
-      assert Macro.to_string(pk_expr) == "not(&0.id() == ^0 and &0.token() == ^1)"
-      assert Macro.to_string(check_expr) == "&0.body() == ^0"
-    end
+      test "generates correct where clause for single primary key with query option" do
+        body_change = cast(%SinglePkSchema{id: 0, body: "hi"}, %{body: "ho"}, [:body])
+        unsafe_validate_unique(body_change, :body, MockRepo, query: Ecto.Query.from(p in SinglePkSchema, where: is_nil(p.published_at)))
+        assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
+        assert [%{expr: query_expr}, %{expr: pk_expr}, %{expr: check_expr}] = wheres
 
-    test "generates correct where clause for single primary key with query option" do
-      body_change = cast(%SinglePkSchema{id: 0, body: "hi"}, %{body: "ho"}, [:body])
-      unsafe_validate_unique(body_change, :body, MockRepo, query: Ecto.Query.from(p in SinglePkSchema, where: is_nil(p.published_at)))
-      assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
-      assert [%{expr: query_expr}, %{expr: pk_expr}, %{expr: check_expr}] = wheres
+        assert Macro.to_string(query_expr) == "is_nil(&0.published_at())"
+        assert Macro.to_string(pk_expr) == "not (&0.id() == ^0)"
+        assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      end
 
-      assert Macro.to_string(query_expr) == "is_nil(&0.published_at())"
-      assert Macro.to_string(pk_expr) == "not(&0.id() == ^0)"
-      assert Macro.to_string(check_expr) == "&0.body() == ^0"
-    end
+      test "generates correct where clause for composite primary keys with query option" do
+        body_change = changeset(%Post{id: 0, token: 1, body: "hi"}, %{body: "ho"})
+        unsafe_validate_unique(body_change, :body, MockRepo, query: Ecto.Query.from(p in Post, where: is_nil(p.published_at)))
+        assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
+        assert [%{expr: query_expr}, %{expr: pk_expr}, %{expr: check_expr}] = wheres
 
-    test "generates correct where clause for composite primary keys with query option" do
-      body_change = changeset(%Post{id: 0, token: 1, body: "hi"}, %{body: "ho"})
-      unsafe_validate_unique(body_change, :body, MockRepo, query: Ecto.Query.from(p in Post, where: is_nil(p.published_at)))
-      assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
-      assert [%{expr: query_expr}, %{expr: pk_expr}, %{expr: check_expr}] = wheres
+        assert Macro.to_string(query_expr) == "is_nil(&0.published_at())"
+        assert Macro.to_string(pk_expr) == "not (&0.id() == ^0 and &0.token() == ^1)"
+        assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      end
+    else
+      test "generates correct where clause for single primary key without query option" do
+        body_change = cast(%SinglePkSchema{id: 0, body: "hi"}, %{body: "ho"}, [:body])
+        unsafe_validate_unique(body_change, :body, MockRepo)
+        assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
+        assert [%{expr: pk_expr}, %{expr: check_expr}] = wheres
+
+        assert Macro.to_string(pk_expr) == "not(&0.id() == ^0)"
+        assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      end
 
-      assert Macro.to_string(query_expr) == "is_nil(&0.published_at())"
-      assert Macro.to_string(pk_expr) == "not(&0.id() == ^0 and &0.token() == ^1)"
-      assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      test "generates correct where clause for composite primary keys without query option" do
+        body_change = changeset(%Post{id: 0, token: 1, body: "hi"}, %{body: "ho"})
+        unsafe_validate_unique(body_change, :body, MockRepo)
+        assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
+        assert [%{expr: pk_expr}, %{expr: check_expr}] = wheres
+
+        assert Macro.to_string(pk_expr) == "not(&0.id() == ^0 and &0.token() == ^1)"
+        assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      end
+
+      test "generates correct where clause for single primary key with query option" do
+        body_change = cast(%SinglePkSchema{id: 0, body: "hi"}, %{body: "ho"}, [:body])
+        unsafe_validate_unique(body_change, :body, MockRepo, query: Ecto.Query.from(p in SinglePkSchema, where: is_nil(p.published_at)))
+        assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
+        assert [%{expr: query_expr}, %{expr: pk_expr}, %{expr: check_expr}] = wheres
+
+        assert Macro.to_string(query_expr) == "is_nil(&0.published_at())"
+        assert Macro.to_string(pk_expr) == "not(&0.id() == ^0)"
+        assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      end
+
+      test "generates correct where clause for composite primary keys with query option" do
+        body_change = changeset(%Post{id: 0, token: 1, body: "hi"}, %{body: "ho"})
+        unsafe_validate_unique(body_change, :body, MockRepo, query: Ecto.Query.from(p in Post, where: is_nil(p.published_at)))
+        assert_receive [MockRepo, function: :one, query: %Ecto.Query{wheres: wheres}, opts: []]
+        assert [%{expr: query_expr}, %{expr: pk_expr}, %{expr: check_expr}] = wheres
+
+        assert Macro.to_string(query_expr) == "is_nil(&0.published_at())"
+        assert Macro.to_string(pk_expr) == "not(&0.id() == ^0 and &0.token() == ^1)"
+        assert Macro.to_string(check_expr) == "&0.body() == ^0"
+      end
     end
 
     test "only queries the db when necessary" do

test/ecto/query/builder/dynamic_test.exs

@@ -27,13 +27,25 @@ defmodule Ecto.Query.Builder.DynamicTest do
       assert params == [{1, {0, :foo}}]
     end
 
-    test "with dynamic interpolation" do
-      dynamic = dynamic([p], p.bar == ^2)
-      dynamic = dynamic([p], p.foo == ^1 and ^dynamic or p.baz == ^3)
-      assert {expr, _, params, [], _, _} = fully_expand(query(), dynamic)
-      assert Macro.to_string(expr) ==
-             "&0.foo() == ^0 and &0.bar() == ^1 or &0.baz() == ^2"
-      assert params == [{1, {0, :foo}}, {2, {0, :bar}}, {3, {0, :baz}}]
+    # TODO: AST is represented as string differently on versions pre 1.13
+    if Version.match?(System.version(), ">= 1.13.0-dev") do
+      test "with dynamic interpolation" do
+        dynamic = dynamic([p], p.bar == ^2)
+        dynamic = dynamic([p], p.foo == ^1 and ^dynamic or p.baz == ^3)
+        assert {expr, _, params, [], _, _} = fully_expand(query(), dynamic)
+        assert Macro.to_string(expr) ==
+               "(&0.foo() == ^0 and &0.bar() == ^1) or &0.baz() == ^2"
+        assert params == [{1, {0, :foo}}, {2, {0, :bar}}, {3, {0, :baz}}]
+      end
+    else
+      test "with dynamic interpolation" do
+        dynamic = dynamic([p], p.bar == ^2)
+        dynamic = dynamic([p], p.foo == ^1 and ^dynamic or p.baz == ^3)
+        assert {expr, _, params, [], _, _} = fully_expand(query(), dynamic)
+        assert Macro.to_string(expr) ==
+               "&0.foo() == ^0 and &0.bar() == ^1 or &0.baz() == ^2"
+        assert params == [{1, {0, :foo}}, {2, {0, :bar}}, {3, {0, :baz}}]
+      end
     end
 
     test "with subquery and dynamic interpolation" do

test/ecto/query/inspect_test.exs

@@ -348,13 +348,25 @@ defmodule Ecto.Query.InspectTest do
     ) == string
   end
 
-  test "container values" do
-    assert i(from(Post, select: <<1, 2, 3>>)) ==
-           "from p0 in Inspect.Post, select: <<1, 2, 3>>"
-
-    foo = <<1, 2, 3>>
-    assert i(from(p in Post, select: {p, ^foo})) ==
-           "from p0 in Inspect.Post, select: {p0, ^<<1, 2, 3>>}"
+  # TODO: AST is represented as string differently on versions pre 1.13
+  if Version.match?(System.version(), ">= 1.13.0-dev") do
+    test "container values" do
+      assert i(from(Post, select: <<1, 2, 3>>)) ==
+             "from p0 in Inspect.Post, select: \"\\x01\\x02\\x03\""
+
+      foo = <<1, 2, 3>>
+      assert i(from(p in Post, select: {p, ^foo})) ==
+             "from p0 in Inspect.Post, select: {p0, ^\"\\x01\\x02\\x03\"}"
+    end
+  else
+    test "container values" do
+      assert i(from(Post, select: <<1, 2, 3>>)) ==
+             "from p0 in Inspect.Post, select: <<1, 2, 3>>"
+
+      foo = <<1, 2, 3>>
+      assert i(from(p in Post, select: {p, ^foo})) ==
+             "from p0 in Inspect.Post, select: {p0, ^<<1, 2, 3>>}"
+    end
   end
 
   test "select" do