Switched :label to Repo option insteand of a query expression

Author: alesasnouski

integration_test/sql/logging.exs

@@ -179,6 +179,20 @@ defmodule Ecto.Integration.LoggingTest do
   end
 
   describe ":label option" do
+    test "prepends a leading comment to query operations" do
+      assert capture_log(fn ->
+               TestRepo.all(Post, label: "list_posts_q", log: :error)
+             end) =~ "/* list_posts_q */ SELECT"
+
+      assert capture_log(fn ->
+               TestRepo.update_all(Post, [set: [visits: 0]], label: "reset_visits_q", log: :error)
+             end) =~ "/* reset_visits_q */ UPDATE"
+
+      assert capture_log(fn ->
+               TestRepo.delete_all(Post, label: "purge_posts_q", log: :error)
+             end) =~ "/* purge_posts_q */ DELETE"
+    end
+
     test "prepends a leading comment to insert/update/delete/insert_all" do
       assert capture_log(fn ->
                TestRepo.insert!(%Post{title: "1"}, label: "insert_create_post_q", log: :error)

mix.lock

@@ -3,7 +3,7 @@
   "benchee_html": {:hex, :benchee_html, "1.0.1", "1e247c0886c3fdb0d3f4b184b653a8d6fb96e4ad0d0389267fe4f36968772e24", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:benchee_json, "~> 1.0", [hex: :benchee_json, repo: "hexpm", optional: false]}], "hexpm", "b00a181af7152431901e08f3fc9f7197ed43ff50421a8347b0c80bf45d5b3fef"},
   "benchee_json": {:hex, :benchee_json, "1.0.0", "cc661f4454d5995c08fe10dd1f2f72f229c8f0fb1c96f6b327a8c8fc96a91fe5", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "da05d813f9123505f870344d68fb7c86a4f0f9074df7d7b7e2bb011a63ec231c"},
   "db_connection": {:hex, :db_connection, "2.10.1", "d5465f6bcc125c1b8981c1dbf23c193ca16f446ec0b25832dc174f74f18be510", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "18ed94c6e627b4bf452dbd4df61b69a35a1e768525140bc1917b7a685026a6a3"},
-  "decimal": {:hex, :decimal, "3.1.0", "9ede268cff827e6f0c4fb1b34747c82630dce5d7b877dfb22ec8f0cb25855fce", [:mix], [], "hexpm", "e8b3efb3bb3a13cb5e4268ffe128569067b1972e9dee013537c71a5b073168f9"},
+  "decimal": {:hex, :decimal, "3.1.1", "430d87b04011ce6cbd4fd205be758311a81f87d552d40904abd00f015935b1d0", [:mix], [], "hexpm", "c5f25f2ced74a0587d03e6023f595db8e924c9d3922c8c8ffd9edfc4498cf1f6"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"},
   "ecto": {:hex, :ecto, "3.14.0", "2fa64521eebfcb2670d907a86e4ad947290e9933706bb315e6fb5c21b172cb26", [:mix], [{:decimal, "~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "130d69ffb4285f9ce4792b65dfbb994fd13ea4cbc3cbea2524b199aa3de84af3"},

test/ecto/adapters/myxql_test.exs

@@ -591,14 +591,14 @@ defmodule Ecto.Adapters.MyXQLTest do
   end
 
   test "label" do
-    query = Schema |> label("myquery") |> select([], true) |> plan()
-    assert all(query) == ~s{/* myquery */ SELECT TRUE FROM `schema` AS s0}
+    query = Schema |> select([], true) |> plan()
+    assert all(%{query | label: "myquery"}) == ~s{/* myquery */ SELECT TRUE FROM `schema` AS s0}
 
-    query = Schema |> label("upd_q") |> update([], set: [x: 0]) |> plan(:update_all)
-    assert update_all(query) == ~s{/* upd_q */ UPDATE `schema` AS s0 SET s0.`x` = 0}
+    query = Schema |> update([], set: [x: 0]) |> plan(:update_all)
+    assert update_all(%{query | label: "upd_q"}) == ~s{/* upd_q */ UPDATE `schema` AS s0 SET s0.`x` = 0}
 
-    query = Schema |> label("del_q") |> plan(:delete_all)
-    assert delete_all(query) == ~s{/* del_q */ DELETE s0.* FROM `schema` AS s0}
+    query = Schema |> plan(:delete_all)
+    assert delete_all(%{query | label: "del_q"}) == ~s{/* del_q */ DELETE s0.* FROM `schema` AS s0}
   end
 
   test "string escape" do

test/ecto/adapters/postgres_test.exs

@@ -784,14 +784,14 @@ defmodule Ecto.Adapters.PostgresTest do
   end
 
   test "label" do
-    query = Schema |> label("myquery") |> select([], true) |> plan()
-    assert all(query) == ~s{/* myquery */ SELECT TRUE FROM "schema" AS s0}
+    query = Schema |> select([], true) |> plan()
+    assert all(%{query | label: "myquery"}) == ~s{/* myquery */ SELECT TRUE FROM "schema" AS s0}
 
-    query = Schema |> label("upd_q") |> update([], set: [x: 0]) |> plan(:update_all)
-    assert update_all(query) == ~s{/* upd_q */ UPDATE "schema" AS s0 SET "x" = 0}
+    query = Schema |> update([], set: [x: 0]) |> plan(:update_all)
+    assert update_all(%{query | label: "upd_q"}) == ~s{/* upd_q */ UPDATE "schema" AS s0 SET "x" = 0}
 
-    query = Schema |> label("del_q") |> plan(:delete_all)
-    assert delete_all(query) == ~s{/* del_q */ DELETE FROM "schema" AS s0}
+    query = Schema |> plan(:delete_all)
+    assert delete_all(%{query | label: "del_q"}) == ~s{/* del_q */ DELETE FROM "schema" AS s0}
   end
 
   test "string escape" do

test/ecto/adapters/tds_test.exs

@@ -642,14 +642,14 @@ defmodule Ecto.Adapters.TdsTest do
   end
 
   test "label" do
-    query = Schema |> label("myquery") |> select([], true) |> plan()
-    assert all(query) == ~s{/* myquery */ SELECT CAST(1 as bit) FROM [schema] AS s0}
+    query = Schema |> select([], true) |> plan()
+    assert all(%{query | label: "myquery"}) == ~s{/* myquery */ SELECT CAST(1 as bit) FROM [schema] AS s0}
 
-    query = Schema |> label("upd_q") |> update([], set: [x: 0]) |> plan(:update_all)
-    assert update_all(query) == ~s{/* upd_q */ UPDATE s0 SET s0.[x] = 0 FROM [schema] AS s0}
+    query = Schema |> update([], set: [x: 0]) |> plan(:update_all)
+    assert update_all(%{query | label: "upd_q"}) == ~s{/* upd_q */ UPDATE s0 SET s0.[x] = 0 FROM [schema] AS s0}
 
-    query = Schema |> label("del_q") |> plan(:delete_all)
-    assert delete_all(query) == ~s{/* del_q */ DELETE s0 FROM [schema] AS s0}
+    query = Schema |> plan(:delete_all)
+    assert delete_all(%{query | label: "del_q"}) == ~s{/* del_q */ DELETE s0 FROM [schema] AS s0}
   end
 
   test "string escape" do