wrap_in_transaction

Author: greg-rychlewski

integration_test/myxql/explain_test.exs

@@ -10,7 +10,7 @@ defmodule Ecto.Integration.ExplainTest do
       explain = TestRepo.explain(:all, from(p in Post, where: p.title == "title"), timeout: 20000)
 
       assert explain =~
-        "| id | select_type | table | partitions | type | possible_keys | key  | key_len | ref  | rows | filtered | Extra       |"
+               "| id | select_type | table | partitions | type | possible_keys | key  | key_len | ref  | rows | filtered | Extra       |"
 
       assert explain =~ "p0"
       assert explain =~ "SIMPLE"
@@ -24,7 +24,9 @@ defmodule Ecto.Integration.ExplainTest do
     end
 
     test "update" do
-      explain = TestRepo.explain(:update_all, from(p in Post, update: [set: [title: "new title"]]))
+      explain =
+        TestRepo.explain(:update_all, from(p in Post, update: [set: [title: "new title"]]))
+
       assert explain =~ "UPDATE"
       assert explain =~ "p0"
     end
@@ -37,7 +39,7 @@ defmodule Ecto.Integration.ExplainTest do
 
     test "map format" do
       [explain] = TestRepo.explain(:all, Post, format: :map)
-      keys = explain["query_block"] |> Map.keys
+      keys = explain["query_block"] |> Map.keys()
       assert Enum.member?(keys, "cost_info")
       assert Enum.member?(keys, "select_id")
       assert Enum.member?(keys, "table")
@@ -46,7 +48,7 @@ defmodule Ecto.Integration.ExplainTest do
     test "explain without rolling back" do
       {:ok, {:ok, explain}} =
         TestRepo.transaction(fn ->
-          TestRepo.explain(:delete_all, Post, rollback: false, timeout: 20000)
+          TestRepo.explain(:delete_all, Post, wrap_in_transaction: false, timeout: 20000)
         end)
 
       assert explain =~ "DELETE"

integration_test/pg/explain_test.exs

@@ -88,7 +88,11 @@ defmodule Ecto.Integration.ExplainTest do
 
     {:ok, {:ok, explain}} =
       TestRepo.transaction(fn ->
-        TestRepo.explain(:delete_all, Post, analyze: true, rollback: false, timeout: 20000)
+        TestRepo.explain(:delete_all, Post,
+          analyze: true,
+          wrap_in_transaction: false,
+          timeout: 20000
+        )
       end)
 
     assert explain =~ "Delete on posts p0"

integration_test/tds/explain_test.exs

@@ -7,7 +7,9 @@ defmodule Ecto.Integration.ExplainTest do
 
   describe "explain" do
     test "select" do
-      explain = TestRepo.explain(:all, from(p in Post, where: p.title == "explain_test", limit: 1))
+      explain =
+        TestRepo.explain(:all, from(p in Post, where: p.title == "explain_test", limit: 1))
+
       assert explain =~ "| Rows | Executes |"
       assert explain =~ "| Parallel | EstimateExecutions |"
       assert explain =~ "SELECT TOP(1)"
@@ -21,7 +23,9 @@ defmodule Ecto.Integration.ExplainTest do
     end
 
     test "update" do
-      explain = TestRepo.explain(:update_all, from(p in Post, update: [set: [title: "new title"]]))
+      explain =
+        TestRepo.explain(:update_all, from(p in Post, update: [set: [title: "new title"]]))
+
       assert explain =~ "UPDATE"
       assert explain =~ "p0"
       assert explain =~ "new title"
@@ -36,7 +40,7 @@ defmodule Ecto.Integration.ExplainTest do
     test "explain without rolling back" do
       {:ok, {:ok, explain}} =
         TestRepo.transaction(fn ->
-          TestRepo.explain(:delete_all, Post, rollback: false, timeout: 20000)
+          TestRepo.explain(:delete_all, Post, wrap_in_transaction: false, timeout: 20000)
         end)
 
       assert explain =~ "DELETE"

lib/ecto/adapters/sql.ex

@@ -434,8 +434,8 @@ defmodule Ecto.Adapters.SQL do
 
   Adapter          | Supported opts
   ---------------- | --------------
-  Postgrex         | `analyze`, `verbose`, `costs`, `settings`, `buffers`, `timing`, `summary`, `format`, `plan`, `rollback`
-  MyXQL            | `format`, `rollback`
+  Postgrex         | `analyze`, `verbose`, `costs`, `settings`, `buffers`, `timing`, `summary`, `format`, `plan`, `wrap_in_transaction`
+  MyXQL            | `format`, `wrap_in_transaction`
 
   All options except `format` are boolean valued and default to `false`.
 
@@ -447,9 +447,9 @@ defmodule Ecto.Adapters.SQL do
     * Postgrex: `:map`, `:yaml` and `:text`
     * MyXQL: `:map` and `:text`
 
-  The `rollback` option is a boolean that controls whether the command is run inside of a transaction
-  that is rolled back. This is useful when, for example, you'd like to use `analyze: true` on an update
-  or delete query without modifying data. Defaults to `true`.
+  The `wrap_in_transaction` option is a boolean that controls whether the command is run inside of a
+  transaction that is rolled back. This is useful when, for example, you'd like to use `analyze: true`
+  on an update or delete query without modifying data. Defaults to `true`.
 
   The `:plan` option in Postgrex can take the values `:custom` or `:fallback_generic`. When `:custom`
   is specified, the explain plan generated will consider the specific values of the query parameters
@@ -512,8 +512,8 @@ defmodule Ecto.Adapters.SQL do
   def explain(repo, operation, queryable, opts \\ [])
 
   def explain(repo, operation, queryable, opts) when is_atom(repo) or is_pid(repo) do
-    rollback? = Keyword.get(opts, :rollback, true)
-    explain(Ecto.Adapter.lookup_meta(repo), operation, queryable, rollback?, opts)
+    wrap_in_transaction? = Keyword.get(opts, :wrap_in_transaction, true)
+    explain(Ecto.Adapter.lookup_meta(repo), operation, queryable, wrap_in_transaction?, opts)
   end
 
   def explain(%{repo: repo} = adapter_meta, operation, queryable, true, opts) do