Version History

1.0.103.0 - August XX, 2016 (release scheduled)

Change the SQLiteReadValueCallback delegate "eventArgs" parameter to be of type SQLiteReadEventArgs. ** Potentially Incompatible Change **
Make SQLiteReadValueEventArgs and SQLiteReadArrayEventArgs derive from SQLiteReadEventArgs. ** Potentially Incompatible Change **
Rename SQLiteReadValueEventArgs.ArrayEventArgs property to ExtraEventArgs. ** Potentially Incompatible Change **
Add NoVerifyTypeAffinity connection flag to disable all type affinity checking.
Add support for incremental blob I/O.

1.0.102.0 - June 23, 2016

Updated to SQLite 3.13.0.
Update the SQLiteConnection.EnableExtensions method to make use of the new SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION option, when available. ** Potentially Incompatible Change **
Prevent the SQLiteCommand.ExecuteScalar method from throwing an exception when there are no result columns. ** Potentially Incompatible Change **

Distributing the Binaries (Compact Framework)

Both the System.Data.SQLite.DLL and SQLite.Interop.XXX.DLL files must be deployed on the Compact Framework. The XXX is the build number of - the System.Data.SQLite library (e.g. "102"). The + the System.Data.SQLite library (e.g. "103"). The SQLite.Interop.XXX.DLL file is a fully native assembly compiled for the ARM processor, and System.Data.SQLite is the fully-managed Compact Framework assembly.

