Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add the SQLiteConnectionLock base class and use it from the classes that need to hold onto a native database connection handle. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | sessions |
| Files: | files | file ages | folders |
| SHA1: |
91d210a6caf1c5139eb1770779eef2a6 |
| User & Date: | mistachkin 2017-10-06 21:44:00.434 |
Context
|
2017-10-06
| ||
| 23:07 | Add GetObject method to the SQLiteValue class for use in testing and debugging. check-in: 756bbf5fcb user: mistachkin tags: sessions | |
| 21:44 | Add the SQLiteConnectionLock base class and use it from the classes that need to hold onto a native database connection handle. check-in: 91d210a6ca user: mistachkin tags: sessions | |
| 20:56 | Make GetNativeHandle private. check-in: 4e6e08e9c5 user: mistachkin tags: sessions | |
Changes
Changes to System.Data.SQLite/SQLiteConnection.cs.
| ︙ | ︙ | |||
1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 |
if (sqlite3 == null)
throw new InvalidOperationException("Connection has no wrapper");
SQLiteConnectionHandle handle = sqlite3._sql;
if (handle == null)
throw new InvalidOperationException("Connection has an invalid handle.");
return handle;
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
| > > > > > > > > | 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 |
if (sqlite3 == null)
throw new InvalidOperationException("Connection has no wrapper");
SQLiteConnectionHandle handle = sqlite3._sql;
if (handle == null)
throw new InvalidOperationException("Connection has an invalid handle.");
IntPtr handlePtr = handle;
if (handlePtr == IntPtr.Zero)
{
throw new InvalidOperationException(
"Connection has an invalid handle pointer.");
}
return handle;
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
|
| ︙ | ︙ |
Changes to System.Data.SQLite/SQLiteModule.cs.
| ︙ | ︙ | |||
3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 |
/// <returns>
/// The native NUL-terminated UTF-8 string pointer or
/// <see cref="IntPtr.Zero" /> upon failure.
/// </returns>
public static IntPtr Utf8IntPtrFromString(
string value
)
{
if (value == null)
return IntPtr.Zero;
IntPtr result = IntPtr.Zero;
byte[] bytes = GetUtf8BytesFromString(value);
if (bytes == null)
return IntPtr.Zero;
| > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 |
/// <returns>
/// The native NUL-terminated UTF-8 string pointer or
/// <see cref="IntPtr.Zero" /> upon failure.
/// </returns>
public static IntPtr Utf8IntPtrFromString(
string value
)
{
int length = 0;
return Utf8IntPtrFromString(value, ref length);
}
///////////////////////////////////////////////////////////////////////
/// <summary>
/// Converts the specified managed string into a native NUL-terminated
/// UTF-8 string pointer using memory obtained from the SQLite core
/// library.
/// </summary>
/// <param name="value">
/// The managed string to convert.
/// </param>
/// <param name="length">
/// The length of the native string, in bytes.
/// </param>
/// <returns>
/// The native NUL-terminated UTF-8 string pointer or
/// <see cref="IntPtr.Zero" /> upon failure.
/// </returns>
public static IntPtr Utf8IntPtrFromString(
string value,
ref int length
)
{
if (value == null)
return IntPtr.Zero;
IntPtr result = IntPtr.Zero;
byte[] bytes = GetUtf8BytesFromString(value);
if (bytes == null)
return IntPtr.Zero;
length = bytes.Length;
result = SQLiteMemory.Allocate(length + 1);
if (result == IntPtr.Zero)
return IntPtr.Zero;
Marshal.Copy(bytes, 0, result, length);
|
| ︙ | ︙ |
Changes to System.Data.SQLite/SQLiteSession.cs.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 |
/********************************************************
* ADO.NET 2.0 Data Provider for SQLite Version 3.X
* Written by Joe Mistachkin (joe@mistachkin.com)
*
* Released to the public domain, use at your own risk!
********************************************************/
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Globalization;
using System.Runtime.InteropServices;
namespace System.Data.SQLite
{
#region Session Extension Enumerations
| > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 |
/********************************************************
* ADO.NET 2.0 Data Provider for SQLite Version 3.X
* Written by Joe Mistachkin (joe@mistachkin.com)
*
* Released to the public domain, use at your own risk!
********************************************************/
using System.Collections;
using System.Collections.Generic;
#if DEBUG
using System.Diagnostics;
#endif
using System.IO;
using System.Globalization;
using System.Runtime.InteropServices;
namespace System.Data.SQLite
{
#region Session Extension Enumerations
|
| ︙ | ︙ | |||
134 135 136 137 138 139 140 141 142 143 144 145 146 147 |
void LoadDifferencesFromTable(
string fromDatabaseName,
string tableName
);
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteChangeSetIterator Class
internal abstract class SQLiteChangeSetIterator : IDisposable
{
#region Private Data
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 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 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 |
void LoadDifferencesFromTable(
string fromDatabaseName,
string tableName
);
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteConnectionLock Class
internal abstract class SQLiteConnectionLock : IDisposable
{
#region Private Constants
private const string LockNopSql = "SELECT 1;";
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Data
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
///////////////////////////////////////////////////////////////////////
private IntPtr statement;
#endregion
///////////////////////////////////////////////////////////////////////
#region Public Constructors
public SQLiteConnectionLock(
SQLiteConnectionHandle handle,
SQLiteConnectionFlags flags
)
{
this.handle = handle;
this.flags = flags;
Lock();
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Methods
private IntPtr GetHandle()
{
if (handle == null)
{
throw new InvalidOperationException(
"Connection lock object has an invalid handle.");
}
IntPtr handlePtr = handle;
if (handlePtr == IntPtr.Zero)
{
throw new InvalidOperationException(
"Connection lock object has an invalid handle pointer.");
}
return handlePtr;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Public Methods
public void Lock()
{
CheckDisposed();
if (statement != IntPtr.Zero)
return;
IntPtr pSql = IntPtr.Zero;
try
{
int nSql = 0;
pSql = SQLiteString.Utf8IntPtrFromString(LockNopSql, ref nSql);
IntPtr pRemain = IntPtr.Zero;
int nRemain = 0;
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_prepare_interop(
GetHandle(), pSql, nSql, ref statement, ref pRemain,
ref nRemain);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3_prepare_interop");
}
finally
{
if (pSql != IntPtr.Zero)
{
SQLiteMemory.Free(pSql);
pSql = IntPtr.Zero;
}
}
}
///////////////////////////////////////////////////////////////////////
public void Unlock()
{
CheckDisposed();
if (statement == IntPtr.Zero)
return;
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_finalize_interop(
statement);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3_finalize_interop");
statement = IntPtr.Zero;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable Members
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
#if THROW_ON_DISPOSED
if (disposed)
{
throw new ObjectDisposedException(
typeof(SQLiteConnectionLock).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected virtual void Dispose(bool disposing)
{
try
{
if (!disposed)
{
//if (disposing)
//{
// ////////////////////////////////////
// // dispose managed resources here...
// ////////////////////////////////////
//}
//////////////////////////////////////
// release unmanaged resources here...
//////////////////////////////////////
if (statement != IntPtr.Zero)
{
//
// NOTE: This should never happen. This object was
// disposed (or finalized) without the Unlock
// method being called first.
//
try
{
if ((flags & SQLiteConnectionFlags.LogPrepare) ==
SQLiteConnectionFlags.LogPrepare)
{
/* throw */
SQLiteLog.LogMessage(SQLiteErrorCode.Misuse,
HelperMethods.StringFormat(CultureInfo.CurrentCulture,
"Connection lock object was {0} with statement {1}",
disposing ? "disposed" : "finalized", statement));
}
}
catch
{
// do nothing.
}
#if DEBUG
Debugger.Break();
#endif
}
}
}
finally
{
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Destructor
~SQLiteConnectionLock()
{
Dispose(false);
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteChangeSetIterator Class
internal abstract class SQLiteChangeSetIterator : IDisposable
{
#region Private Data
|
| ︙ | ︙ | |||
941 942 943 944 945 946 947 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteSession Class
| | | 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteSession Class
internal sealed class SQLiteSession : SQLiteConnectionLock, ISQLiteSession
{
#region Private Data
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
private string databaseName;
///////////////////////////////////////////////////////////////////////
|
| ︙ | ︙ | |||
966 967 968 969 970 971 972 973 974 975 976 977 978 979 |
#region Public Constructors
public SQLiteSession(
SQLiteConnectionHandle handle,
SQLiteConnectionFlags flags,
string databaseName
)
{
this.handle = handle;
this.flags = flags;
this.databaseName = databaseName;
Initialize();
}
| > | 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 |
#region Public Constructors
public SQLiteSession(
SQLiteConnectionHandle handle,
SQLiteConnectionFlags flags,
string databaseName
)
: base(handle, flags)
{
this.handle = handle;
this.flags = flags;
this.databaseName = databaseName;
Initialize();
}
|
| ︙ | ︙ | |||
1268 1269 1270 1271 1272 1273 1274 |
}
}
}
#endregion
///////////////////////////////////////////////////////////////////////
| < < < < < < < < < < | | 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 |
}
}
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
#if THROW_ON_DISPOSED
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteSession).Name);
#endif
}
///////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
//if (disposing)
//{
|
| ︙ | ︙ | |||
1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 |
//////////////////////////////////////
if (session != IntPtr.Zero)
{
UnsafeNativeMethods.sqlite3session_delete(session);
session = IntPtr.Zero;
}
}
}
finally
{
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
| > > > > < < < < < < < < < > | > | 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 |
//////////////////////////////////////
if (session != IntPtr.Zero)
{
UnsafeNativeMethods.sqlite3session_delete(session);
session = IntPtr.Zero;
}
Unlock();
}
}
finally
{
base.Dispose(disposing);
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteMemoryChangeSet Class
internal sealed class SQLiteMemoryChangeSet :
SQLiteConnectionLock, ISQLiteChangeSet,
IEnumerable<ISQLiteChangeSetMetadataItem>
{
#region Private Data
private byte[] rawData;
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Constructors
internal SQLiteMemoryChangeSet(
byte[] rawData,
SQLiteConnectionHandle handle,
SQLiteConnectionFlags flags
)
: base(handle, flags)
{
this.rawData = rawData;
this.handle= handle;
this.flags = flags;
}
#endregion
|
| ︙ | ︙ | |||
1638 1639 1640 1641 1642 1643 1644 |
{
return GetEnumerator();
}
#endregion
///////////////////////////////////////////////////////////////////////
| < < < < < < < < < < | > > > > < < < < < < < < < > | > | 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 |
{
return GetEnumerator();
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
#if THROW_ON_DISPOSED
if (disposed)
{
throw new ObjectDisposedException(
typeof(SQLiteMemoryChangeSet).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
if (disposing)
{
////////////////////////////////////
// dispose managed resources here...
////////////////////////////////////
if (rawData != null)
rawData = null;
}
//////////////////////////////////////
// release unmanaged resources here...
//////////////////////////////////////
Unlock();
}
}
finally
{
base.Dispose(disposing);
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteStreamChangeSet Class
internal sealed class SQLiteStreamChangeSet :
SQLiteConnectionLock, ISQLiteChangeSet,
IEnumerable<ISQLiteChangeSetMetadataItem>
{
#region Private Data
private Stream inputStream;
private Stream outputStream;
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Constructors
internal SQLiteStreamChangeSet(
Stream inputStream,
Stream outputStream,
SQLiteConnectionHandle handle,
SQLiteConnectionFlags flags
)
: base(handle, flags)
{
this.inputStream = inputStream;
this.outputStream = outputStream;
this.handle = handle;
this.flags = flags;
}
#endregion
|
| ︙ | ︙ | |||
1940 1941 1942 1943 1944 1945 1946 |
{
return GetEnumerator();
}
#endregion
///////////////////////////////////////////////////////////////////////
| < < < < < < < < < < | | 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 |
{
return GetEnumerator();
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
#if THROW_ON_DISPOSED
if (disposed)
{
throw new ObjectDisposedException(
typeof(SQLiteStreamChangeSet).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
if (disposing)
{
|
| ︙ | ︙ | |||
1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 |
if (inputStream != null)
inputStream = null; /* NOT OWNED */
}
//////////////////////////////////////
// release unmanaged resources here...
//////////////////////////////////////
}
}
finally
{
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
| > > > > < < < < < < < < < | 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 |
if (inputStream != null)
inputStream = null; /* NOT OWNED */
}
//////////////////////////////////////
// release unmanaged resources here...
//////////////////////////////////////
Unlock();
}
}
finally
{
base.Dispose(disposing);
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteChangeSetEnumerator Class
|
| ︙ | ︙ |