projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop this one too
[mono.git]
/
mcs
/
class
/
Mono.Data.SqliteClient
/
Mono.Data.SqliteClient
/
SqliteTransaction.cs
diff --git
a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteTransaction.cs
b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteTransaction.cs
index 443c98f12734232b239baa0f7e13539a0223be21..556be0dc55313eab8b01dbeb646464ba6ce76dbb 100644
(file)
--- a/
mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteTransaction.cs
+++ b/
mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteTransaction.cs
@@
-27,10
+27,18
@@
using System;
using System.Data;
using System;
using System.Data;
+#if NET_2_0
+using System.Data.Common;
+#endif
namespace Mono.Data.SqliteClient
{
namespace Mono.Data.SqliteClient
{
- public sealed class SqliteTransaction : IDbTransaction
+ public sealed class SqliteTransaction :
+#if NET_2_0
+ DbTransaction
+#else
+ IDbTransaction
+#endif
{
#region Fields
{
#region Fields
@@
-48,30
+56,58
@@
namespace Mono.Data.SqliteClient
_open = true;
}
_open = true;
}
- void System.IDisposable.Dispose()
+#if !NET_2_0
+ void System.IDisposable.Dispose()
{
}
{
}
-
+#endif
+
#endregion
#region Public Properties
#endregion
#region Public Properties
+#if NET_2_0
+ protected override DbConnection DbConnection
+#else
public IDbConnection Connection
public IDbConnection Connection
+#endif
{
get { return _connection; }
{
get { return _connection; }
+#if !NET_2_0
set { _connection = (SqliteConnection)value; }
set { _connection = (SqliteConnection)value; }
+#endif
}
}
- public IsolationLevel IsolationLevel
+#if NET_2_0
+ override
+#endif
+ public IsolationLevel IsolationLevel
{
get { return _isolationLevel; }
{
get { return _isolationLevel; }
+#if !NET_2_0
set { _isolationLevel = value; }
set { _isolationLevel = value; }
+#endif
+ }
+
+#if NET_2_0
+ internal void SetConnection (DbConnection conn)
+ {
+ _connection = (SqliteConnection)conn;
}
}
+ internal void SetIsolationLevel (IsolationLevel level)
+ {
+ _isolationLevel = level;
+ }
+#endif
+
#endregion
#region Public Methods
#endregion
#region Public Methods
-
+
+#if NET_2_0
+ override
+#endif
public void Commit()
{
if (_connection == null || _connection.State != ConnectionState.Open)
public void Commit()
{
if (_connection == null || _connection.State != ConnectionState.Open)
@@
-80,7
+116,7
@@
namespace Mono.Data.SqliteClient
throw new InvalidOperationException("Transaction has already been committed or is not pending");
try
{
throw new InvalidOperationException("Transaction has already been committed or is not pending");
try
{
- SqliteCommand cmd = _connection.CreateCommand();
+ SqliteCommand cmd =
(SqliteCommand)
_connection.CreateCommand();
cmd.CommandText = "COMMIT";
cmd.ExecuteNonQuery();
_open = false;
cmd.CommandText = "COMMIT";
cmd.ExecuteNonQuery();
_open = false;
@@
-91,6
+127,9
@@
namespace Mono.Data.SqliteClient
}
}
}
}
+#if NET_2_0
+ override
+#endif
public void Rollback()
{
if (_connection == null || _connection.State != ConnectionState.Open)
public void Rollback()
{
if (_connection == null || _connection.State != ConnectionState.Open)
@@
-99,7
+138,7
@@
namespace Mono.Data.SqliteClient
throw new InvalidOperationException("Transaction has already been rolled back or is not pending");
try
{
throw new InvalidOperationException("Transaction has already been rolled back or is not pending");
try
{
- SqliteCommand cmd = _connection.CreateCommand();
+ SqliteCommand cmd =
(SqliteCommand)
_connection.CreateCommand();
cmd.CommandText = "ROLLBACK";
cmd.ExecuteNonQuery();
_open = false;
cmd.CommandText = "ROLLBACK";
cmd.ExecuteNonQuery();
_open = false;