Allow users to always use transactions with SaveChanges

src/EFCore.Relational/Update/Internal/BatchExecutor.cs

@@ -66,12 +66,14 @@ public virtual int Execute(IEnumerable<ModificationCommandBatch> commandBatches,
  try
  {
  var transactionEnlistManager = connection as ITransactionEnlistmentManager;
+ var autoTransactionBehavior = CurrentContext.Context.Database.AutoTransactionBehavior;
  if (transaction == null
  && transactionEnlistManager?.EnlistedTransaction is null
  && transactionEnlistManager?.CurrentAmbientTransaction is null
- && CurrentContext.Context.Database.AutoTransactionsEnabled
  // Don't start a transaction if we have a single batch which doesn't require a transaction (single command), for perf.
- && (batch.AreMoreBatchesExpected || batch.RequiresTransaction))
+ && ((autoTransactionBehavior == AutoTransactionBehavior.WhenNeeded
+ && (batch.AreMoreBatchesExpected || batch.RequiresTransaction))
+ || autoTransactionBehavior == AutoTransactionBehavior.Always))
  {
  transaction = connection.BeginTransaction();
  beganTransaction = true;
@@ -174,12 +176,14 @@ public virtual async Task<int> ExecuteAsync(
  try
  {
  var transactionEnlistManager = connection as ITransactionEnlistmentManager;
+ var autoTransactionBehavior = CurrentContext.Context.Database.AutoTransactionBehavior;
  if (transaction == null
  && transactionEnlistManager?.EnlistedTransaction is null
  && transactionEnlistManager?.CurrentAmbientTransaction is null
- && CurrentContext.Context.Database.AutoTransactionsEnabled
  // Don't start a transaction if we have a single batch which doesn't require a transaction (single command), for perf.
- && (batch.AreMoreBatchesExpected || batch.RequiresTransaction))
+ && ((autoTransactionBehavior == AutoTransactionBehavior.WhenNeeded
+ && (batch.AreMoreBatchesExpected || batch.RequiresTransaction))
+ || autoTransactionBehavior == AutoTransactionBehavior.Always))
  {
  transaction = await connection.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
  beganTransaction = true;

src/EFCore/AutoTransactionBehavior.cs

@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.EntityFrameworkCore;
+
+/// <summary>
+/// Indicates whether or not a transaction will be created automatically by <see cref="DbContext.SaveChanges()" /> if a user transaction
+/// wasn't created via 'BeginTransaction' or provided via 'UseTransaction'.
+/// </summary>
+public enum AutoTransactionBehavior
+{
+ /// <summary>
+ /// Transactions are automatically created as needed. For example, most single SQL statements are implicitly executed within a
+ /// transaction, and so do not require an explicit one to be created, reducing database round trips. This is the default setting.
+ /// </summary>
+ WhenNeeded,
+
+ /// <summary>
+ /// Transactions are always created automatically, as long there's no user transaction. This setting may create transactions even
+ /// when they're not needed, adding additional database round trips which may degrade performance.
+ /// </summary>
+ Always,
+
+ /// <summary>
+ /// Transactions are never created automatically. Use this options with caution, since the database could be left in an inconsistent
+ /// state if a failure occurs.
+ /// </summary>
+ Never
+}

src/EFCore/ChangeTracking/Internal/StateManager.cs

@@ -1235,7 +1235,7 @@ protected virtual async Task<int> SaveChangesAsync(
  /// doing so can result in application failures when updating to a new Entity Framework Core release.
  /// </summary>
  public virtual int SaveChanges(bool acceptAllChangesOnSuccess)
- => !Context.Database.AutoTransactionsEnabled
+ => Context.Database.AutoTransactionBehavior == AutoTransactionBehavior.Never
  ? SaveChanges(this, acceptAllChangesOnSuccess)
  : Dependencies.ExecutionStrategy.Execute(
  (StateManager: this, AcceptAllChangesOnSuccess: acceptAllChangesOnSuccess),
@@ -1291,7 +1291,7 @@ private static int SaveChanges(StateManager stateManager, bool acceptAllChangesO
  public virtual Task<int> SaveChangesAsync(
  bool acceptAllChangesOnSuccess,
  CancellationToken cancellationToken = default)
- => !Context.Database.AutoTransactionsEnabled
+ => Context.Database.AutoTransactionBehavior == AutoTransactionBehavior.Never
  ? SaveChangesAsync(this, acceptAllChangesOnSuccess, cancellationToken)
  : Dependencies.ExecutionStrategy.ExecuteAsync(
  (StateManager: this, AcceptAllChangesOnSuccess: acceptAllChangesOnSuccess),

src/EFCore/DbContext.cs

@@ -869,7 +869,7 @@ private void SetLeaseInternal(DbContextLease lease)
  || _configurationSnapshot.HasDatabaseConfiguration)
  {
  var database = Database;
- database.AutoTransactionsEnabled = _configurationSnapshot.AutoTransactionsEnabled;
+ database.AutoTransactionBehavior = _configurationSnapshot.AutoTransactionBehavior;
  database.AutoSavepointsEnabled = _configurationSnapshot.AutoSavepointsEnabled;
  }
 
@@ -917,7 +917,7 @@ void IDbContextPoolable.SnapshotConfiguration()
  changeDetectorEvents != null,
  _changeTracker?.AutoDetectChangesEnabled ?? true,
  _changeTracker?.QueryTrackingBehavior ?? QueryTrackingBehavior.TrackAll,
- _database?.AutoTransactionsEnabled ?? true,
+ _database?.AutoTransactionBehavior ?? AutoTransactionBehavior.WhenNeeded,
  _database?.AutoSavepointsEnabled ?? true,
  _changeTracker?.LazyLoadingEnabled ?? true,
  _changeTracker?.CascadeDeleteTiming ?? CascadeTiming.Immediate,

src/EFCore/Infrastructure/DatabaseFacade.cs

@@ -376,28 +376,63 @@ public virtual IDbContextTransaction? CurrentTransaction
  => Dependencies.TransactionManager.CurrentTransaction;
 
  /// <summary>
- /// Gets or sets a value indicating whether or not a transaction will be created
- /// automatically by <see cref="DbContext.SaveChanges()" /> if none of the
- /// 'BeginTransaction' or 'UseTransaction' methods have been called.
+ /// Gets or sets a value indicating whether or not a transaction will be created automatically by
+ /// <see cref="DbContext.SaveChanges()" /> if none of the 'BeginTransaction' or 'UseTransaction' methods have been called.
  /// </summary>
  /// <remarks>
  /// <para>
- /// Setting this value to <see langword="false" /> will also disable the <see cref="IExecutionStrategy" />
- /// for <see cref="DbContext.SaveChanges()" />
+ /// Setting this value to <see langword="false" /> will also disable the <see cref="IExecutionStrategy" /> for
+ /// <see cref="DbContext.SaveChanges()" />
  /// </para>
  /// <para>
  /// The default value is <see langword="true" />, meaning that <see cref="DbContext.SaveChanges()" /> will always use a
  /// transaction when saving changes.
  /// </para>
  /// <para>
- /// Setting this value to <see langword="false" /> should only be done with caution since the database
- /// could be left in a corrupted state if <see cref="DbContext.SaveChanges()" /> fails.
+ /// Setting this value to <see langword="false" /> should only be done with caution, since the database could be left in an
+ /// inconsistent state if failure occurs.
  /// </para>
  /// <para>
  /// See <see href="https://aka.ms/efcore-docs-transactions">Transactions in EF Core</see> for more information and examples.
  /// </para>
  /// </remarks>
- public virtual bool AutoTransactionsEnabled { get; set; } = true;
+ [Obsolete("Use EnableAutoTransactions instead")]
+ public virtual bool AutoTransactionsEnabled
+ {
+ get => AutoTransactionBehavior is AutoTransactionBehavior.Always or AutoTransactionBehavior.WhenNeeded;
+ set
+ {
+ if (value)
+ {
+ if (AutoTransactionBehavior == AutoTransactionBehavior.Never)
+ {
+ AutoTransactionBehavior = AutoTransactionBehavior.WhenNeeded;
+ }
+ }
+ else
+ {
+ AutoTransactionBehavior = AutoTransactionBehavior.Never;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether or not a transaction will be created automatically by
+ /// <see cref="DbContext.SaveChanges()" /> if neither 'BeginTransaction' nor 'UseTransaction' has been called.
+ /// </summary>
+ /// <remarks>
+ /// <para>
+ /// The default setting is <see cref="AutoTransactionBehavior.WhenNeeded" />.
+ /// </para>
+ /// <para>
+ /// Setting this to <see cref="AutoTransactionBehavior.Never" /> with caution, since the database could be left in
+ /// an inconsistent state if failure occurs.
+ /// </para>
+ /// <para>
+ /// See <see href="https://aka.ms/efcore-docs-transactions">Transactions in EF Core</see> for more information and examples.
+ /// </para>
+ /// </remarks>
+ public virtual AutoTransactionBehavior AutoTransactionBehavior { get; set; } = AutoTransactionBehavior.WhenNeeded;
 
  /// <summary>
  /// Whether a transaction savepoint will be created automatically by <see cref="DbContext.SaveChanges()" /> if it is called
@@ -483,7 +518,7 @@ DbContext IDatabaseFacadeDependenciesAccessor.Context
  /// <inheritdoc />
  void IResettableService.ResetState()
  {
- AutoTransactionsEnabled = true;
+ AutoTransactionBehavior = AutoTransactionBehavior.WhenNeeded;
  AutoSavepointsEnabled = true;
  }
 

src/EFCore/Internal/DbContextPoolConfigurationSnapshot.cs

@@ -24,7 +24,7 @@ public DbContextPoolConfigurationSnapshot(
  bool hasChangeDetectorConfiguration,
  bool autoDetectChangesEnabled,
  QueryTrackingBehavior queryTrackingBehavior,
- bool autoTransactionsEnabled,
+ AutoTransactionBehavior autoTransactionBehavior,
  bool autoSavepointsEnabled,
  bool lazyLoadingEnabled,
  CascadeTiming cascadeDeleteTiming,
@@ -47,8 +47,8 @@ public DbContextPoolConfigurationSnapshot(
  HasChangeDetectorConfiguration = hasChangeDetectorConfiguration;
  AutoDetectChangesEnabled = autoDetectChangesEnabled;
  QueryTrackingBehavior = queryTrackingBehavior;
- AutoTransactionsEnabled = autoTransactionsEnabled;
  AutoSavepointsEnabled = autoSavepointsEnabled;
+ AutoTransactionBehavior = autoTransactionBehavior;
  LazyLoadingEnabled = lazyLoadingEnabled;
  CascadeDeleteTiming = cascadeDeleteTiming;
  DeleteOrphansTiming = deleteOrphansTiming;
@@ -143,7 +143,7 @@ public DbContextPoolConfigurationSnapshot(
  /// any release. You should only use it directly in your code with extreme caution and knowing that
  /// doing so can result in application failures when updating to a new Entity Framework Core release.
  /// </summary>
- public bool AutoTransactionsEnabled { get; }
+ public AutoTransactionBehavior AutoTransactionBehavior { get; }
 
  /// <summary>
  /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to