Index: NuGet/SQLite.Beta.nuspec ================================================================== --- NuGet/SQLite.Beta.nuspec +++ NuGet/SQLite.Beta.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Beta System.Data.SQLite (x86/x64) Beta - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a "beta" package and is not intended for production use. The official SQLite database engine for both x86 and x64 along with the ADO.NET provider. This package includes support for LINQ and Entity Framework 6. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png @@ -20,50 +20,50 @@ https://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Index: NuGet/SQLite.Core.Beta.nuspec ================================================================== --- NuGet/SQLite.Core.Beta.nuspec +++ NuGet/SQLite.Core.Beta.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Core.Beta System.Data.SQLite Core (x86/x64) Beta - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a "beta" package and is not intended for production use. The official SQLite database engine for both x86 and x64 along with the ADO.NET provider. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.Core.MSIL.Beta.nuspec ================================================================== --- NuGet/SQLite.Core.MSIL.Beta.nuspec +++ NuGet/SQLite.Core.MSIL.Beta.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Core.MSIL.Beta System.Data.SQLite (MSIL) Beta - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a "beta" package and is not intended for production use. An ADO.NET provider for SQLite (managed-only). en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.Core.MSIL.Test.nuspec ================================================================== --- NuGet/SQLite.Core.MSIL.Test.nuspec +++ NuGet/SQLite.Core.MSIL.Test.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Core.MSIL.Test System.Data.SQLite (MSIL) Test - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a pre-release package and is not intended for production use. An ADO.NET provider for SQLite (managed-only). en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.Core.MSIL.nuspec ================================================================== --- NuGet/SQLite.Core.MSIL.nuspec +++ NuGet/SQLite.Core.MSIL.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Core.MSIL System.Data.SQLite Core (MSIL) - 1.0.102.0 + 1.0.103.0 SQLite Development Team An ADO.NET provider for SQLite (managed-only). en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.Core.Test.nuspec ================================================================== --- NuGet/SQLite.Core.Test.nuspec +++ NuGet/SQLite.Core.Test.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Core.Test System.Data.SQLite Core (x86/x64) Test - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a pre-release package and is not intended for production use. The official SQLite database engine for both x86 and x64 along with the ADO.NET provider. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.Core.nuspec ================================================================== --- NuGet/SQLite.Core.nuspec +++ NuGet/SQLite.Core.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Core System.Data.SQLite Core (x86/x64) - 1.0.102.0 + 1.0.103.0 SQLite Development Team The official SQLite database engine for both x86 and x64 along with the ADO.NET provider. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.EF6.Beta.nuspec ================================================================== --- NuGet/SQLite.EF6.Beta.nuspec +++ NuGet/SQLite.EF6.Beta.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.EF6.Beta System.Data.SQLite EF6 Beta - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a "beta" package and is not intended for production use. Support for Entity Framework 6 using System.Data.SQLite. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.EF6.Test.nuspec ================================================================== --- NuGet/SQLite.EF6.Test.nuspec +++ NuGet/SQLite.EF6.Test.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.EF6.Test System.Data.SQLite EF6 Test - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a pre-release package and is not intended for production use. Support for Entity Framework 6 using System.Data.SQLite. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.EF6.nuspec ================================================================== --- NuGet/SQLite.EF6.nuspec +++ NuGet/SQLite.EF6.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.EF6 System.Data.SQLite EF6 - 1.0.102.0 + 1.0.103.0 SQLite Development Team Support for Entity Framework 6 using System.Data.SQLite. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.Linq.Beta.nuspec ================================================================== --- NuGet/SQLite.Linq.Beta.nuspec +++ NuGet/SQLite.Linq.Beta.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Linq.Beta System.Data.SQLite LINQ Beta - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a "beta" package and is not intended for production use. Support for LINQ using System.Data.SQLite. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.Linq.Test.nuspec ================================================================== --- NuGet/SQLite.Linq.Test.nuspec +++ NuGet/SQLite.Linq.Test.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Linq.Test System.Data.SQLite LINQ Test - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a pre-release package and is not intended for production use. Support for LINQ using System.Data.SQLite. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.Linq.nuspec ================================================================== --- NuGet/SQLite.Linq.nuspec +++ NuGet/SQLite.Linq.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Linq System.Data.SQLite LINQ - 1.0.102.0 + 1.0.103.0 SQLite Development Team Support for LINQ using System.Data.SQLite. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png Index: NuGet/SQLite.MSIL.Beta.nuspec ================================================================== --- NuGet/SQLite.MSIL.Beta.nuspec +++ NuGet/SQLite.MSIL.Beta.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.MSIL.Beta System.Data.SQLite (MSIL) Beta - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a "beta" package and is not intended for production use. This is a legacy package; if possible, please use either the "System.Data.SQLite.Beta" or "System.Data.SQLite.Core.Beta" package instead. An ADO.NET provider for SQLite (managed-only). en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png @@ -20,50 +20,50 @@ https://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Index: NuGet/SQLite.MSIL.Test.nuspec ================================================================== --- NuGet/SQLite.MSIL.Test.nuspec +++ NuGet/SQLite.MSIL.Test.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.MSIL.Test System.Data.SQLite (MSIL) Test - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a pre-release package and is not intended for production use. This is a legacy package; if possible, please use either the "System.Data.SQLite.Test" or "System.Data.SQLite.Core.Test" package instead. An ADO.NET provider for SQLite (managed-only). en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png @@ -20,50 +20,50 @@ https://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Index: NuGet/SQLite.MSIL.nuspec ================================================================== --- NuGet/SQLite.MSIL.nuspec +++ NuGet/SQLite.MSIL.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.MSIL System.Data.SQLite (MSIL) - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a legacy package; if possible, please use either the "System.Data.SQLite" or "System.Data.SQLite.Core" package instead. An ADO.NET provider for SQLite (managed-only). en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png @@ -20,50 +20,50 @@ https://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Index: NuGet/SQLite.Test.nuspec ================================================================== --- NuGet/SQLite.Test.nuspec +++ NuGet/SQLite.Test.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Test System.Data.SQLite (x86/x64) Test - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a pre-release package and is not intended for production use. The official SQLite database engine for both x86 and x64 along with the ADO.NET provider. This package includes support for LINQ and Entity Framework 6. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png @@ -20,50 +20,50 @@ https://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Index: NuGet/SQLite.nuspec ================================================================== --- NuGet/SQLite.nuspec +++ NuGet/SQLite.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite System.Data.SQLite (x86/x64) - 1.0.102.0 + 1.0.103.0 SQLite Development Team The official SQLite database engine for both x86 and x64 along with the ADO.NET provider. This package includes support for LINQ and Entity Framework 6. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png @@ -20,50 +20,50 @@ https://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Index: NuGet/SQLite.x64.nuspec ================================================================== --- NuGet/SQLite.x64.nuspec +++ NuGet/SQLite.x64.nuspec @@ -8,11 +8,11 @@ * --> System.Data.SQLite.x64 - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a legacy package; if possible, please use either the "System.Data.SQLite" or "System.Data.SQLite.Core" package instead. The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly for x64. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png @@ -19,35 +19,35 @@ https://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Index: NuGet/SQLite.x86.nuspec ================================================================== --- NuGet/SQLite.x86.nuspec +++ NuGet/SQLite.x86.nuspec @@ -8,11 +8,11 @@ * --> System.Data.SQLite.x86 - 1.0.102.0 + 1.0.103.0 SQLite Development Team This is a legacy package; if possible, please use either the "System.Data.SQLite" or "System.Data.SQLite.Core" package instead. The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly for x86. en-US https://system.data.sqlite.org/ https://system.data.sqlite.org/images/sqlite128.png @@ -19,35 +19,35 @@ https://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Index: SQLite.Designer/AssemblyInfo.cs ================================================================== --- SQLite.Designer/AssemblyInfo.cs +++ SQLite.Designer/AssemblyInfo.cs @@ -41,7 +41,7 @@ // Build Number // Revision // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.102.0")] -[assembly: AssemblyFileVersion("1.0.102.0")] +[assembly: AssemblyVersion("1.0.103.0")] +[assembly: AssemblyFileVersion("1.0.103.0")] Index: SQLite.Designer/source.extension.vsixmanifest ================================================================== --- SQLite.Designer/source.extension.vsixmanifest +++ SQLite.Designer/source.extension.vsixmanifest @@ -1,11 +1,11 @@ System.Data.SQLite Designer https://system.data.sqlite.org/ - 1.0.102.0 + 1.0.103.0 ADO.NET Data Designer for SQLite 1033 false Index: SQLite.Interop/props/SQLite.Interop.2005.vsprops ================================================================== --- SQLite.Interop/props/SQLite.Interop.2005.vsprops +++ SQLite.Interop/props/SQLite.Interop.2005.vsprops @@ -17,26 +17,26 @@ Value="2005" PerformEnvironmentSet="true" /> 2010 - 102 + 103 1.0 - 1.0.102.0 - 1,0,102,0 + 1.0.103.0 + 1,0,103,0 src\core INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1 INTEROP_PLACEHOLDER=1;INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1;INTEROP_VIRTUAL_TABLE=1;INTEROP_FTS5_EXTENSION=1;INTEROP_PERCENTILE_EXTENSION=1;INTEROP_TOTYPE_EXTENSION=1;INTEROP_REGEXP_EXTENSION=1;INTEROP_JSON1_EXTENSION=1 Index: SQLite.Interop/props/SQLite.Interop.2012.props ================================================================== --- SQLite.Interop/props/SQLite.Interop.2012.props +++ SQLite.Interop/props/SQLite.Interop.2012.props @@ -8,14 +8,14 @@ * --> 2012 - 102 + 103 1.0 - 1.0.102.0 - 1,0,102,0 + 1.0.103.0 + 1,0,103,0 src\core INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1 INTEROP_PLACEHOLDER=1;INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1;INTEROP_VIRTUAL_TABLE=1;INTEROP_FTS5_EXTENSION=1;INTEROP_PERCENTILE_EXTENSION=1;INTEROP_TOTYPE_EXTENSION=1;INTEROP_REGEXP_EXTENSION=1;INTEROP_JSON1_EXTENSION=1 Index: SQLite.Interop/props/SQLite.Interop.2013.props ================================================================== --- SQLite.Interop/props/SQLite.Interop.2013.props +++ SQLite.Interop/props/SQLite.Interop.2013.props @@ -8,14 +8,14 @@ * --> 2013 - 102 + 103 1.0 - 1.0.102.0 - 1,0,102,0 + 1.0.103.0 + 1,0,103,0 src\core INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1 INTEROP_PLACEHOLDER=1;INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1;INTEROP_VIRTUAL_TABLE=1;INTEROP_FTS5_EXTENSION=1;INTEROP_PERCENTILE_EXTENSION=1;INTEROP_TOTYPE_EXTENSION=1;INTEROP_REGEXP_EXTENSION=1;INTEROP_JSON1_EXTENSION=1 Index: SQLite.Interop/props/SQLite.Interop.2015.props ================================================================== --- SQLite.Interop/props/SQLite.Interop.2015.props +++ SQLite.Interop/props/SQLite.Interop.2015.props @@ -8,14 +8,14 @@ * --> 2015 - 102 + 103 1.0 - 1.0.102.0 - 1,0,102,0 + 1.0.103.0 + 1,0,103,0 src\core INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1 INTEROP_PLACEHOLDER=1;INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1;INTEROP_VIRTUAL_TABLE=1;INTEROP_FTS5_EXTENSION=1;INTEROP_PERCENTILE_EXTENSION=1;INTEROP_TOTYPE_EXTENSION=1;INTEROP_REGEXP_EXTENSION=1;INTEROP_JSON1_EXTENSION=1 Index: SQLite.Interop/src/generic/interop.c ================================================================== --- SQLite.Interop/src/generic/interop.c +++ SQLite.Interop/src/generic/interop.c @@ -62,10 +62,11 @@ #define INTEROP_DEBUG_PREPARE (0x0020) #define INTEROP_DEBUG_PREPARE16 (0x0040) #define INTEROP_DEBUG_RESET (0x0080) #define INTEROP_DEBUG_CHANGES (0x0100) #define INTEROP_DEBUG_BREAK (0x0200) +#define INTEROP_DEBUG_BLOB_CLOSE (0x0400) #if defined(_MSC_VER) && defined(INTEROP_DEBUG) && \ (INTEROP_DEBUG & INTEROP_DEBUG_BREAK) #define sqlite3InteropBreak(a) { sqlite3InteropDebug("%s\n", (a)); __debugbreak(); } #else @@ -719,10 +720,27 @@ ret = sqlite3_backup_finish(p); #if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_BACKUP_FINISH) sqlite3InteropDebug("sqlite3_backup_finish_interop(): sqlite3_backup_finish(%p, %p, %p) returned %d.\n", pDestDb, pSrcDb, p, ret); #endif + + return ret; +} + +SQLITE_API int WINAPI sqlite3_blob_close_interop(sqlite3_blob *p) +{ + int ret; + +#if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_BLOB_CLOSE) + sqlite3InteropDebug("sqlite3_blob_close_interop(): calling sqlite3_blob_close(%p)...\n", p); +#endif + + ret = sqlite3_blob_close(p); + +#if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_BLOB_CLOSE) + sqlite3InteropDebug("sqlite3_blob_close_interop(): sqlite3_blob_close(%p) returned %d.\n", p, ret); +#endif return ret; } SQLITE_API int WINAPI sqlite3_reset_interop(sqlite3_stmt *stmt) Index: SQLite.Interop/src/generic/interop.h ================================================================== --- SQLite.Interop/src/generic/interop.h +++ SQLite.Interop/src/generic/interop.h @@ -4,11 +4,11 @@ * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! */ #ifndef INTEROP_VERSION -#define INTEROP_VERSION "1.0.102.0" +#define INTEROP_VERSION "1.0.103.0" #endif #ifndef INTEROP_SOURCE_ID #define INTEROP_SOURCE_ID "0000000000000000000000000000000000000000" #endif Index: Setup/data/verify.lst ================================================================== --- Setup/data/verify.lst +++ Setup/data/verify.lst @@ -556,10 +556,11 @@ System.Data.SQLite/Resources/SR.resx System.Data.SQLite/SQLite3.cs System.Data.SQLite/SQLite3_UTF16.cs System.Data.SQLite/SQLiteBackup.cs System.Data.SQLite/SQLiteBase.cs + System.Data.SQLite/SQLiteBlob.cs System.Data.SQLite/SQLiteCommand.cs System.Data.SQLite/SQLiteCommandBuilder.cs System.Data.SQLite/SQLiteConnection.cs System.Data.SQLite/SQLiteConnectionPool.cs System.Data.SQLite/SQLiteConnectionStringBuilder.cs Index: System.Data.SQLite.Linq/AssemblyInfo.cs ================================================================== --- System.Data.SQLite.Linq/AssemblyInfo.cs +++ System.Data.SQLite.Linq/AssemblyInfo.cs @@ -51,7 +51,7 @@ // Revision // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.102.0")] -[assembly: AssemblyFileVersion("1.0.102.0")] +[assembly: AssemblyVersion("1.0.103.0")] +[assembly: AssemblyFileVersion("1.0.103.0")] Index: System.Data.SQLite/AssemblyInfo.cs ================================================================== --- System.Data.SQLite/AssemblyInfo.cs +++ System.Data.SQLite/AssemblyInfo.cs @@ -70,9 +70,9 @@ // Build Number // Revision // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.102.0")] +[assembly: AssemblyVersion("1.0.103.0")] #if !PLATFORM_COMPACTFRAMEWORK -[assembly: AssemblyFileVersion("1.0.102.0")] +[assembly: AssemblyFileVersion("1.0.103.0")] #endif Index: System.Data.SQLite/SQLite3.cs ================================================================== --- System.Data.SQLite/SQLite3.cs +++ System.Data.SQLite/SQLite3.cs @@ -56,11 +56,11 @@ "b621ddff5d844727418956997f475eb829429e411aff3e93f97b70de698b972640925bdd44280df0" + "a25a843266973704137cbb0e7441c1fe7cae4e2440ae91ab8cde3933febcb1ac48dd33b40e13c421" + "d8215c18a4349a436dd499e3c385cc683015f886f6c10bd90115eb2bd61b67750839e3a19941dc9c"; #if !PLATFORM_COMPACTFRAMEWORK - internal const string DesignerVersion = "1.0.102.0"; + internal const string DesignerVersion = "1.0.103.0"; #endif ///

