@@ -175,10 +175,26 @@
-->
$(DefineConstants);INTEROP_LOG
+
+
+ $(DefineConstants);INTEROP_TEST_EXTENSION
+
+
+
+
+ $(DefineConstants);INTEROP_VIRTUAL_TABLE
+
+
Index: System.Data.SQLite/UnsafeNativeMethods.cs
==================================================================
--- System.Data.SQLite/UnsafeNativeMethods.cs
+++ System.Data.SQLite/UnsafeNativeMethods.cs
@@ -630,22 +630,22 @@
internal const string SQLITE_DLL = "SQLite.Interop.087.dll";
#elif SQLITE_STANDARD
//
// NOTE: Otherwise, if the standard SQLite library is enabled, use it.
//
- private const string SQLITE_DLL = "sqlite3";
+ internal const string SQLITE_DLL = "sqlite3";
#elif USE_INTEROP_DLL
- //
+ //
// NOTE: Otherwise, if the native SQLite interop assembly is enabled,
// use it.
//
- private const string SQLITE_DLL = "SQLite.Interop.dll";
+ internal const string SQLITE_DLL = "SQLite.Interop.dll";
#else
//
// NOTE: Finally, assume that the mixed-mode assembly is being used.
//
- private const string SQLITE_DLL = "System.Data.SQLite.dll";
+ internal const string SQLITE_DLL = "System.Data.SQLite.dll";
#endif
// This section uses interop calls that also fetch text length to optimize conversion.
// When using the standard dll, we can replace these calls with normal sqlite calls and
// do unoptimized conversions instead afterwards
@@ -705,10 +705,13 @@
internal static extern IntPtr sqlite3_value_text_interop(IntPtr p, out int len);
[DllImport(SQLITE_DLL)]
internal static extern IntPtr sqlite3_value_text16_interop(IntPtr p, out int len);
+ [DllImport(SQLITE_DLL)]
+ internal static extern int sqlite3_malloc_size_interop(IntPtr p);
+
#if INTEROP_LOG
[DllImport(SQLITE_DLL)]
internal static extern SQLiteErrorCode sqlite3_config_log_interop();
#endif
#endif
@@ -1058,13 +1061,10 @@
internal static extern void sqlite3_interrupt(IntPtr db);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern long sqlite3_last_insert_rowid(IntPtr db);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_last_insert_rowid_interop(IntPtr db, ref long rowId);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1073,21 +1073,15 @@
internal static extern int sqlite3_changes(IntPtr db);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern long sqlite3_memory_used();
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_memory_used_interop(ref long bytes);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern long sqlite3_memory_highwater(int resetFlag);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_memory_highwater_interop(int resetFlag, ref long bytes);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1110,13 +1104,10 @@
internal static extern SQLiteErrorCode sqlite3_bind_blob(IntPtr stmt, int index, Byte[] value, int nSize, IntPtr nTransient);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern SQLiteErrorCode sqlite3_bind_double(IntPtr stmt, int index, double value);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern SQLiteErrorCode sqlite3_bind_double_interop(IntPtr stmt, int index, ref double value);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1136,25 +1127,19 @@
internal static extern SQLiteErrorCode sqlite3_bind_uint(IntPtr stmt, int index, uint value);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern SQLiteErrorCode sqlite3_bind_int64(IntPtr stmt, int index, long value);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern SQLiteErrorCode sqlite3_bind_int64_interop(IntPtr stmt, int index, ref long value);
#endif
//
// NOTE: This really just calls "sqlite3_bind_int64"; however, it has the
// correct type signature for an unsigned long (64-bit) integer.
//
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, EntryPoint = "sqlite3_bind_int64", CallingConvention = CallingConvention.Cdecl)]
internal static extern SQLiteErrorCode sqlite3_bind_uint64(IntPtr stmt, int index, ulong value);
-#else
- [DllImport(SQLITE_DLL, EntryPoint = "sqlite3_bind_int64_interop")]
- internal static extern SQLiteErrorCode sqlite3_bind_uint64_interop(IntPtr stmt, int index, ref ulong value);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1198,13 +1183,10 @@
internal static extern SQLiteErrorCode sqlite3_step(IntPtr stmt);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern double sqlite3_column_double(IntPtr stmt, int index);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_column_double_interop(IntPtr stmt, int index, out double value);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1213,13 +1195,10 @@
internal static extern int sqlite3_column_int(IntPtr stmt, int index);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern long sqlite3_column_int64(IntPtr stmt, int index);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_column_int64_interop(IntPtr stmt, int index, out long value);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1284,13 +1263,10 @@
internal static extern int sqlite3_value_bytes16(IntPtr p);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern double sqlite3_value_double(IntPtr p);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_value_double_interop(IntPtr p, out double value);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1299,13 +1275,10 @@
internal static extern int sqlite3_value_int(IntPtr p);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern long sqlite3_value_int64(IntPtr p);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_value_int64_interop(IntPtr p, out Int64 value);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1321,13 +1294,10 @@
internal static extern void sqlite3_result_blob(IntPtr context, byte[] value, int nSize, IntPtr pvReserved);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern void sqlite3_result_double(IntPtr context, double value);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_result_double_interop(IntPtr context, ref double value);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1336,20 +1306,52 @@
internal static extern void sqlite3_result_error(IntPtr context, byte[] strErr, int nLen);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern void sqlite3_result_error_code(IntPtr context, SQLiteErrorCode value);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern void sqlite3_result_error_toobig(IntPtr context);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern void sqlite3_result_error_nomem(IntPtr context);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern void sqlite3_result_value(IntPtr context, IntPtr value);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern void sqlite3_result_zeroblob(IntPtr context, int nLen);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
[DllImport(SQLITE_DLL)]
#endif
internal static extern void sqlite3_result_int(IntPtr context, int value);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
internal static extern void sqlite3_result_int64(IntPtr context, long value);
-#else
- [DllImport(SQLITE_DLL)]
- internal static extern void sqlite3_result_int64_interop(IntPtr context, ref Int64 value);
#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
@@ -1467,10 +1469,17 @@
internal static extern IntPtr sqlite3_db_handle(IntPtr stmt);
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern IntPtr sqlite3_db_filename(IntPtr db, IntPtr dbName);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
[DllImport(SQLITE_DLL)]
#endif
internal static extern IntPtr sqlite3_next_stmt(IntPtr db, IntPtr stmt);
#if !PLATFORM_COMPACTFRAMEWORK
@@ -1557,10 +1566,488 @@
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
[DllImport(SQLITE_DLL)]
#endif
internal static extern int sqlite3_backup_pagecount(IntPtr backup);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern SQLiteErrorCode sqlite3_declare_vtab(IntPtr db, IntPtr zSQL);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern IntPtr sqlite3_mprintf(IntPtr format, __arglist);
+ #endregion
+
+ // SQLite API calls that are provided by "well-known" extensions that may be statically
+ // linked with the SQLite core native library currently in use.
+ #region extension sqlite api calls
+#if INTEROP_VIRTUAL_TABLE
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern IntPtr sqlite3_create_disposable_module(IntPtr db, IntPtr name, ref sqlite3_module module, IntPtr pClientData, xDestroyModule xDestroy);
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
+#else
+ [DllImport(SQLITE_DLL)]
+#endif
+ internal static extern void sqlite3_dispose_module(ref sqlite3_module pModule);
+#endif
+ #endregion
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ #region sqlite interop api calls (.NET Compact Framework only)
+#if PLATFORM_COMPACTFRAMEWORK && !SQLITE_STANDARD
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_last_insert_rowid_interop(IntPtr db, ref long rowId);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_memory_used_interop(ref long bytes);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_memory_highwater_interop(int resetFlag, ref long bytes);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern SQLiteErrorCode sqlite3_bind_double_interop(IntPtr stmt, int index, ref double value);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern SQLiteErrorCode sqlite3_bind_int64_interop(IntPtr stmt, int index, ref long value);
+
+ [DllImport(SQLITE_DLL, EntryPoint = "sqlite3_bind_int64_interop")]
+ internal static extern SQLiteErrorCode sqlite3_bind_uint64_interop(IntPtr stmt, int index, ref ulong value);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_column_double_interop(IntPtr stmt, int index, out double value);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_column_int64_interop(IntPtr stmt, int index, out long value);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_value_double_interop(IntPtr p, out double value);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_value_int64_interop(IntPtr p, out Int64 value);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_result_double_interop(IntPtr context, ref double value);
+
+ [DllImport(SQLITE_DLL)]
+ internal static extern void sqlite3_result_int64_interop(IntPtr context, ref Int64 value);
+#endif
+ // PLATFORM_COMPACTFRAMEWORK && !SQLITE_STANDARD
+ #endregion
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ #region Native Delegates
+#if INTEROP_VIRTUAL_TABLE
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xCreate(
+ IntPtr pDb,
+ IntPtr pAux,
+ int argc,
+ [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)]
+ IntPtr[] argv,
+ ref IntPtr pVtab,
+ ref IntPtr pError
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xConnect(
+ IntPtr pDb,
+ IntPtr pAux,
+ int argc,
+ [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)]
+ IntPtr[] argv,
+ ref IntPtr pVtab,
+ ref IntPtr pError
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xBestIndex(
+ IntPtr pVtab,
+ IntPtr pIndex
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xDisconnect(
+ IntPtr pVtab
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xDestroy(
+ IntPtr pVtab
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xOpen(
+ IntPtr pVtab,
+ ref IntPtr pCursor
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xClose(
+ IntPtr pCursor
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xFilter(
+ IntPtr pCursor,
+ int idxNum,
+ IntPtr idxStr,
+ int argc,
+ [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 3)]
+ IntPtr[] argv
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xNext(
+ IntPtr pCursor
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate int xEof(
+ IntPtr pCursor
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xColumn(
+ IntPtr pCursor,
+ IntPtr pContext,
+ int index
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xRowId(
+ IntPtr pCursor,
+ ref long rowId
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xUpdate(
+ IntPtr pVtab,
+ int argc,
+ [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)]
+ IntPtr[] argv,
+ ref long rowId
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xBegin(
+ IntPtr pVtab
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xSync(
+ IntPtr pVtab
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xCommit(
+ IntPtr pVtab
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xRollback(
+ IntPtr pVtab
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate int xFindFunction(
+ IntPtr pVtab,
+ int nArg,
+ IntPtr zName,
+ ref SQLiteCallback callback,
+ ref IntPtr pUserData
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xRename(
+ IntPtr pVtab,
+ IntPtr zNew
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xSavepoint(
+ IntPtr pVtab,
+ int iSavepoint
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xRelease(
+ IntPtr pVtab,
+ int iSavepoint
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate SQLiteErrorCode xRollbackTo(
+ IntPtr pVtab,
+ int iSavepoint
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate int xFunc(
+ IntPtr pContext,
+ int argc,
+ [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)]
+ IntPtr[] argv
+ );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ public delegate void xDestroyModule(IntPtr pClientData);
+#endif
+ #endregion
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ #region Native Structures
+#if INTEROP_VIRTUAL_TABLE
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct sqlite3_module
+ {
+ public int iVersion;
+ public xCreate xCreate;
+ public xConnect xConnect;
+ public xBestIndex xBestIndex;
+ public xDisconnect xDisconnect;
+ public xDestroy xDestroy;
+ public xOpen xOpen;
+ public xClose xClose;
+ public xFilter xFilter;
+ public xNext xNext;
+ public xEof xEof;
+ public xColumn xColumn;
+ public xRowId xRowId;
+ public xUpdate xUpdate;
+ public xBegin xBegin;
+ public xSync xSync;
+ public xCommit xCommit;
+ public xRollback xRollback;
+ public xFindFunction xFindFunction;
+ public xRename xRename;
+ /* The methods above are in version 1 of the sqlite3_module
+ * object. Those below are for version 2 and greater. */
+ public xSavepoint xSavepoint;
+ public xRelease xRelease;
+ public xRollbackTo xRollbackTo;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct sqlite3_vtab
+ {
+ public IntPtr pModule;
+ public int nRef; /* NO LONGER USED */
+ public IntPtr zErrMsg;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct sqlite3_vtab_cursor
+ {
+ public IntPtr pVTab;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct sqlite3_index_constraint
+ {
+ public sqlite3_index_constraint(
+ SQLiteIndexConstraint constraint
+ )
+ : this()
+ {
+ if (constraint != null)
+ {
+ iColumn = constraint.iColumn;
+ op = constraint.op;
+ usable = constraint.usable;
+ iTermOffset = constraint.iTermOffset;
+ }
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+
+ public int iColumn;
+ public SQLiteIndexConstraintOp op;
+ public byte usable;
+ public int iTermOffset;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct sqlite3_index_orderby
+ {
+ public sqlite3_index_orderby(
+ SQLiteIndexOrderBy orderBy
+ )
+ : this()
+ {
+ if (orderBy != null)
+ {
+ iColumn = orderBy.iColumn;
+ desc = orderBy.desc;
+ }
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+
+ public int iColumn; /* Column number */
+ public byte desc; /* True for DESC. False for ASC. */
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct sqlite3_index_constraint_usage
+ {
+ public sqlite3_index_constraint_usage(
+ SQLiteIndexConstraintUsage constraintUsage
+ )
+ : this()
+ {
+ if (constraintUsage != null)
+ {
+ argvIndex = constraintUsage.argvIndex;
+ omit = constraintUsage.omit;
+ }
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+
+ public int argvIndex; /* if >0, constraint is part of argv to xFilter */
+ public byte omit; /* Do not code a test for this constraint */
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct sqlite3_index_info
+ {
+ /* Inputs */
+ public int nConstraint; /* Number of entries in aConstraint */
+ public IntPtr aConstraint;
+ public int nOrderBy;
+ public IntPtr aOrderBy;
+ /* Outputs */
+ public IntPtr aConstraintUsage;
+ public int idxNum; /* Number used to identify the index */
+ public string idxStr; /* String, possibly obtained from sqlite3_malloc */
+ public int needToFreeIdxStr; /* Free idxStr using sqlite3_free() if true */
+ public int orderByConsumed; /* True if output is already ordered */
+ public double estimatedCost; /* Estimated cost of using this index */
+ }
+#endif
#endregion
}
#if PLATFORM_COMPACTFRAMEWORK
internal abstract class CriticalHandle : IDisposable
@@ -1655,10 +2142,14 @@
internal readonly object syncRoot = new object();
#endif
///////////////////////////////////////////////////////////////////////
+ private bool ownHandle;
+
+ ///////////////////////////////////////////////////////////////////////
+
public static implicit operator IntPtr(SQLiteConnectionHandle db)
{
if (db != null)
{
#if PLATFORM_COMPACTFRAMEWORK
@@ -1671,36 +2162,44 @@
return IntPtr.Zero;
}
///////////////////////////////////////////////////////////////////////
- internal SQLiteConnectionHandle(IntPtr db)
- : this()
+ internal SQLiteConnectionHandle(IntPtr db, bool ownHandle)
+ : this(ownHandle)
{
#if PLATFORM_COMPACTFRAMEWORK
lock (syncRoot)
#endif
{
+ this.ownHandle = ownHandle;
SetHandle(db);
}
}
///////////////////////////////////////////////////////////////////////
- private SQLiteConnectionHandle()
+ private SQLiteConnectionHandle(bool ownHandle)
: base(IntPtr.Zero)
{
#if COUNT_HANDLE
- Interlocked.Increment(
- ref UnsafeNativeMethods.connectionCount);
+ if (ownHandle)
+ Interlocked.Increment(ref UnsafeNativeMethods.connectionCount);
#endif
}
///////////////////////////////////////////////////////////////////////
protected override bool ReleaseHandle()
{
+#if PLATFORM_COMPACTFRAMEWORK
+ lock (syncRoot)
+#endif
+ {
+ if (!ownHandle) return true;
+ }
+
try
{
#if !PLATFORM_COMPACTFRAMEWORK
IntPtr localHandle = Interlocked.Exchange(
ref handle, IntPtr.Zero);
@@ -1782,10 +2281,25 @@
{
return Interlocked.Decrement(
ref UnsafeNativeMethods.connectionCount);
}
#endif
+
+ ///////////////////////////////////////////////////////////////////////
+
+ public bool OwnHandle
+ {
+ get
+ {
+#if PLATFORM_COMPACTFRAMEWORK
+ lock (syncRoot)
+#endif
+ {
+ return ownHandle;
+ }
+ }
+ }
///////////////////////////////////////////////////////////////////////
public override bool IsInvalid
{
Index: Tests/basic.eagle
==================================================================
--- Tests/basic.eagle
+++ Tests/basic.eagle
@@ -76,20 +76,30 @@
#
testClrExec $testExeFile [list -eventflags Wait -directory \
[file dirname $testExeFile] -stdout output -success 0] -autoRun \
-fileName [appendArgs \" [file nativename $fileName] \"]
} error]
+
+ set successCount [regexp -all -- {\tSucceeded\t} $output]
+ set failureCount [regexp -all -- {\tFailed\t} $output]
+ set totalCount [expr {$successCount + $failureCount}]
+
+ tputs $test_channel [appendArgs \
+ "---- found and executed " $totalCount " unit tests from \"" \
+ $testExeFile "\", " $successCount " passed, " $failureCount \
+ " failed\n"]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
list $code [expr {$code == 0 ? "" : $error}]
} -cleanup {
cleanupFile $fileName
- unset -nocomplain code output error fileName
+ unset -nocomplain totalCount failureCount successCount code output \
+ error fileName
} -constraints {eagle SQLite file_System.Data.SQLite.dll file_test.exe} \
-result {0 {}}}
###############################################################################
@@ -1472,15 +1482,20 @@
# NOTE: Make sure that SQLite core library is completely shutdown prior to
# starting this test.
#
shutdownSQLite $test_channel
+ #
+ # NOTE: Create an IntPtr instance with a value of zero.
+ #
+ set zero [object invoke -create IntPtr Zero]
+
#
# NOTE: Create an instance of the core SQLite library interop wrapper class.
#
set sqlite3 [object create -flags +NonPublic System.Data.SQLite.SQLite3 \
- Default Unspecified null]
+ Default Unspecified null $zero null true]
} -body {
set result(rc1) [object invoke -flags +NonPublic $sqlite3 SetMemoryStatus \
false]
set result(before) [object invoke -flags +NonPublic $sqlite3 MemoryUsed]
@@ -1540,11 +1555,11 @@
#
object invoke -flags +NonPublic System.Data.SQLite.UnsafeNativeMethods \
sqlite3_config_int SQLITE_CONFIG_MEMSTATUS 1
}
- unset -nocomplain result sqlite3
+ unset -nocomplain result sqlite3 zero
} -constraints \
{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -match \
regexp -result {^Ok Misuse Ok Ok System#IntPtr#\d+ System#IntPtr#\d+ \d+ \d+\
\d+ \d+ \d+ True True True True True True$}}
Index: Tests/common.eagle
==================================================================
--- Tests/common.eagle
+++ Tests/common.eagle
@@ -1475,10 +1475,51 @@
proc reportSQLiteResources { channel {quiet false} {collect true} } {
#
# NOTE: Skip all output if we are running in "quiet" mode.
#
+ if {[haveConstraint \
+ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE] && \
+ [haveConstraint \
+ defineConstant.System.Data.SQLite.TRACK_MEMORY_BYTES]} then {
+ if {!$quiet} then {
+ tputs $channel "---- current memory in use by SQLiteMemory... "
+ }
+
+ if {[catch {object invoke -flags +NonPublic \
+ System.Data.SQLite.SQLiteMemory \
+ bytesAllocated} memory] == 0} then {
+ if {!$quiet} then {
+ tputs $channel [appendArgs $memory " bytes\n"]
+ }
+ } else {
+ set memory unknown
+
+ if {!$quiet} then {
+ tputs $channel [appendArgs $memory \n]
+ }
+ }
+
+ if {!$quiet} then {
+ tputs $channel "---- maximum memory in use by SQLiteMemory... "
+ }
+
+ if {[catch {object invoke -flags +NonPublic \
+ System.Data.SQLite.SQLiteMemory \
+ maximumBytesAllocated} memory] == 0} then {
+ if {!$quiet} then {
+ tputs $channel [appendArgs $memory " bytes\n"]
+ }
+ } else {
+ set memory unknown
+
+ if {!$quiet} then {
+ tputs $channel [appendArgs $memory \n]
+ }
+ }
+ }
+
if {!$quiet} then {
tputs $channel "---- current memory in use by SQLite... "
}
if {[catch {object invoke -flags +NonPublic \
@@ -1910,14 +1951,15 @@
# assembly if it was enabled for the managed assembly.
#
foreach defineConstant [list \
CHECK_STATE COUNT_HANDLE DEBUG INTEROP_CODEC INTEROP_DEBUG \
INTEROP_EXTENSION_FUNCTIONS INTEROP_LEGACY_CLOSE INTEROP_LOG \
- INTEROP_TEST_EXTENSION NET_20 NET_35 NET_40 NET_45 NET_COMPACT_20 \
- PLATFORM_COMPACTFRAMEWORK PRELOAD_NATIVE_LIBRARY RETARGETABLE \
- SQLITE_STANDARD THROW_ON_DISPOSED TRACE TRACE_CONNECTION \
- TRACE_HANDLE TRACE_PRELOAD TRACE_STATEMENT TRACE_WARNING \
+ INTEROP_TEST_EXTENSION INTEROP_VIRTUAL_TABLE NET_20 NET_35 \
+ NET_40 NET_45 NET_COMPACT_20 PLATFORM_COMPACTFRAMEWORK \
+ PRELOAD_NATIVE_LIBRARY RETARGETABLE SQLITE_STANDARD \
+ THROW_ON_DISPOSED TRACE TRACE_CONNECTION TRACE_HANDLE \
+ TRACE_PRELOAD TRACE_STATEMENT TRACE_WARNING TRACK_MEMORY_BYTES \
USE_INTEROP_DLL USE_PREPARE_V2 WINDOWS] {
#
# NOTE: Check if the compile-time option is listed in the list of
# "define constants" kept track of by the managed assembly.
#
ADDED Tests/vtab.eagle
Index: Tests/vtab.eagle
==================================================================
--- /dev/null
+++ Tests/vtab.eagle
@@ -0,0 +1,219 @@
+###############################################################################
+#
+# vtab.eagle --
+#
+# Written by Joe Mistachkin.
+# Released to the public domain, use at your own risk!
+#
+###############################################################################
+
+package require Eagle
+package require Eagle.Library
+package require Eagle.Test
+
+runTestPrologue
+
+###############################################################################
+
+package require System.Data.SQLite.Test
+runSQLiteTestPrologue
+
+###############################################################################
+
+runTest {test vtab-1.1 {virtual table support} -setup {
+ setupDb [set fileName vtab-1.1.db]
+} -body {
+ set id [object invoke Interpreter.GetActive NextId]
+ set dataSource [file join [getDatabaseDirectory] $fileName]
+
+ set sql { \
+ CREATE VIRTUAL TABLE t${id} USING mod${id}; \
+ }
+
+ unset -nocomplain results errors
+
+ set code [compileCSharpWith [subst {
+ using System;
+ using System.Data.SQLite;
+
+ namespace _Dynamic${id}
+ {
+ public sealed class SQLiteModuleTest${id} : SQLiteModuleNoop
+ {
+ public SQLiteModuleTest${id}(string name)
+ : base(name)
+ {
+ // do nothing.
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+
+ public override SQLiteErrorCode Create(
+ SQLiteConnection connection,
+ IntPtr pClientData,
+ string\[\] arguments,
+ ref SQLiteVirtualTable table,
+ ref string error
+ )
+ {
+ SQLiteErrorCode rc = DeclareTable(
+ connection, "CREATE TABLE ignored(x);", ref error);
+
+ if (rc != SQLiteErrorCode.Ok)
+ return rc;
+
+ table = new SQLiteVirtualTable(arguments);
+ return SQLiteErrorCode.Ok;
+ }
+ }
+
+ /////////////////////////////////////////////////////////////////////////
+
+ public static class Test${id}
+ {
+ public static void Main()
+ {
+ using (SQLiteConnection connection = new SQLiteConnection(
+ "Data Source=${dataSource};"))
+ {
+ connection.Open();
+ connection.CreateModule(new SQLiteModuleTest${id}("mod${id}"));
+
+ using (SQLiteCommand command = connection.CreateCommand())
+ {
+ command.CommandText = "[subst ${sql}]";
+ command.ExecuteNonQuery();
+ }
+
+ connection.Close();
+ }
+ }
+ }
+ }
+ }] true true true results errors System.Data.SQLite.dll]
+
+ list $code $results \
+ [expr {[info exists errors] ? $errors : ""}] \
+ [expr {$code eq "Ok" ? [catch {
+ object invoke _Dynamic${id}.Test${id} Main
+ } result] : [set result ""]}] $result
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain result code results errors sql dataSource id db fileName
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\
+defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE} -match regexp -result \
+{^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
+
+###############################################################################
+
+runTest {test vtab-1.2 {IEnumerable virtual table} -setup {
+ setupDb [set fileName vtab-1.2.db]
+} -body {
+ set id [object invoke Interpreter.GetActive NextId]
+ set dataSource [file join [getDatabaseDirectory] $fileName]
+
+ set sql(1) { \
+ CREATE VIRTUAL TABLE t${id} USING mod${id}; \
+ }
+
+ set sql(2) { \
+ SELECT * FROM t${id}; \
+ }
+
+ set sql(3) { \
+ UPDATE t${id} SET x = 1; \
+ }
+
+ unset -nocomplain results errors
+
+ set code [compileCSharpWith [subst {
+ using System;
+ using System.Data.SQLite;
+ using Eagle._Containers.Public;
+
+ namespace _Dynamic${id}
+ {
+ public static class Test${id}
+ {
+ public static StringList GetList(params string\[\] strings)
+ {
+ StringList result = new StringList();
+
+ using (SQLiteConnection connection = new SQLiteConnection(
+ "Data Source=${dataSource};"))
+ {
+ connection.Open();
+
+ connection.CreateModule(new SQLiteModuleEnumerable(
+ "mod${id}", strings));
+
+ using (SQLiteCommand command = connection.CreateCommand())
+ {
+ command.CommandText = "[subst ${sql(1)}]";
+ command.ExecuteNonQuery();
+ }
+
+ using (SQLiteCommand command = connection.CreateCommand())
+ {
+ command.CommandText = "[subst ${sql(2)}]";
+
+ using (SQLiteDataReader dataReader = command.ExecuteReader())
+ {
+ while (dataReader.Read())
+ result.Add(dataReader\[0\].ToString());
+ }
+ }
+
+ using (SQLiteCommand command = connection.CreateCommand())
+ {
+ command.CommandText = "[subst ${sql(3)}]";
+
+ try
+ {
+ command.ExecuteNonQuery();
+ }
+ catch (SQLiteException e)
+ {
+ result.Add(e.ReturnCode.ToString());
+ result.Add(e.Message);
+ }
+ }
+
+ connection.Close();
+ }
+
+ return result;
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+
+ public static void Main()
+ {
+ // do nothing.
+ }
+ }
+ }
+ }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]]
+
+ list $code $results \
+ [expr {[info exists errors] ? $errors : ""}] \
+ [expr {$code eq "Ok" ? [catch {
+ object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0
+ } result] : [set result ""]}] $result
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain result code results errors sql dataSource id db fileName
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\
+defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE} -match regexp -result \
+[string map [list \n \r\n] {^Ok System#CodeDom#Compiler#CompilerResults#\d+\
+\{\} 0 \{one two three 4 5.0 Error \{SQL logic error or missing database
+virtual table "t\d+" is read-only\}\}$}]}
+
+###############################################################################
+
+runSQLiteTestEpilogue
+runTestEpilogue
Index: test/TestCases.cs
==================================================================
--- test/TestCases.cs
+++ test/TestCases.cs
@@ -1224,14 +1224,17 @@
}
[Test]
internal void ConnectionStringBuilder()
{
- DbConnectionStringBuilder builder = _fact.CreateConnectionStringBuilder();
- if (builder is SQLiteConnectionStringBuilder)
+ if (_fact.GetType().Name.IndexOf("SQLite", StringComparison.OrdinalIgnoreCase) > -1)
{
- bool pool = ((SQLiteConnectionStringBuilder)builder).Pooling;
+ DbConnectionStringBuilder builder = _fact.CreateConnectionStringBuilder();
+ if (builder is SQLiteConnectionStringBuilder)
+ {
+ bool pool = ((SQLiteConnectionStringBuilder)builder).Pooling;
+ }
}
}
[Test]
internal void LeakyCommands()
Index: www/contribute.wiki
==================================================================
--- www/contribute.wiki
+++ www/contribute.wiki
@@ -50,19 +50,22 @@
System.Data.SQLite admin will review the branch and merge the changes
into the trunk.
Contributors are required to following the
[./checkin.wiki | pre-checkin checklist] prior to every checkin to
-the System.Data.SQLite self-hosting repository. This checklist is short and succinct
-and should only require a few seconds to follow. Contributors
+the System.Data.SQLite self-hosting repository. This checklist is short and
+succinct and should only require a few seconds to follow. Contributors
should print out a copy of the pre-checkin checklist and keep
it on a notecard beside their workstations, for quick reference.
Contributors should review and try to mimic the coding style
used through the rest of the System.Data.SQLite source code. Your code should
blend in. A third-party reader should be unable to distinguish your
code from any other code in the source corpus.
+
+Furthermore, all new code must contain "documentation comments" that
+can be successfully processed up by the Microsoft C# compiler.
4.0 Testing
System.Data.SQLite has several automated test suites that excercise its base
functionality, but this is an area that needs further work.
Index: www/faq.wiki
==================================================================
--- www/faq.wiki
+++ www/faq.wiki
@@ -108,10 +108,17 @@
Is this behavior a bug? -OR- Is there a quick way to
view the various lists of tickets for the System.Data.SQLite project?
+
+
+ Since upgrading a project to use System.Data.SQLite version
+ 1.0.82.0 (or later), the database file is still locked after all its
+ connections have been closed. Why is this happening?
+
+
@@ -520,5 +527,30 @@
The list of tickets closed without needing a fix.
+
+
+
+
+ (22) Since upgrading a project to use System.Data.SQLite version 1.0.82.0
+ (or later), the database file is still locked after all its connections have
+ been closed. Why is this happening?
+
+
+
+
+ As of version 1.0.82.0, the native resources for a SQLiteConnection object,
+ including any native locks on the underlying file, are not fully released
+ until all SQLiteCommand, SQLiteDataReader, and SQLiteBackup objects associated
+ with that SQLiteConnection object have also been disposed. These changes were
+ made to allow the SQLite native resource management to integrate better with
+ the
+ garbage collection
+ semantics used by the
+ Common Language
+ Runtime. Allowing native SQLite resources to be released in a
+ non-deterministic order is accomplished through careful use of the
+ sqlite3_close_v2() core
+ native library routine.
+