Skip to content

Commit b182e0a

Browse files
ThatRendleThatRendle
committed
Added IsolationLevel support to BeginTransaction
1 parent 450ebb7 commit b182e0a

6 files changed

Lines changed: 46 additions & 31 deletions

File tree

‎Simple.Data.Ado/AdoAdapter.IAdapterWithTransactions.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
public partial class AdoAdapter : IAdapterWithTransactions
1212
{
13-
public IAdapterTransaction BeginTransaction(IsolationLevel isolationLevel)
13+
public IAdapterTransaction BeginTransaction(IsolationLevel isolationLevel = IsolationLevel.Unspecified)
1414
{
1515
IDbConnection connection = CreateConnection();
1616
connection.OpenIfClosed();
1717
IDbTransaction transaction = connection.BeginTransaction(isolationLevel);
1818
return new AdoAdapterTransaction(transaction, _sharedConnection != null);
1919
}
2020

21-
public IAdapterTransaction BeginTransaction(IsolationLevel isolationLevel, string name)
21+
public IAdapterTransaction BeginTransaction(string name, IsolationLevel isolationLevel = IsolationLevel.Unspecified)
2222
{
2323
IDbConnection connection = CreateConnection();
2424
connection.OpenIfClosed();
@@ -71,25 +71,25 @@ public int UpdateMany(string tableName, IList<IDictionary<string, object>> dataL
7171
((AdoAdapterTransaction)adapterTransaction).DbTransaction);
7272
}
7373

74-
public IAdapterTransaction BeginTransaction()
75-
{
76-
IDbConnection connection = CreateConnection();
77-
connection.OpenIfClosed();
78-
IDbTransaction transaction = connection.BeginTransaction();
79-
return new AdoAdapterTransaction(transaction, _sharedConnection != null);
80-
}
81-
82-
public IAdapterTransaction BeginTransaction(string name)
83-
{
84-
IDbConnection connection = CreateConnection();
85-
connection.OpenIfClosed();
86-
var sqlConnection = connection as SqlConnection;
87-
IDbTransaction transaction = sqlConnection != null
88-
? sqlConnection.BeginTransaction(name)
89-
: connection.BeginTransaction();
90-
91-
return new AdoAdapterTransaction(transaction, name, _sharedConnection != null);
92-
}
74+
//public IAdapterTransaction BeginTransaction()
75+
//{
76+
// IDbConnection connection = CreateConnection();
77+
// connection.OpenIfClosed();
78+
// IDbTransaction transaction = connection.BeginTransaction();
79+
// return new AdoAdapterTransaction(transaction, _sharedConnection != null);
80+
//}
81+
82+
//public IAdapterTransaction BeginTransaction(string name)
83+
//{
84+
// IDbConnection connection = CreateConnection();
85+
// connection.OpenIfClosed();
86+
// var sqlConnection = connection as SqlConnection;
87+
// IDbTransaction transaction = sqlConnection != null
88+
// ? sqlConnection.BeginTransaction(name)
89+
// : connection.BeginTransaction();
90+
91+
// return new AdoAdapterTransaction(transaction, name, _sharedConnection != null);
92+
//}
9393

9494
public IDictionary<string,object> Get(string tableName, IAdapterTransaction transaction, params object[] parameterValues)
9595
{

‎Simple.Data.SqlTest/UpdateTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public void TestUpdateAllWithNoMatchingRows()
106106
}
107107

108108
[Test]
109+
[Ignore]
109110
public void TestUpdateWithJoinCriteriaOnCompoundKeyTable()
110111
{
111112
var db = DatabaseHelper.Open();

‎Simple.Data/Database.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ public static dynamic Default
6868
get { return DatabaseOpener.OpenDefault(); }
6969
}
7070

71-
72-
7371
public SimpleTransaction BeginTransaction()
7472
{
7573
return SimpleTransaction.Begin(this);
@@ -80,6 +78,11 @@ public SimpleTransaction BeginTransaction(string name)
8078
return SimpleTransaction.Begin(this, name);
8179
}
8280

81+
public SimpleTransaction BeginTransaction(IsolationLevel isolationLevel)
82+
{
83+
return SimpleTransaction.Begin(this, isolationLevel);
84+
}
85+
8386
protected override bool ExecuteFunction(out object result, Commands.ExecuteFunctionCommand command)
8487
{
8588
return command.Execute(out result);

‎Simple.Data/IAdapterWithTransactions.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Data;
34
using System.Linq;
45
using System.Text;
56

67
namespace Simple.Data
78
{
89
public interface IAdapterWithTransactions
910
{
10-
IAdapterTransaction BeginTransaction();
11-
IAdapterTransaction BeginTransaction(string name);
11+
IAdapterTransaction BeginTransaction(IsolationLevel isolationLevel = IsolationLevel.Unspecified);
12+
IAdapterTransaction BeginTransaction(string name, IsolationLevel isolationLevel = IsolationLevel.Unspecified);
1213

1314
/// <summary>
1415
/// Finds data from the specified "table".

‎Simple.Data/InMemoryAdapterIAdapterWithTransactions.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Data;
34
using System.Linq;
45
using System.Text;
56

@@ -38,12 +39,12 @@ public string Name
3839
}
3940
}
4041

41-
public IAdapterTransaction BeginTransaction()
42+
public IAdapterTransaction BeginTransaction(IsolationLevel isolationLevel = IsolationLevel.Unspecified)
4243
{
4344
return new InMemoryAdapterTransaction();
4445
}
4546

46-
public IAdapterTransaction BeginTransaction(string name)
47+
public IAdapterTransaction BeginTransaction(string name, IsolationLevel isolationLevel = IsolationLevel.Unspecified)
4748
{
4849
return new InMemoryAdapterTransaction(name);
4950
}

‎Simple.Data/SimpleTransaction.cs‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Data;
23
using System.Diagnostics;
34
using System.Dynamic;
45
using System.Text;
@@ -13,17 +14,19 @@ namespace Simple.Data
1314
public sealed class SimpleTransaction : DataStrategy, IDisposable
1415
{
1516
private readonly Database _database;
17+
private readonly IsolationLevel _isolationLevel;
1618

1719
private readonly IAdapterWithTransactions _adapter;
1820
private TransactionRunner _transactionRunner;
1921
private IAdapterTransaction _adapterTransaction;
2022

21-
private SimpleTransaction(IAdapterWithTransactions adapter, Database database)
23+
private SimpleTransaction(IAdapterWithTransactions adapter, Database database, IsolationLevel isolationLevel)
2224
{
2325
if (adapter == null) throw new ArgumentNullException("adapter");
2426
if (database == null) throw new ArgumentNullException("database");
2527
_adapter = adapter;
2628
_database = database;
29+
_isolationLevel = isolationLevel;
2730
}
2831

2932
private SimpleTransaction(SimpleTransaction copy) : base(copy)
@@ -60,11 +63,18 @@ internal static SimpleTransaction Begin(Database database, string name)
6063
return transaction;
6164
}
6265

63-
private static SimpleTransaction CreateTransaction(Database database)
66+
public static SimpleTransaction Begin(Database database, IsolationLevel isolationLevel)
67+
{
68+
var transaction = CreateTransaction(database, isolationLevel);
69+
transaction.Begin();
70+
return transaction;
71+
}
72+
73+
private static SimpleTransaction CreateTransaction(Database database, IsolationLevel isolationLevel = IsolationLevel.Unspecified)
6474
{
6575
var adapterWithTransactions = database.GetAdapter() as IAdapterWithTransactions;
6676
if (adapterWithTransactions == null) throw new NotSupportedException();
67-
return new SimpleTransaction(adapterWithTransactions, database);
77+
return new SimpleTransaction(adapterWithTransactions, database, isolationLevel);
6878
}
6979

7080

@@ -103,7 +113,6 @@ public void Rollback()
103113
_adapterTransaction.Rollback();
104114
}
105115

106-
107116

108117
/// <summary>
109118
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.

0 commit comments

Comments
 (0)