/// The opaque pointer returned to us by the sqlite provider ///

Index: System.Data.SQLite/SQLiteBase.cs ================================================================== --- System.Data.SQLite/SQLiteBase.cs +++ System.Data.SQLite/SQLiteBase.cs @@ -689,10 +689,36 @@ #endif if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, null); } } } + + internal static void CloseBlob(SQLiteConnectionHandle hdl, IntPtr blob) + { + if ((hdl == null) || (blob == IntPtr.Zero)) return; + + try + { + // do nothing. + } + finally /* NOTE: Thread.Abort() protection. */ + { +#if PLATFORM_COMPACTFRAMEWORK + lock (hdl.syncRoot) +#else + lock (hdl) +#endif + { +#if !SQLITE_STANDARD + SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_blob_close_interop(blob); +#else + SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_blob_close(blob); +#endif + if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, null); + } + } + } internal static void FinalizeStatement(SQLiteConnectionHandle hdl, IntPtr stmt) { if ((hdl == null) || (stmt == IntPtr.Zero)) return; @@ -1189,10 +1215,15 @@ /// parameter specified, fallback to using the database type name /// associated with the value. /// UseParameterDbTypeForTypeName = 0x2000000000, + ///

+ /// When returning column values, skip verifying their affinity. + ///

+ NoVerifyTypeAffinity = 0x4000000000, + ///

/// When binding parameter values or returning column values, always /// treat them as though they were plain text (i.e. no numeric, /// date/time, or other conversions should be attempted). ///

