Skip to content
Open
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
14 changes: 13 additions & 1 deletion Source/EntityFramework.Extended/Future/FutureRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ namespace EntityFramework.Future
/// </summary>
public class FutureRunner : IFutureRunner
{
private const string _beginTransaction = "BEGIN TRANSACTION;";
private const string _rollbackTransaction = "ROLLBACK TRANSACTION;";

/// <summary>
/// Executes the future queries.
/// </summary>
Expand Down Expand Up @@ -71,6 +74,9 @@ private static DbCommand CreateFutureCommand(ObjectContext context, IEnumerable<
var futureSql = new StringBuilder();
int queryCount = 0;

if (command.Transaction == null)
futureSql.AppendLine(_beginTransaction);

foreach (IFutureQuery futureQuery in futureQueries)
{
var plan = futureQuery.GetPlan(context);
Expand Down Expand Up @@ -111,7 +117,13 @@ private static DbCommand CreateFutureCommand(ObjectContext context, IEnumerable<
futureSql.AppendLine(";");

queryCount++;
} // foreach query
} // foreach query

if (command.Transaction == null)
{
futureSql.AppendLine();
futureSql.AppendLine(_rollbackTransaction);
}

command.CommandText = futureSql.ToString();
if (context.CommandTimeout.HasValue)
Expand Down