Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Yet more coding style changes. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
527eeeec4c8a5aec1e7dde7ee3b0c9b7 |
| User & Date: | mistachkin 2016-11-04 00:17:51 |
Context
|
2016-11-04
| ||
| 00:20 | Make the SQLiteTransaction.IssueRollback method private. check-in: d3ee02a73a user: mistachkin tags: trunk | |
| 00:17 | Yet more coding style changes. check-in: 527eeeec4c user: mistachkin tags: trunk | |
| 00:15 | More coding style changes. check-in: 1d3fab1dd9 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLiteTransaction.cs.
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 ... 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 ... 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 ... 214 215 216 217 218 219 220 221 222 223 224 225 226 227 |
if (_cnn._transactionLevel++ == 0)
{
try
{
using (SQLiteCommand cmd = _cnn.CreateCommand())
{
if (!deferredLock)
cmd.CommandText = "BEGIN IMMEDIATE";
else
cmd.CommandText = "BEGIN";
cmd.ExecuteNonQuery();
}
}
catch (SQLiteException)
{
_cnn._transactionLevel--;
_cnn = null;
throw;
}
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
................................................................................
SQLiteConnection.Check(_cnn);
IsValid(true);
if (_cnn._transactionLevel - 1 == 0)
{
using (SQLiteCommand cmd = _cnn.CreateCommand())
{
cmd.CommandText = "COMMIT";
cmd.ExecuteNonQuery();
}
}
_cnn._transactionLevel--;
_cnn = null;
}
................................................................................
SQLiteConnection.Check(_cnn);
IsValid(true);
IssueRollback(true);
}
///////////////////////////////////////////////////////////////////////////////////////////////
internal void IssueRollback(bool throwError)
{
SQLiteConnection cnn = Interlocked.Exchange(ref _cnn, null);
if (cnn != null)
{
try
{
using (SQLiteCommand cmd = cnn.CreateCommand())
{
cmd.CommandText = "ROLLBACK";
cmd.ExecuteNonQuery();
}
}
catch
{
if (throwError)
throw;
................................................................................
}
cnn._transactionLevel = 0;
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
internal bool IsValid(bool throwError)
{
if (_cnn == null)
{
if (throwError == true) throw new ArgumentNullException("No connection associated with this transaction");
else return false;
}
|
| | > | > > > > > > > | > > > > > > > > > |
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 ... 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 ... 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 ... 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 |
if (_cnn._transactionLevel++ == 0)
{
try
{
using (SQLiteCommand cmd = _cnn.CreateCommand())
{
if (!deferredLock)
cmd.CommandText = "BEGIN IMMEDIATE;";
else
cmd.CommandText = "BEGIN;";
cmd.ExecuteNonQuery();
}
}
catch (SQLiteException)
{
_cnn._transactionLevel--;
_cnn = null;
throw;
}
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
................................................................................
SQLiteConnection.Check(_cnn);
IsValid(true);
if (_cnn._transactionLevel - 1 == 0)
{
using (SQLiteCommand cmd = _cnn.CreateCommand())
{
cmd.CommandText = "COMMIT;";
cmd.ExecuteNonQuery();
}
}
_cnn._transactionLevel--;
_cnn = null;
}
................................................................................
SQLiteConnection.Check(_cnn);
IsValid(true);
IssueRollback(true);
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Issue a ROLLBACK command against the database connection,
/// optionally re-throwing any caught exception.
/// </summary>
/// <param name="throwError">
/// Non-zero to re-throw caught exceptions.
/// </param>
internal void IssueRollback(bool throwError)
{
SQLiteConnection cnn = Interlocked.Exchange(ref _cnn, null);
if (cnn != null)
{
try
{
using (SQLiteCommand cmd = cnn.CreateCommand())
{
cmd.CommandText = "ROLLBACK;";
cmd.ExecuteNonQuery();
}
}
catch
{
if (throwError)
throw;
................................................................................
}
cnn._transactionLevel = 0;
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Checks the state of this transaction, optionally throwing an exception if a state inconsistency is found.
/// </summary>
/// <param name="throwError">
/// Non-zero to throw an exception if a state inconsistency is found.
/// </param>
/// <returns>
/// Non-zero if this transaction is valid; otherwise, false.
/// </returns>
internal bool IsValid(bool throwError)
{
if (_cnn == null)
{
if (throwError == true) throw new ArgumentNullException("No connection associated with this transaction");
else return false;
}
|