ADDED System.Data.SQLite/SQLiteBlob.cs Index: System.Data.SQLite/SQLiteBlob.cs ================================================================== --- /dev/null +++ System.Data.SQLite/SQLiteBlob.cs @@ -0,0 +1,344 @@ +/******************************************************** + * 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! + ********************************************************/ + +namespace System.Data.SQLite +{ + using System; + + ///

+ /// Represents a single SQL blob in SQLite. + ///

+ public sealed class SQLiteBlob : IDisposable + { + #region Private Data + ///

+ /// The underlying SQLite object this blob is bound to. + ///

+ internal SQLiteBase _sql; + + ///

+ /// The actual blob handle. + ///

+ internal SQLiteBlobHandle _sqlite_blob; + #endregion + + /////////////////////////////////////////////////////////////////////////////////////////////// + + #region Private Constructors + ///

+ /// Initializes the blob. + ///

+ /// The base SQLite object. + /// The blob handle. + private SQLiteBlob( + SQLiteBase sqlbase, + SQLiteBlobHandle blob + ) + { + _sql = sqlbase; + _sqlite_blob = blob; + } + #endregion + + /////////////////////////////////////////////////////////////////////////////////////////////// + + #region Static "Factory" Methods + public static SQLiteBlob Create( + SQLiteDataReader dataReader, + int i, + bool readOnly + ) + { + SQLiteConnection connection = SQLiteDataReader.GetConnection( + dataReader); + + if (connection == null) + throw new InvalidOperationException("Connection not available"); + + SQLite3 sqlite3 = connection._sql as SQLite3; + + 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."); + + long? rowId = dataReader.GetRowId(i); + + if (rowId == null) + throw new InvalidOperationException("No RowId is available"); + + SQLiteBlobHandle blob = null; + + try + { + // do nothing. + } + finally /* NOTE: Thread.Abort() protection. */ + { + IntPtr ptrBlob = IntPtr.Zero; + + SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_blob_open( + sqlite3._sql, SQLiteConvert.ToUTF8( + dataReader.GetDatabaseName(i)), SQLiteConvert.ToUTF8( + dataReader.GetTableName(i)), SQLiteConvert.ToUTF8( + dataReader.GetName(i)), (long)rowId, readOnly ? 0 : 1, + ref ptrBlob); + + if (rc != SQLiteErrorCode.Ok) + throw new SQLiteException(rc, null); + + blob = new SQLiteBlobHandle(handle, ptrBlob); + } + + SQLiteConnection.OnChanged(null, new ConnectionEventArgs( + SQLiteConnectionEventType.NewCriticalHandle, null, + null, null, dataReader, blob, null, new object[] { + typeof(SQLiteBlob), dataReader, i, readOnly })); + + return new SQLiteBlob(sqlite3, blob); + } + #endregion + + /////////////////////////////////////////////////////////////////////////////////////////////// + + #region Private Methods + ///

+ /// Throws an exception if the blob object does not appear to be open. + ///

+ private void CheckOpen() + { + if (_sqlite_blob == IntPtr.Zero) + throw new InvalidOperationException("Blob is not open"); + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + + ///

+ /// Throws an exception if an invalid read/write parameter is detected. + ///

+ /// + /// When reading, this array will be populated with the bytes read from + /// the underlying database blob. When writing, this array contains new + /// values for the specified portion of the underlying database blob. + /// + /// + /// The number of bytes to read or write. + /// + /// + /// The byte offset, relative to the start of the underlying database + /// blob, where the read or write operation will begin. + /// + private void VerifyParameters( + byte[] buffer, + int count, + int offset + ) + { + if (buffer == null) + throw new ArgumentNullException("buffer"); + + if (offset < 0) + throw new ArgumentException("Negative offset not allowed."); + + if (count < 0) + throw new ArgumentException("Negative count not allowed."); + + if (count > buffer.Length) + throw new ArgumentException("Buffer is too small."); + } + #endregion + + /////////////////////////////////////////////////////////////////////////////////////////////// + + #region Public Methods + ///

+ /// Retargets this object to an underlying database blob for a + /// different row; the database, table, and column remain exactly + /// the same. If this operation fails for any reason, this blob + /// object is automatically disposed. + ///

+ /// + /// The integer identifier for the new row. + /// + public void Reopen( + long rowId + ) + { + CheckDisposed(); + CheckOpen(); + + SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_blob_reopen( + _sqlite_blob, rowId); + + if (rc != SQLiteErrorCode.Ok) + { + Dispose(); + throw new SQLiteException(rc, null); + } + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + + ///

+ /// Queries the total number of bytes for the underlying database blob. + ///

+ /// + /// The total number of bytes for the underlying database blob. + /// + public int GetCount() + { + CheckDisposed(); + CheckOpen(); + + return UnsafeNativeMethods.sqlite3_blob_bytes(_sqlite_blob); + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + + ///

+ /// Reads data from the underlying database blob. + ///

+ /// + /// This array will be populated with the bytes read from the + /// underlying database blob. + /// + /// + /// The number of bytes to read. + /// + /// + /// The byte offset, relative to the start of the underlying + /// database blob, where the read operation will begin. + /// + public void Read( + byte[] buffer, + int count, + int offset + ) + { + CheckDisposed(); + CheckOpen(); + VerifyParameters(buffer, count, offset); + + SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_blob_read( + _sqlite_blob, buffer, count, offset); + + if (rc != SQLiteErrorCode.Ok) + throw new SQLiteException(rc, null); + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + + ///

+ /// Writes data into the underlying database blob. + ///

+ /// + /// This array contains the new values for the specified portion of + /// the underlying database blob. + /// + /// + /// The number of bytes to write. + /// + /// + /// The byte offset, relative to the start of the underlying + /// database blob, where the write operation will begin. + /// + public void Write( + byte[] buffer, + int count, + int offset + ) + { + CheckDisposed(); + CheckOpen(); + VerifyParameters(buffer, count, offset); + + SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_blob_write( + _sqlite_blob, buffer, count, offset); + + if (rc != SQLiteErrorCode.Ok) + throw new SQLiteException(rc, null); + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + + ///

+ /// Closes the blob, freeing the associated resources. + ///

+ public void Close() + { + Dispose(); + } + #endregion + + /////////////////////////////////////////////////////////////////////////////////////////////// + + #region IDisposable Members + ///

+ /// Disposes and finalizes the blob. + ///

+ 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(SQLiteBlob).Name); +#endif + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + + private void Dispose(bool disposing) + { + if (!disposed) + { + if (disposing) + { + //////////////////////////////////// + // dispose managed resources here... + //////////////////////////////////// + + if (_sqlite_blob != null) + { + _sqlite_blob.Dispose(); + _sqlite_blob = null; + } + + _sql = null; + } + + ////////////////////////////////////// + // release unmanaged resources here... + ////////////////////////////////////// + + disposed = true; + } + } + #endregion + + /////////////////////////////////////////////////////////////////////////////////////////////// + + #region Destructor + ~SQLiteBlob() + { + Dispose(false); + } + #endregion + } +} Index: System.Data.SQLite/SQLiteConnection.cs ================================================================== --- System.Data.SQLite/SQLiteConnection.cs +++ System.Data.SQLite/SQLiteConnection.cs @@ -22,11 +22,12 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// ///

/// This class represents a single value to be returned /// from the class via - /// its , + /// its , + /// , /// , /// , /// , /// , /// , @@ -46,10 +47,17 @@ /// method is unsuitable (e.g. null with a value type), an exception will /// be thrown. ///

public sealed class SQLiteDataReaderValue { + ///

+ /// The value to be returned from the + /// method -OR- null to + /// indicate an error. + ///

+ public SQLiteBlob BlobValue; + ///

/// The value to be returned from the /// method -OR- null to /// indicate an error. ///

@@ -150,17 +158,81 @@ public object Value; } ///////////////////////////////////////////////////////////////////////////////////////////////// + ///

+ /// This class represents the parameters that are provided + /// to the methods, with + /// the exception of the column index (provided separately). + ///

+ public abstract class SQLiteReadEventArgs : EventArgs + { + // nothing. + } + + ///////////////////////////////////////////////////////////////////////////////////////////////// + + ///

+ /// This class represents the parameters that are provided to + /// the method, with + /// the exception of the column index (provided separately). + ///

+ public class SQLiteReadBlobEventArgs : SQLiteReadEventArgs + { + #region Private Data + ///

+ /// Provides the underlying storage for the + /// property. + ///

+ private bool readOnly; + #endregion + + ///////////////////////////////////////////////////////////////////////// + + #region Private Constructors + ///

+ /// Constructs an instance of this class to pass into a user-defined + /// callback associated with the + /// method. + ///

+ /// + /// The value that was originally specified for the "readOnly" + /// parameter to the method. + /// + internal SQLiteReadBlobEventArgs( + bool readOnly + ) + { + this.readOnly = readOnly; + } + #endregion + + ///////////////////////////////////////////////////////////////////////// + + #region Public Properties + ///

+ /// The value that was originally specified for the "readOnly" + /// parameter to the method. + ///

+ public bool ReadOnly + { + get { return readOnly; } + set { readOnly = value; } + } + #endregion + } + + ///////////////////////////////////////////////////////////////////////////////////////////////// + ///

/// This class represents the parameters that are provided /// to the and /// methods, with /// the exception of the column index (provided separately). ///

- public class SQLiteReadArrayEventArgs : EventArgs + public class SQLiteReadArrayEventArgs : SQLiteReadEventArgs { #region Private Data ///

/// Provides the underlying storage for the /// property. @@ -342,10 +414,11 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// ///

/// This class represents the parameters and return values for the + /// , /// , /// , /// , /// , /// , @@ -358,11 +431,11 @@ /// , /// , /// , and /// methods. ///

- public class SQLiteReadValueEventArgs : EventArgs + public class SQLiteReadValueEventArgs : SQLiteReadEventArgs { #region Private Data ///

/// Provides the underlying storage for the /// property. @@ -369,13 +442,13 @@ ///

private string methodName; ///

/// Provides the underlying storage for the - /// property. + /// property. ///

- private SQLiteReadArrayEventArgs arrayEventArgs; + private SQLiteReadEventArgs extraEventArgs; ///

/// Provides the underlying storage for the /// property. ///

@@ -385,35 +458,37 @@ ///////////////////////////////////////////////////////////////////////// #region Private Constructors ///

/// Constructs a new instance of this class. Depending on the method - /// being called, the and/or + /// being called, the and/or /// parameters may be null. ///

/// /// The name of the method that was /// responsible for invoking this callback. /// - /// + /// /// If the or /// method is being called, /// this object will contain the array related parameters for that - /// method. + /// method. If the method is + /// being called, this object will contain the blob related parameters + /// for that method. /// /// /// This may be used by the callback to set the return value for the /// called method. /// internal SQLiteReadValueEventArgs( string methodName, - SQLiteReadArrayEventArgs arrayEventArgs, + SQLiteReadEventArgs extraEventArgs, SQLiteDataReaderValue value ) { this.methodName = methodName; - this.arrayEventArgs = arrayEventArgs; + this.extraEventArgs = extraEventArgs; this.value = value; } #endregion ///////////////////////////////////////////////////////////////////////// @@ -432,15 +507,17 @@ ///

/// If the or /// method is being called, /// this object will contain the array related parameters for that - /// method. + /// method. If the method is + /// being called, this object will contain the blob related parameters + /// for that method. ///

- public SQLiteReadArrayEventArgs ArrayEventArgs + public SQLiteReadEventArgs ExtraEventArgs { - get { return arrayEventArgs; } + get { return extraEventArgs; } } ///////////////////////////////////////////////////////////////////////// ///

@@ -538,11 +615,11 @@ /// public delegate void SQLiteReadValueCallback( SQLiteConvert convert, SQLiteDataReader dataReader, SQLiteConnectionFlags flags, - SQLiteReadValueEventArgs eventArgs, + SQLiteReadEventArgs eventArgs, string typeName, int index, object userData, out bool complete ); Index: System.Data.SQLite/SQLiteDataReader.cs ================================================================== --- System.Data.SQLite/SQLiteDataReader.cs +++ System.Data.SQLite/SQLiteDataReader.cs @@ -389,10 +389,13 @@ /// /// The index of the column to type-check /// The type we want to get out of the column private TypeAffinity VerifyType(int i, DbType typ) { + if ((_flags & SQLiteConnectionFlags.NoVerifyTypeAffinity) == SQLiteConnectionFlags.NoVerifyTypeAffinity) + return TypeAffinity.None; + TypeAffinity affinity = GetSQLiteType(_flags, i).Affinity; switch (affinity) { case TypeAffinity.Int64: @@ -445,11 +448,11 @@ /// skipped. If this is set to non-zero and the necessary return value /// is unavailable or unsuitable, an exception will be thrown. /// private void InvokeReadValueCallback( int index, - SQLiteReadValueEventArgs eventArgs, + SQLiteReadEventArgs eventArgs, out bool complete ) { complete = false; SQLiteConnectionFlags oldFlags = _flags; @@ -489,10 +492,74 @@ finally { _flags |= SQLiteConnectionFlags.UseConnectionReadValueCallbacks; } } + + ///

+ /// Attempts to query the integer identifier for the current row. This + /// will not work for tables that were created WITHOUT ROWID -OR- if the + /// query does not include the "rowid" column or one of its aliases -OR- + /// if the was not created with the + /// flag. + ///

+ /// + /// The integer identifier for the current row -OR- null if it could not + /// be determined. + /// + internal long? GetRowId(int i) + { + // CheckDisposed(); + VerifyForGet(); + + if (_keyInfo == null) + return null; + + int iRowId = _keyInfo.GetRowIdIndex( + GetDatabaseName(i), GetTableName(i)); + + if (iRowId == -1) + return null; + + return GetInt64(iRowId); + } + + ///

+ /// Retrieves the column as a object. + /// This will not work for tables that were created WITHOUT ROWID + /// -OR- if the query does not include the "rowid" column or one + /// of its aliases -OR- if the was + /// not created with the flag. + ///

+ /// The index of the column. + /// + /// Non-zero to open the blob object for read-only access. + /// + /// A new object. + public SQLiteBlob GetBlob(int i, bool readOnly) + { + CheckDisposed(); + VerifyForGet(); + + if ((_flags & SQLiteConnectionFlags.UseConnectionReadValueCallbacks) == SQLiteConnectionFlags.UseConnectionReadValueCallbacks) + { + SQLiteDataReaderValue value = new SQLiteDataReaderValue(); + bool complete; + + InvokeReadValueCallback(i, new SQLiteReadValueEventArgs( + "GetBlob", new SQLiteReadBlobEventArgs(readOnly), value), + out complete); + + if (complete) + return (SQLiteBlob)value.BlobValue; + } + + if (i >= PrivateVisibleFieldCount && _keyInfo != null) + return _keyInfo.GetBlob(i - PrivateVisibleFieldCount, readOnly); + + return SQLiteBlob.Create(this, i, readOnly); + } ///

/// Retrieves the column as a boolean value ///

/// The index of the column. @@ -1847,11 +1914,11 @@ /// unavailable, a null value will be returned. ///

/// /// The connection object -OR- null if it is unavailable. /// - private static SQLiteConnection GetConnection( + internal static SQLiteConnection GetConnection( SQLiteDataReader dataReader ) { try { Index: System.Data.SQLite/SQLiteKeyReader.cs ================================================================== --- System.Data.SQLite/SQLiteKeyReader.cs +++ System.Data.SQLite/SQLiteKeyReader.cs @@ -1,9 +1,9 @@ /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) - * + * * Released to the public domain, use at your own risk! ********************************************************/ namespace System.Data.SQLite { @@ -22,10 +22,11 @@ internal sealed class SQLiteKeyReader : IDisposable { private KeyInfo[] _keyInfo; private SQLiteStatement _stmt; private bool _isValid; + private RowIdInfo[] _rowIdInfo; ///

/// Used to support CommandBehavior.KeyInfo ///

private struct KeyInfo @@ -37,10 +38,20 @@ internal int rootPage; internal int cursor; internal KeyQuery query; internal int column; } + + ///

+ /// Used to keep track of the per-table RowId column metadata. + ///

+ private struct RowIdInfo + { + internal string databaseName; + internal string tableName; + internal int column; + } ///

/// A single sub-query for a given table/database. ///

private sealed class KeyQuery : IDisposable @@ -153,10 +164,11 @@ { Dictionary catalogs = new Dictionary(); Dictionary> tables = new Dictionary>(); List list; List keys = new List(); + List rowIds = new List(); // Record the statement so we can use it later for sync'ing _stmt = stmt; // Fetch all the attached databases on this connection @@ -201,11 +213,11 @@ { string table = pair.Value[i]; DataRow preferredRow = null; using (DataTable tbl = cnn.GetSchema("Indexes", new string[] { pair.Key, null, table })) { - // Loop twice. The first time looking for a primary key index, + // Loop twice. The first time looking for a primary key index, // the second time looking for a unique index for (int n = 0; n < 2 && preferredRow == null; n++) { foreach (DataRow row in tbl.Rows) { @@ -236,10 +248,15 @@ int cursor = stmt._sql.GetCursorForTable(stmt, database, rootPage); // Now enumerate the members of the index we're going to use using (DataTable indexColumns = cnn.GetSchema("IndexColumns", new string[] { pair.Key, null, table, (string)preferredRow["INDEX_NAME"] })) { + // + // NOTE: If this is actually a RowId (or alias), record that now. There should + // be exactly one index column in that case. + // + bool isRowId = (string)preferredRow["INDEX_NAME"] == "sqlite_master_PK_" + table; KeyQuery query = null; List cols = new List(); for (int x = 0; x < indexColumns.Rows.Count; x++) { @@ -255,10 +272,20 @@ if ((string)row[SchemaTableColumn.BaseColumnName] == columnName && (string)row[SchemaTableColumn.BaseTableName] == table && (string)row[SchemaTableOptionalColumn.BaseCatalogName] == pair.Key) { + if (isRowId) + { + RowIdInfo rowId = new RowIdInfo(); + + rowId.databaseName = pair.Key; + rowId.tableName = table; + rowId.column = (int)row[SchemaTableColumn.ColumnOrdinal]; + + rowIds.Add(rowId); + } indexColumns.Rows.RemoveAt(x); x--; addKey = false; break; } @@ -267,11 +294,11 @@ cols.Add(columnName); } // If the index is not a rowid alias, record all the columns // needed to make up the unique index and construct a SQL query for it - if ((string)preferredRow["INDEX_NAME"] != "sqlite_master_PK_" + table) + if (!isRowId) { // Whatever remains of the columns we need that make up the index that are not // already in the query need to be queried separately, so construct a subquery if (cols.Count > 0) { @@ -308,10 +335,37 @@ // Now we have all the additional columns we have to return in order to support // CommandBehavior.KeyInfo _keyInfo = new KeyInfo[keys.Count]; keys.CopyTo(_keyInfo); + + _rowIdInfo = new RowIdInfo[rowIds.Count]; + rowIds.CopyTo(_rowIdInfo); + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + + internal int GetRowIdIndex( + string databaseName, + string tableName + ) + { + if ((_rowIdInfo != null) && + (databaseName != null) && + (tableName != null)) + { + for (int i = 0; i < _rowIdInfo.Length; i++) + { + if (_rowIdInfo[i].databaseName == databaseName && + _rowIdInfo[i].tableName == tableName) + { + return _rowIdInfo[i].column; + } + } + } + + return -1; } /////////////////////////////////////////////////////////////////////////////////////////////// #region IDisposable Members @@ -460,10 +514,17 @@ { if (String.Compare(name, _keyInfo[n].columnName, StringComparison.OrdinalIgnoreCase) == 0) return n; } return -1; } + + internal SQLiteBlob GetBlob(int i, bool readOnly) + { + Sync(i); + if (_keyInfo[i].query != null) return _keyInfo[i].query._reader.GetBlob(_keyInfo[i].column, readOnly); + else throw new InvalidCastException(); + } internal bool GetBoolean(int i) { Sync(i); if (_keyInfo[i].query != null) return _keyInfo[i].query._reader.GetBoolean(_keyInfo[i].column); @@ -563,11 +624,11 @@ if (_keyInfo[i].query != null) return _keyInfo[i].query._reader.GetInt64(_keyInfo[i].column); else { long rowid = _stmt._sql.GetRowIdForCursor(_stmt, _keyInfo[i].cursor); if (rowid == 0) throw new InvalidCastException(); - return Convert.ToInt64(rowid); + return rowid; } } internal string GetString(int i) { Index: System.Data.SQLite/Targets/System.Data.SQLite.Files.targets ================================================================== --- System.Data.SQLite/Targets/System.Data.SQLite.Files.targets +++ System.Data.SQLite/Targets/System.Data.SQLite.Files.targets @@ -19,10 +19,11 @@ + Component Component Index: System.Data.SQLite/UnsafeNativeMethods.cs ================================================================== --- System.Data.SQLite/UnsafeNativeMethods.cs +++ System.Data.SQLite/UnsafeNativeMethods.cs @@ -55,10 +55,11 @@ // methods. // internal static int connectionCount; internal static int statementCount; internal static int backupCount; + internal static int blobCount; #endif #endregion ///////////////////////////////////////////////////////////////////////// @@ -1679,11 +1680,11 @@ // be used because it provides several workarounds to .NET Compact // Framework limitations important for proper operation of the core // System.Data.SQLite functionality (e.g. being able to bind // parameters and handle column values of types Int64 and Double). // - internal const string SQLITE_DLL = "SQLite.Interop.102.dll"; + internal const string SQLITE_DLL = "SQLite.Interop.103.dll"; #elif SQLITE_STANDARD // // NOTE: Otherwise, if the standard SQLite library is enabled, use it. // internal const string SQLITE_DLL = "sqlite3"; @@ -1801,10 +1802,13 @@ internal static extern SQLiteErrorCode sqlite3_finalize_interop(IntPtr stmt); [DllImport(SQLITE_DLL)] internal static extern SQLiteErrorCode sqlite3_backup_finish_interop(IntPtr backup); + [DllImport(SQLITE_DLL)] + internal static extern SQLiteErrorCode sqlite3_blob_close_interop(IntPtr blob); + [DllImport(SQLITE_DLL)] internal static extern SQLiteErrorCode sqlite3_open_interop(byte[] utf8Filename, byte[] vfsName, SQLiteOpenFlagsEnum flags, int extFuncs, ref IntPtr db); [DllImport(SQLITE_DLL)] internal static extern SQLiteErrorCode sqlite3_open16_interop(byte[] utf8Filename, byte[] vfsName, SQLiteOpenFlagsEnum flags, int extFuncs, ref IntPtr db); @@ -2775,10 +2779,52 @@ #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_blob_close(IntPtr blob); + +#if !PLATFORM_COMPACTFRAMEWORK + [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] +#else + [DllImport(SQLITE_DLL)] +#endif + internal static extern int sqlite3_blob_bytes(IntPtr blob); + +#if !PLATFORM_COMPACTFRAMEWORK + [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] +#else + [DllImport(SQLITE_DLL)] +#endif + internal static extern SQLiteErrorCode sqlite3_blob_open(IntPtr db, byte[] dbName, byte[] tblName, byte[] colName, long rowId, int flags, ref IntPtr ptrBlob); + +#if !PLATFORM_COMPACTFRAMEWORK + [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] +#else + [DllImport(SQLITE_DLL)] +#endif + internal static extern SQLiteErrorCode sqlite3_blob_read(IntPtr blob, [MarshalAs(UnmanagedType.LPArray)] byte[] buffer, int count, int offset); + +#if !PLATFORM_COMPACTFRAMEWORK + [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] +#else + [DllImport(SQLITE_DLL)] +#endif + internal static extern SQLiteErrorCode sqlite3_blob_reopen(IntPtr blob, long rowId); + +#if !PLATFORM_COMPACTFRAMEWORK + [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] +#else + [DllImport(SQLITE_DLL)] +#endif + internal static extern SQLiteErrorCode sqlite3_blob_write(IntPtr blob, [MarshalAs(UnmanagedType.LPArray)] byte[] buffer, int count, int offset); + #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif @@ -3846,10 +3892,180 @@ public int WasReleasedOk() { return Interlocked.Decrement(ref DebugData.backupCount); } #endif + + /////////////////////////////////////////////////////////////////////// + + public override bool IsInvalid + { + get + { +#if PLATFORM_COMPACTFRAMEWORK + lock (syncRoot) +#endif + { + return (handle == IntPtr.Zero); + } + } + } + + /////////////////////////////////////////////////////////////////////// + +#if DEBUG + public override string ToString() + { +#if PLATFORM_COMPACTFRAMEWORK + lock (syncRoot) +#endif + { + return handle.ToString(); + } + } +#endif + } + #endregion + + /////////////////////////////////////////////////////////////////////////// + + #region SQLiteBlobHandle Class + // Provides finalization support for unmanaged SQLite blob objects. + internal sealed class SQLiteBlobHandle : CriticalHandle + { +#if PLATFORM_COMPACTFRAMEWORK + internal readonly object syncRoot = new object(); +#endif + + /////////////////////////////////////////////////////////////////////// + + private SQLiteConnectionHandle cnn; + + /////////////////////////////////////////////////////////////////////// + + public static implicit operator IntPtr(SQLiteBlobHandle blob) + { + if (blob != null) + { +#if PLATFORM_COMPACTFRAMEWORK + lock (blob.syncRoot) +#endif + { + return blob.handle; + } + } + return IntPtr.Zero; + } + + /////////////////////////////////////////////////////////////////////// + + internal SQLiteBlobHandle(SQLiteConnectionHandle cnn, IntPtr blob) + : this() + { +#if PLATFORM_COMPACTFRAMEWORK + lock (syncRoot) +#endif + { + this.cnn = cnn; + SetHandle(blob); + } + } + + /////////////////////////////////////////////////////////////////////// + + private SQLiteBlobHandle() + : base(IntPtr.Zero) + { +#if COUNT_HANDLE + Interlocked.Increment(ref DebugData.blobCount); +#endif + } + + /////////////////////////////////////////////////////////////////////// + + protected override bool ReleaseHandle() + { + try + { +#if !PLATFORM_COMPACTFRAMEWORK + IntPtr localHandle = Interlocked.Exchange( + ref handle, IntPtr.Zero); + + if (localHandle != IntPtr.Zero) + SQLiteBase.CloseBlob(cnn, localHandle); + +#if !NET_COMPACT_20 && TRACE_HANDLE + try + { + Trace.WriteLine(HelperMethods.StringFormat( + CultureInfo.CurrentCulture, + "CloseBlob: {0}", localHandle)); /* throw */ + } + catch + { + } +#endif +#else + lock (syncRoot) + { + if (handle != IntPtr.Zero) + { + SQLiteBase.CloseBlob(cnn, handle); + SetHandle(IntPtr.Zero); + } + } +#endif +#if COUNT_HANDLE + Interlocked.Decrement(ref DebugData.blobCount); +#endif +#if DEBUG + return true; +#endif + } +#if !NET_COMPACT_20 && TRACE_HANDLE + catch (SQLiteException e) +#else + catch (SQLiteException) +#endif + { +#if !NET_COMPACT_20 && TRACE_HANDLE + try + { + Trace.WriteLine(HelperMethods.StringFormat( + CultureInfo.CurrentCulture, + "CloseBlob: {0}, exception: {1}", + handle, e)); /* throw */ + } + catch + { + } +#endif + } + finally + { +#if PLATFORM_COMPACTFRAMEWORK + lock (syncRoot) +#endif + { + SetHandleAsInvalid(); + } + } +#if DEBUG + return false; +#else + return true; +#endif + } + + /////////////////////////////////////////////////////////////////////// + +#if COUNT_HANDLE + public int WasReleasedOk() + { + return Interlocked.Decrement(ref DebugData.blobCount); + } +#endif /////////////////////////////////////////////////////////////////////// public override bool IsInvalid { Index: Tests/basic.eagle ================================================================== --- Tests/basic.eagle +++ Tests/basic.eagle @@ -4425,10 +4425,83 @@ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 1 \{SQL logic error or missing\ database -- no such function: REGEXP\} 1 \{SQL logic error or missing database\ -- no such function: REGEXP\} 0 \{\} 0 1 0 0 0 True 1 \{SQL logic error or\ missing database -- no such function: REGEXP\} 1 \{SQL logic error or missing\ database -- no such function: REGEXP\} 0 \{\}$}} + +############################################################################### + +runTest {test data-1.84 {GetBlob method and SQLiteBlob class} -setup { + proc getBytesAsList { bytes } { + set byteList [object create -alias ByteList $bytes] + return [$byteList ToString] + } + + setupDb [set fileName data-1.84.db] "" "" "" NoVerifyTypeAffinity +} -body { + sql execute $db { + CREATE TABLE t1(x INTEGER PRIMARY KEY, y); + INSERT INTO t1 (x, y) VALUES(1, 'nope'); + INSERT INTO t1 (x, y) VALUES(2, '1984'); + } + + set dataReader [sql execute -execute reader -format datareader \ + -behavior +KeyInfo -alias $db "SELECT x, y FROM t1;"] + + set size 4 + set bytes(1) [object create -alias Byte\[\] $size] + set bytes(2) [object create -alias Byte\[\] $size] + set result [list] + + while {[$dataReader Read]} { + set blob [$dataReader -alias GetBlob 1 false] + lappend result [$blob GetCount] + $blob Read $bytes(1) $size 0 + lappend result [getBytesAsList $bytes(1)] + + for {set i 0} {$i < $size} {incr i} { + set byte [$bytes(1) GetValue $i] + incr byte; set byte [object invoke -create Byte Parse $byte] + $bytes(1) SetValue $byte $i + } + + $blob Write $bytes(1) $size 0 + + if {[$dataReader GetInt64 0] == 1} then { + $blob Reopen 2 + $blob Read $bytes(2) $size 0 + lappend result [getBytesAsList $bytes(2)] + } + + $blob Close + } + + $dataReader Close; unset dataReader + + set dataReader [sql execute -execute reader -format datareader \ + -alias $db "SELECT x, y FROM t1;"] + + while {[$dataReader Read]} { + lappend result [$dataReader GetInt64 0] + lappend result [$dataReader GetString 0] + lappend result [$dataReader GetInt64 1] + lappend result [$dataReader GetString 1] + } + + set result +} -cleanup { + unset -nocomplain blob + unset -nocomplain dataReader + + cleanupDb $fileName + + unset -nocomplain byte i bytes size result db fileName + + rename getBytesAsList "" +} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ +System.Data.SQLite} -result {4 {110 111 112 101} {49 57 56 52} 4 {49 57 56 52}\ +1 1 0 opqf 2 2 2 2:95}} ############################################################################### reportSQLiteResources $test_channel Index: Tests/types.eagle ================================================================== --- Tests/types.eagle +++ Tests/types.eagle @@ -110,26 +110,27 @@ set readArgs [list \ convert dataReader flags eventArgs typeName index userData \ completeVarName] set params [list \ - [list Boolean GetBoolean false BooleanValue true 0] \ - [list Byte GetByte false ByteValue true 0] \ - [list Byte GetBytes true BytesValue false 0] \ - [list Char GetChar false CharValue true 0] \ - [list Char GetChars true CharsValue false 0] \ - [list DateTime GetDateTime false DateTimeValue true 0] \ - [list Decimal GetDecimal false DecimalValue true 0] \ - [list Double GetDouble false DoubleValue true 0] \ - [list Single GetFloat false FloatValue true 0] \ - [list Guid GetGuid false GuidValue true \ + [list Boolean GetBoolean false BooleanValue true 0] \ + [list Byte GetByte false ByteValue true 0] \ + [list Byte GetBytes true BytesValue false 0] \ + [list Char GetChar false CharValue true 0] \ + [list Char GetChars true CharsValue false 0] \ + [list DateTime GetDateTime false DateTimeValue true 0] \ + [list Decimal GetDecimal false DecimalValue true 0] \ + [list Double GetDouble false DoubleValue true 0] \ + [list Single GetFloat false FloatValue true 0] \ + [list Guid GetGuid false GuidValue true \ 00000000-0000-0000-0000-000000000000] \ - [list Int16 GetInt16 false Int16Value true 0] \ - [list Int32 GetInt32 false Int32Value true 0] \ - [list Int64 GetInt64 false Int64Value true 0] \ - [list String GetString false StringValue false null] \ - [list Object GetValue false Value false null]] + [list Int16 GetInt16 false Int16Value true 0] \ + [list Int32 GetInt32 false Int32Value true 0] \ + [list Int64 GetInt64 false Int64Value true 0] \ + [list String GetString false StringValue false null] \ + [list Object GetValue false Value false null] \ + [list SDS.SQLiteBlob GetBlob false BlobValue false 0]] ############################################################################### set expectedResults [list \ {False False True False False False False False} \ @@ -165,11 +166,15 @@ " three \x04\x05\x06\ {2016-06-19 19:50:04.1234567}\ 74f1f402-ddef-4027-a78f-3847fa97b830" \ {{} 0 1 1.2 three {4 5 6} {2016-06-19\ 19:50:04.1234567}\ - 74f1f402-ddef-4027-a78f-3847fa97b830}] + 74f1f402-ddef-4027-a78f-3847fa97b830} \ + {System.Data.SQLite.SQLiteBlob System.Data.SQLite.SQLiteBlob\ + System.Data.SQLite.SQLiteBlob System.Data.SQLite.SQLiteBlob\ + System.Data.SQLite.SQLiteBlob System.Data.SQLite.SQLiteBlob\ + System.Data.SQLite.SQLiteBlob System.Data.SQLite.SQLiteBlob}] ############################################################################### set savedDateTimeFormat [object invoke Interpreter.GetActive DateTimeFormat] if {![isObjectHandle $savedDateTimeFormat]} then {set savedDateTimeFormat null} @@ -180,24 +185,25 @@ for {set i 0} {$i < [llength $params]} {incr i} { foreach { typeName methodName isArray propertyName isRequired value } [lindex $params $i] break + set typeName [string map [list SDS. System.Data.SQLite.] $typeName] set expectedResult [lindex $expectedResults $i] ############################################################################# proc readValueCallback2 $readArgs [subst { if {$isArray} then { if {\[catch { - set dataOffset \[\$eventArgs ArrayEventArgs.DataOffset\] + set dataOffset \[\$eventArgs ExtraEventArgs.DataOffset\] - set buffer \[\$eventArgs -create [appendArgs ArrayEventArgs. \ + set buffer \[\$eventArgs -create [appendArgs ExtraEventArgs. \ $typeName Buffer]\] - set bufferOffset \[\$eventArgs ArrayEventArgs.BufferOffset\] - set length \[\$eventArgs ArrayEventArgs.Length\] + set bufferOffset \[\$eventArgs ExtraEventArgs.BufferOffset\] + set length \[\$eventArgs ExtraEventArgs.Length\] set readValue \[\$dataReader \[\$eventArgs MethodName\] \ \$index \$dataOffset \$buffer \$bufferOffset \$length\] \$eventArgs \[appendArgs Value. $propertyName\] \$readValue @@ -211,23 +217,28 @@ set buffer \[object invoke -create -alias \ System.Text.Encoding.UTF8 GetBytes \$readValue\] } \$eventArgs \[appendArgs Value. $propertyName\] \$buffer - \$eventArgs ArrayEventArgs.Length \[\$buffer Length\] + \$eventArgs ExtraEventArgs.Length \[\$buffer Length\] } else { - set buffer \[\$eventArgs -create [appendArgs ArrayEventArgs. \ + set buffer \[\$eventArgs -create [appendArgs ExtraEventArgs. \ $typeName Buffer]\] \$eventArgs \[appendArgs Value. $propertyName\] \$buffer } } else { if {\[catch { - set readValue \[\$dataReader \[\$eventArgs MethodName\] \$index\] + if {"$typeName" eq "System.Data.SQLite.SQLiteBlob"} then { + set readValue \[object create -flags +NonPublic $typeName \ + null null\] + } else { + set readValue \[\$dataReader \[\$eventArgs MethodName\] \$index\] - if {"$typeName" eq "Char"} then { - set readValue \[object invoke -create Char Parse \$readValue\] + if {"$typeName" eq "Char"} then { + set readValue \[object invoke -create Char Parse \$readValue\] + } } \$eventArgs \[appendArgs Value. $propertyName\] \$readValue } error\]} then { \$eventArgs \[appendArgs Value. $propertyName\] {$value} @@ -294,11 +305,15 @@ } else { lappend result [list error(array) $::errorCode] } } else { if {[catch { - $dataReader $methodName 0 + if {$typeName eq "System.Data.SQLite.SQLiteBlob"} then { + $dataReader $methodName 0 true; # read-only + } else { + $dataReader $methodName 0 + } } value] == 0} then { if {$value eq "\x00"} then { lappend result } else { lappend result [getStringFromObjectHandle $value] Index: Tests/version.eagle ================================================================== --- Tests/version.eagle +++ Tests/version.eagle @@ -29,11 +29,11 @@ # the source code files, the built binaries, and the release packages. # The revision number is reserved for NuGet package versioning. # set version(major) 1 set version(minor) 0 -set version(build) 102; # NOTE: Incremented with each release. +set version(build) 103; # NOTE: Incremented with each release. set version(revision) 0 ############################################################################### # Index: lib/System.Data.SQLite/common.eagle ================================================================== --- lib/System.Data.SQLite/common.eagle +++ lib/System.Data.SQLite/common.eagle @@ -3166,11 +3166,12 @@ if {[haveSQLiteObjectCommand] && \ [haveSQLiteDefineConstant COUNT_HANDLE]} then { # # NOTE: Add each critical handle count to the resulting list. # - foreach name [list connectionCount statementCount backupCount] { + foreach name [list \ + connectionCount statementCount backupCount blobCount] { if {[catch { object invoke -flags +NonPublic \ System.Data.SQLite.DebugData $name } value] == 0} then { if {!$quiet} then { Index: readme.htm ================================================================== --- readme.htm +++ readme.htm @@ -3,11 +3,11 @@ ADO.NET SQLite Data Provider
-Version 1.0.102.0 - June 23, 2016
+Version 1.0.103.0 - August XX, 2016 (release scheduled)
Using SQLite 3.13.0
Originally written by Robert Simpson
Released to the public domain, use at your own risk!
Official provider website: https://system.data.sqlite.org/
Legacy versions: http://sqlite.phxsoftware.com/
@@ -144,11 +144,11 @@ <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" - type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> + type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.103.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> </configuration>

@@ -206,10 +206,20 @@ released versions of System.Data.SQLite.

Version History

+ 1.0.103.0 - August XX, 2016 (release scheduled) +

Change the SQLiteReadValueCallback delegate "eventArgs" parameter to be of type SQLiteReadEventArgs. ** Potentially Incompatible Change **
Make SQLiteReadValueEventArgs and SQLiteReadArrayEventArgs derive from SQLiteReadEventArgs. ** Potentially Incompatible Change **
Rename SQLiteReadValueEventArgs.ArrayEventArgs property to ExtraEventArgs. ** Potentially Incompatible Change **
Add NoVerifyTypeAffinity connection flag to disable all type affinity checking.
Add support for incremental blob I/O.

1.0.102.0 - June 23, 2016

Updated to SQLite 3.13.0.

- +

- + Index: testlinq/2010/EF6/App.config ================================================================== --- testlinq/2010/EF6/App.config +++ testlinq/2010/EF6/App.config @@ -4,17 +4,17 @@

- + - + Index: testlinq/2010/LINQ/App.config ================================================================== --- testlinq/2010/LINQ/App.config +++ testlinq/2010/LINQ/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/2012/EF6/App.config ================================================================== --- testlinq/2012/EF6/App.config +++ testlinq/2012/EF6/App.config @@ -4,17 +4,17 @@

- + - + Index: testlinq/2012/LINQ/App.config ================================================================== --- testlinq/2012/LINQ/App.config +++ testlinq/2012/LINQ/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/2013/EF6/App.config ================================================================== --- testlinq/2013/EF6/App.config +++ testlinq/2013/EF6/App.config @@ -4,17 +4,17 @@

- + - + Index: testlinq/2013/LINQ/App.config ================================================================== --- testlinq/2013/LINQ/App.config +++ testlinq/2013/LINQ/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/2015/EF6/App.config ================================================================== --- testlinq/2015/EF6/App.config +++ testlinq/2015/EF6/App.config @@ -4,17 +4,17 @@

- + - + Index: testlinq/2015/LINQ/App.config ================================================================== --- testlinq/2015/LINQ/App.config +++ testlinq/2015/LINQ/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/Properties/AssemblyInfo.cs ================================================================== --- testlinq/Properties/AssemblyInfo.cs +++ testlinq/Properties/AssemblyInfo.cs @@ -44,7 +44,7 @@ // Revision // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.102.0")] -[assembly: AssemblyFileVersion("1.0.102.0")] +[assembly: AssemblyVersion("1.0.103.0")] +[assembly: AssemblyFileVersion("1.0.103.0")] Index: tools/install/Properties/AssemblyInfo.cs ================================================================== --- tools/install/Properties/AssemblyInfo.cs +++ tools/install/Properties/AssemblyInfo.cs @@ -26,7 +26,7 @@ // Major Version // Minor Version // Build Number // Revision // -[assembly: AssemblyVersion("1.0.102.0")] -[assembly: AssemblyFileVersion("1.0.102.0")] +[assembly: AssemblyVersion("1.0.103.0")] +[assembly: AssemblyFileVersion("1.0.103.0")] Index: www/news.wiki ================================================================== --- www/news.wiki +++ www/news.wiki @@ -1,9 +1,19 @@ News Version History +

+ 1.0.103.0 - August XX, 2016 (release scheduled) +

Change the SQLiteReadValueCallback delegate "eventArgs" parameter to be of type SQLiteReadEventArgs. ** Potentially Incompatible Change **
Make SQLiteReadValueEventArgs and SQLiteReadArrayEventArgs derive from SQLiteReadEventArgs. ** Potentially Incompatible Change **
Rename SQLiteReadValueEventArgs.ArrayEventArgs property to ExtraEventArgs. ** Potentially Incompatible Change **
Add NoVerifyTypeAffinity connection flag to disable all type affinity checking.
Add support for [https://www.sqlite.org/c3ref/blob_open.html|incremental blob I/O].

1.0.102.0 - June 23, 2016

Updated to [https://www.sqlite.org/releaselog/3_13_0.html|SQLite 3.13.0].