Index: SQLite.Designer/AssemblyInfo.cs
==================================================================
--- SQLite.Designer/AssemblyInfo.cs
+++ SQLite.Designer/AssemblyInfo.cs
@@ -30,10 +30,10 @@
// 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.24.4")]
-[assembly: AssemblyFileVersion("1.0.24.4")]
+[assembly: AssemblyVersion("1.0.24.5")]
+[assembly: AssemblyFileVersion("1.0.24.5")]
[assembly:AssemblyDelaySignAttribute(false)]
[assembly:AssemblyKeyFileAttribute("..\\System.Data.SQLite\\System.Data.SQLite.snk")]
[assembly:AssemblyKeyNameAttribute("")]
Index: SQLite.Interop/SQLite.Interop.rc
==================================================================
--- SQLite.Interop/SQLite.Interop.rc
+++ SQLite.Interop/SQLite.Interop.rc
@@ -51,11 +51,11 @@
//
// Version
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,24,4
+ FILEVERSION 1,0,24,5
PRODUCTVERSION 1,0,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
@@ -69,14 +69,14 @@
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/sqlite-dotnet2"
VALUE "FileDescription", "SQLite.NET Interop Library"
- VALUE "FileVersion", "1.0.24.4"
+ VALUE "FileVersion", "1.0.24.5"
VALUE "InternalName", "SQLite.Interop.DLL"
VALUE "LegalCopyright", "Released to the public domain"
- VALUE "OriginalFilename", "SQLite3.DLL CVS HEAD"
+ VALUE "OriginalFilename", "SQLite3.DLL 3.3.1 alpha"
VALUE "ProductName", "SQLite.NET"
VALUE "ProductVersion", "1.0"
END
END
BLOCK "VarFileInfo"
Index: SQLite.Interop/SQLite.Interop.vcproj
==================================================================
--- SQLite.Interop/SQLite.Interop.vcproj
+++ SQLite.Interop/SQLite.Interop.vcproj
@@ -61,11 +61,10 @@
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
FloatingPointModel="2"
RuntimeTypeInfo="false"
- DebugInformationFormat="3"
/>
@@ -189,10 +183,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -549,10 +907,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: SQLite.Interop/fixsource.vbs
==================================================================
--- SQLite.Interop/fixsource.vbs
+++ SQLite.Interop/fixsource.vbs
@@ -10,10 +10,12 @@
Dim srcFile
Dim srcFileContents
dim newFileContents
+ ' Changes the name of the function so we can get first crack at it in interop.h to provide GetSchemaTable() support
+ '
Set srcFile = fso.OpenTextFile("src\select.c", 1)
srcFileContents = srcFile.ReadAll()
srcFile.Close()
newFileContents = Replace(srcFileContents, "static void generateColumnNames(", "static void _generateColumnNames(")
If (newFileContents <> srcFileContents) Then
@@ -20,11 +22,13 @@
WScript.StdOut.WriteLine "Updating select.c"
Set srcFile = fso.CreateTextFile("src\select.c", true)
srcFile.Write(newFileContents)
srcFile.Close()
End If
-
+
+ ' SQLite supports : and $ for named parameters, but we add support for @ as well here
+ '
Set srcFile = fso.OpenTextFile("src\tokenize.c", 1)
srcFileContents = srcFile.ReadAll()
srcFile.Close()
If InStr(1, srcFileContents, " case '@':", 1) = 0 Then
newFileContents = Replace(srcFileContents, " case ':': {", " case '@':" & Chr(10) & " case ':': {")
@@ -34,10 +38,13 @@
srcFile.Write(newFileContents)
srcFile.Close()
End If
End If
+ ' In order to support encryption, we need to know when the pager is being destroyed so we can destroy our encryption
+ ' objects. This modification adds code to support that.
+ '
Set srcFile = fso.OpenTextFile("src\pager.c", 1)
srcFileContents = srcFile.ReadAll()
srcFile.Close()
If InStr(1, srcFileContents, "sqlite3pager_free_codecarg", 1) = 0 Then
newFileContents = Replace(srcFileContents, Chr(10) & " sqliteFree(pPager);", Chr(10) & "#ifdef SQLITE_HAS_CODEC" & Chr(10) & " sqlite3pager_free_codecarg(pPager->pCodecArg);" & Chr(10) & "#endif" & Chr(10) & " sqliteFree(pPager);")
Index: SQLite.Interop/interop.c
==================================================================
--- SQLite.Interop/interop.c
+++ SQLite.Interop/interop.c
@@ -5,10 +5,14 @@
*/
#include "src/sqliteint.h"
#include "src\os.h"
+
+#if _WIN32_WCE && NDEBUG
+#include "merge.h"
+#endif
// Forward declare this function, we're implementing it later
static void generateColumnNames(
Parse *pParse, /* Parser context */
SrcList *pTabList, /* List of tables */
Index: System.Data.SQLite/AssemblyInfo.cs
==================================================================
--- System.Data.SQLite/AssemblyInfo.cs
+++ System.Data.SQLite/AssemblyInfo.cs
@@ -37,9 +37,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.24.4")]
+[assembly: AssemblyVersion("1.0.24.5")]
#if !PLATFORM_COMPACTFRAMEWORK
-[assembly: AssemblyFileVersion("1.0.24.4")]
+[assembly: AssemblyFileVersion("1.0.24.5")]
#endif
ADDED System.Data.SQLite/System.Data.SQLite
Index: System.Data.SQLite/System.Data.SQLite
==================================================================
--- System.Data.SQLite/System.Data.SQLite
+++ System.Data.SQLite/System.Data.SQLite
@@ -0,0 +1,98 @@
+
+
+ Debug
+ AnyCPU
+ 8.0.50727
+ 2.0
+ {AC139952-261A-4463-B6FA-AEBC25283A66}
+ Library
+ Properties
+ System.Data.SQLite
+ System.Data.SQLite
+ v2.0
+ true
+ System.Data.SQLite.snk
+ OnOutputUpdated
+
+
+ true
+ full
+ false
+ ..\bin\
+ TRACE;DEBUG;USE_INTEROP_DLL
+ prompt
+ 4
+
+
+ off
+
+
+
+
+
+
+
+
+
+
+
+
+ Component
+
+
+ Component
+
+
+ Component
+
+
+
+
+ Component
+
+
+
+
+
+
+
+
+
+
+
+ SR.resx
+ True
+ True
+
+
+
+
+
+ Designer
+ ResXFileCodeGenerator
+ SR.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
DELETED System.Data.SQLite/System.Data.SQLite.IA64.snk
Index: System.Data.SQLite/System.Data.SQLite.IA64.snk
==================================================================
--- System.Data.SQLite/System.Data.SQLite.IA64.snk
+++ System.Data.SQLite/System.Data.SQLite.IA64.snk
cannot compute difference between binary files
DELETED System.Data.SQLite/System.Data.SQLite.X64.snk
Index: System.Data.SQLite/System.Data.SQLite.X64.snk
==================================================================
--- System.Data.SQLite/System.Data.SQLite.X64.snk
+++ System.Data.SQLite/System.Data.SQLite.X64.snk
cannot compute difference between binary files
DELETED System.Data.SQLite/System.Data.SQLite.csproj
Index: System.Data.SQLite/System.Data.SQLite.csproj
==================================================================
--- System.Data.SQLite/System.Data.SQLite.csproj
+++ System.Data.SQLite/System.Data.SQLite.csproj
@@ -1,126 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {AC139951-261A-4463-B6FA-AEBC25283A66}
- Library
- Properties
- System.Data.SQLite
- System.Data.SQLite
- {4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- PocketPC
- 3C41C503-53EF-4c2a-8DD4-A8217CAD115E
- 4.20
- v2.0
-
-
- true
- System.Data.SQLite.CF.snk
- testce
- %25CSIDL_PROGRAM_FILES%25
-
-
- true
- full
- false
- ..\bin\CompactFramework\
- TRACE;DEBUG;PocketPC;PLATFORM_COMPACTFRAMEWORK
- true
- true
- prompt
- 512
- 4
- ..\Doc\System.Data.SQLite.XML
- off
-
-
- none
- true
- ..\bin\CompactFramework\
- PocketPC;PLATFORM_COMPACTFRAMEWORK
- true
- true
- prompt
- 512
- 4
- Off
- false
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
-
-
-
- Component
-
-
- Component
-
-
- Component
-
-
-
-
- Component
-
-
-
-
-
-
-
-
-
-
-
- SR.resx
- True
- True
-
-
-
-
-
- Designer
- ResXFileCodeGenerator
- SR.Designer.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: System.Data.SQLite/UnsafeNativeMethods.cs
==================================================================
--- System.Data.SQLite/UnsafeNativeMethods.cs
+++ System.Data.SQLite/UnsafeNativeMethods.cs
@@ -14,11 +14,11 @@
#if !PLATFORM_COMPACTFRAMEWORK
[SuppressUnmanagedCodeSecurity]
#endif
internal sealed class UnsafeNativeMethods
{
-#if !PLATFORM_COMPACTFRAMEWORK && !USE_INTEROP_DLL
+#if !USE_INTEROP_DLL
private const string SQLITE_DLL = "System.Data.SQLite.DLL";
#else
private const string SQLITE_DLL = "SQLite.Interop.DLL";
#endif
ADDED bin/CompactFramework/System.Data.SQLite.DLL
Index: bin/CompactFramework/System.Data.SQLite.DLL
==================================================================
--- bin/CompactFramework/System.Data.SQLite.DLL
+++ bin/CompactFramework/System.Data.SQLite.DLL
cannot compute difference between binary files
Index: testce/testce.csproj
==================================================================
--- testce/testce.csproj
+++ testce/testce.csproj
@@ -81,13 +81,14 @@
Form1.cs
Designer
-
+
{AC139951-261A-4463-B6FA-AEBC25283A66}
- System.Data.SQLite
+ System.Data.SQLite - Compact
+ False