System.Data.SQLite: Check-in [5759e099be]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Allow opened connections to skip adding the extension functions included in the interop assembly. Support loading of SQLite extensions. Add more notifications that use the new static Changed event. Miscellaneous comment cleanup. Cleanup usage of compile-time options for the .NET Framework version. Fix argument checking for the batch file tools.
Downloads:	Tarball \| ZIP archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	5759e099bedb9eae940972d97ecc79d91b328d7d
User & Date:	mistachkin 2012-09-20 11:53:22.760

References

2012-09-20
11:56		• Closed ticket [17045010df]: Add SpatialLite extension support. plus 4 other changes artifact: 096add573c user: mistachkin

Context

2012-09-20
12:04		Explicitly add support for the .NET Framework 4.5 to the managed compile-time defines. check-in: c008d0ccd6 user: mistachkin tags: trunk
11:53		Allow opened connections to skip adding the extension functions included in the interop assembly. Support loading of SQLite extensions. Add more notifications that use the new static Changed event. Miscellaneous comment cleanup. Cleanup usage of compile-time options for the .NET Framework version. Fix argument checking for the batch file tools. check-in: 5759e099be user: mistachkin tags: trunk
02:39		Fire notification events before a connection is opened or closed. Enhance documentation comments to that include references. Workaround issue in NDoc3 to allow project reference links to be resolved correctly. check-in: 69f6030c7f user: mistachkin tags: trunk

Changes

Changes to Doc/Extra/version.html.

Changes to Membership/SQLiteProvider.2008.csproj.

Changes to Membership/SQLiteProvider.2010.csproj.

Changes to Membership/SQLiteProvider.2012.csproj.

Changes to SQLite.Designer/SQLite.Designer.2008.csproj.

Changes to SQLite.Designer/SQLite.Designer.2010.csproj.

Changes to SQLite.Designer/SQLite.Designer.2012.csproj.

Changes to SQLite.Interop/SQLite.Interop.2005.vcproj.

Changes to SQLite.Interop/SQLite.Interop.2008.vcproj.

Changes to SQLite.Interop/SQLite.Interop.2010.vcxproj.

Changes to SQLite.Interop/SQLite.Interop.2012.vcxproj.

Changes to SQLite.Interop/SQLite.Interop.CE.2005.vcproj.

Changes to SQLite.Interop/SQLite.Interop.CE.2008.vcproj.

Changes to SQLite.Interop/SQLite.Interop.Static.2005.vcproj.

Changes to SQLite.Interop/SQLite.Interop.Static.2008.vcproj.

Changes to SQLite.Interop/SQLite.Interop.Static.2010.vcxproj.

Changes to SQLite.Interop/SQLite.Interop.Static.2012.vcxproj.

Changes to SQLite.Interop/props/SQLite.Interop.2005.vsprops.

Changes to SQLite.Interop/props/SQLite.Interop.2008.vsprops.

Changes to SQLite.Interop/props/SQLite.Interop.2010.props.

Changes to SQLite.Interop/props/SQLite.Interop.2012.props.

Changes to SQLite.Interop/props/sqlite3.props.

Changes to SQLite.Interop/props/sqlite3.vsprops.

Changes to SQLite.Interop/src/contrib/extension-functions.c.

Changes to SQLite.Interop/src/win/SQLite.Interop.rc.

Changes to SQLite.Interop/src/win/crypt.c.

Changes to SQLite.Interop/src/win/interop.c.

Changes to SQLite.NET.Settings.targets.

Changes to Setup/archive.bat.

Changes to Setup/bake.bat.

Changes to Setup/bake_all.bat.

Changes to Setup/build.bat.

Changes to Setup/build_all.bat.

Changes to Setup/build_ce.bat.

Changes to Setup/release.bat.

Changes to Setup/release_all.bat.

Changes to Setup/release_ce.bat.

Changes to Setup/release_static.bat.

Changes to System.Data.SQLite.Linq/SQL Generation/InternalBase.cs.

Changes to System.Data.SQLite.Linq/SQL Generation/KeyToListMap.cs.

Changes to System.Data.SQLite.Linq/SQL Generation/SqlChecker.cs.

Changes to System.Data.SQLite.Linq/SQL Generation/StringUtil.cs.

Changes to System.Data.SQLite.Linq/System.Data.SQLite.Linq.2008.csproj.

Changes to System.Data.SQLite.Linq/System.Data.SQLite.Linq.2010.csproj.

Changes to System.Data.SQLite.Linq/System.Data.SQLite.Linq.2012.csproj.

Changes to System.Data.SQLite/AssemblyInfo.cs.

Changes to System.Data.SQLite/LINQ/SQLiteConnection_Linq.cs.

Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.

Changes to System.Data.SQLite/SQLite3.cs.

Changes to System.Data.SQLite/SQLite3_UTF16.cs.

Changes to System.Data.SQLite/SQLiteBase.cs.

Changes to System.Data.SQLite/SQLiteCommand.cs.

Changes to System.Data.SQLite/SQLiteConnection.cs.

Changes to System.Data.SQLite/SQLiteConvert.cs.

Changes to System.Data.SQLite/SQLiteDefineConstants.cs.

Changes to System.Data.SQLite/SQLiteFactory.cs.

Changes to System.Data.SQLite/System.Data.SQLite.2008.csproj.

Changes to System.Data.SQLite/System.Data.SQLite.2010.csproj.

Changes to System.Data.SQLite/System.Data.SQLite.2012.csproj.

Changes to System.Data.SQLite/System.Data.SQLite.Compact.2008.csproj.

Changes to System.Data.SQLite/System.Data.SQLite.Files.targets.

Changes to System.Data.SQLite/System.Data.SQLite.Module.2008.csproj.

Changes to System.Data.SQLite/System.Data.SQLite.Module.2010.csproj.

Changes to System.Data.SQLite/System.Data.SQLite.Module.2012.csproj.

Changes to System.Data.SQLite/System.Data.SQLite.Properties.targets.

Changes to System.Data.SQLite/UnsafeNativeMethods.cs.

Changes to Tests/basic.eagle.

Changes to Tests/common.eagle.

Added Tests/tkt-17045010df.eagle.

Changes to readme.htm.

Changes to test/test.2008.csproj.

Changes to test/test.2010.csproj.

Changes to test/test.2012.csproj.

Changes to testce/testce.2008.csproj.

Changes to testlinq/Program.cs.

Changes to testlinq/testlinq.2008.csproj.

Changes to testlinq/testlinq.2010.csproj.

Changes to testlinq/testlinq.2012.csproj.

Changes to tools/install/Installer.2008.csproj.

Changes to tools/install/Installer.2010.csproj.

Changes to tools/install/Installer.2012.csproj.

Changes to tools/install/Installer.cs.

Changes to www/news.wiki.

︙
49 50 51 52 53 54 55 56 57 58 59 60 61 62 63	49 50 51 52 53 54 55 56 57 58 59 60 61 62 63	- +	/> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" ~~PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)"~~ PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="false" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3"
︙
146 147 148 149 150 151 152 ~~153~~ 154 155 156 157 158 159 160	146 147 148 149 150 151 152 153 154 155 156 157 158 159 160	- +	<Tool Name="VCMIDLTool" TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" ~~PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)"~~ PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="false" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3"
︙
242 243 244 245 246 247 248 ~~249~~ 250 251 252 253 254 255 256	242 243 244 245 246 247 248 249 250 251 252 253 254 255 256	- +	/> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" ~~PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)"~~ PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="false" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3"
︙
333 334 335 336 337 338 339 ~~340~~ 341 342 343 344 345 346 347	333 334 335 336 337 338 339 340 341 342 343 344 345 346 347	- +	<Tool Name="VCMIDLTool" TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" ~~PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)"~~ PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="false" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3"
︙

︙
49 50 51 52 53 54 55 56 57 58 59 60 61 62 63	49 50 51 52 53 54 55 56 57 58 59 60 61 62 63	- +	/> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" ~~PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)"~~ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="false" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3"
︙
146 147 148 149 150 151 152 ~~153~~ 154 155 156 157 158 159 160	146 147 148 149 150 151 152 153 154 155 156 157 158 159 160	- +	<Tool Name="VCMIDLTool" TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" ~~PreprocessorDefinitions="WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)"~~ PreprocessorDefinitions="WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="false" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3"
︙
242 243 244 245 246 247 248 ~~249~~ 250 251 252 253 254 255 256	242 243 244 245 246 247 248 249 250 251 252 253 254 255 256	- +	/> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" ~~PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)"~~ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="false" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3"
︙
333 334 335 336 337 338 339 ~~340~~ 341 342 343 344 345 346 347	333 334 335 336 337 338 339 340 341 342 343 344 345 346 347	- +	<Tool Name="VCMIDLTool" TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" ~~PreprocessorDefinitions="WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)"~~ PreprocessorDefinitions="WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="false" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3"
︙

︙
121 122 123 124 125 126 127 ~~128~~ 129 130 131 132 133 134 135	121 122 123 124 125 126 127 128 129 130 131 132 133 134 135	- +	<LinkDelaySign Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'">true</LinkDelaySign> <LinkDelaySign Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">true</LinkDelaySign> <LinkDelaySign Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">true</LinkDelaySign> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings>
︙
163 164 165 166 167 168 169 ~~170~~ 171 172 173 174 175 176 177	163 164 165 166 167 168 169 170 171 172 173 174 175 176 177	- +	<Command Condition="'$(TargetFrameworkSDKToolsDirectory)'==''">"$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> <Command Condition="'$(TargetFrameworkSDKToolsDirectory)'!=''">"$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);$(SQLITE_DISABLE_X64_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings>
︙
205 206 207 208 209 210 211 ~~212~~ 213 214 215 216 217 218 219	205 206 207 208 209 210 211 212 213 214 215 216 217 218 219	- +	<Command Condition="'$(TargetFrameworkSDKToolsDirectory)'==''">"$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> <Command Condition="'$(TargetFrameworkSDKToolsDirectory)'!=''">"$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='DebugNativeOnly\|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings>
︙
240 241 242 243 244 245 246 ~~247~~ 248 249 250 251 252 253 254	240 241 242 243 244 245 246 247 248 249 250 251 252 253 254	- +	<Command>XCOPY "$(TargetPath)" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y XCOPY "$(TargetPath)" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='DebugNativeOnly\|x64'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);$(SQLITE_DISABLE_X64_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings>
︙

︙
128 129 130 131 132 133 134 ~~135~~ 136 137 138 139 140 141 142	128 129 130 131 132 133 134 135 136 137 138 139 140 141 142	- +	<LinkDelaySign Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'">true</LinkDelaySign> <LinkDelaySign Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">true</LinkDelaySign> <LinkDelaySign Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">true</LinkDelaySign> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings>
︙
170 171 172 173 174 175 176 ~~177~~ 178 179 180 181 182 183 184	170 171 172 173 174 175 176 177 178 179 180 181 182 183 184	- +	<Command Condition="'$(TargetFrameworkSDKToolsDirectory)'==''">"$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> <Command Condition="'$(TargetFrameworkSDKToolsDirectory)'!=''">"$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);$(SQLITE_DISABLE_X64_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings>
︙
212 213 214 215 216 217 218 ~~219~~ 220 221 222 223 224 225 226	212 213 214 215 216 217 218 219 220 221 222 223 224 225 226	- +	<Command Condition="'$(TargetFrameworkSDKToolsDirectory)'==''">"$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> <Command Condition="'$(TargetFrameworkSDKToolsDirectory)'!=''">"$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='DebugNativeOnly\|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings>
︙
247 248 249 250 251 252 253 ~~254~~ 255 256 257 258 259 260 261	247 248 249 250 251 252 253 254 255 256 257 258 259 260 261	- +	<Command>XCOPY "$(TargetPath)" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y XCOPY "$(TargetPath)" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='DebugNativeOnly\|x64'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);$(SQLITE_DISABLE_X64_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings>
︙

︙
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67	53 54 55 56 57 58 59 60 61 62 63 64 65 66 67	- +	Name="VCMIDLTool" TargetEnvironment="1" /> <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(SQLITE_WINCE_DEFINES);$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(SQLITE_WINCE_DEFINES);$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="true" RuntimeLibrary="1" FloatingPointModel="0" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" CompileAs="1"
︙
248 249 250 251 252 253 254 ~~255~~ 256 257 258 259 260 261 262	248 249 250 251 252 253 254 255 256 257 258 259 260 261 262	- +	<Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(SQLITE_WINCE_DEFINES);$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(SQLITE_WINCE_DEFINES);$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="true" RuntimeLibrary="1" FloatingPointModel="0" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" CompileAs="1"
︙
342 343 344 345 346 347 348 ~~349~~ 350 351 352 353 354 355 356	342 343 344 345 346 347 348 349 350 351 352 353 354 355 356	- +	<Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(SQLITE_WINCE_DEFINES);$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES)" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(SQLITE_WINCE_DEFINES);$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES)" MinimalRebuild="true" RuntimeLibrary="1" FloatingPointModel="0" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" CompileAs="1"
︙

︙
10 11 12 13 14 15 16 17 18 19 20 21 22 23	10 11 12 13 14 15 16 17 18 19 20 21 22 23 24	+	<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup Label="UserMacros"> <ConfigurationYear>2010</ConfigurationYear> <INTEROP_BUILD_NUMBER>083</INTEROP_BUILD_NUMBER> <INTEROP_LINKER_VERSION>1.0</INTEROP_LINKER_VERSION> <INTEROP_MANIFEST_VERSION>1.0.83.0</INTEROP_MANIFEST_VERSION> <INTEROP_RC_VERSION>1,0,83,0</INTEROP_RC_VERSION> <INTEROP_DEBUG_DEFINES>INTEROP_TEST_EXTENSION=1</INTEROP_DEBUG_DEFINES> <INTEROP_EXTRA_DEFINES>INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1</INTEROP_EXTRA_DEFINES> <INTEROP_ASSEMBLY_RESOURCES>/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp</INTEROP_ASSEMBLY_RESOURCES> <INTEROP_KEY_FILE>$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk</INTEROP_KEY_FILE> <INTEROP_NATIVE_NAME>SQLite.Interop</INTEROP_NATIVE_NAME> <INTEROP_MIXED_NAME>System.Data.SQLite</INTEROP_MIXED_NAME> </PropertyGroup> <ItemGroup>
︙
37 38 39 40 41 42 43 44 45 46 47 48 49 50	38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55	+ + + +	<Value>$(INTEROP_MANIFEST_VERSION)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_RC_VERSION"> <Value>$(INTEROP_RC_VERSION)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_DEBUG_DEFINES"> <Value>$(INTEROP_DEBUG_DEFINES)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_EXTRA_DEFINES"> <Value>$(INTEROP_EXTRA_DEFINES)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_ASSEMBLY_RESOURCES"> <Value>$(INTEROP_ASSEMBLY_RESOURCES)</Value> <EnvironmentVariable>true</EnvironmentVariable>
︙

︙
34 35 36 37 38 39 40 41 42 43 44 45 46 47 48	34 35 36 37 38 39 40 41 42 43 44 45 46 47 48	- +	3) Use, for example: SELECT cos(radians(inclination)) FROM satsum WHERE satnum = 25544; Note: Loading extensions is by default prohibited as a security measure; see "Security Considerations" in http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions. If the sqlite3 program and library are built this ~~way, you cannot use these functions from the program, you~~ way, you cannot use these functions from the program, you must write your own program using the sqlite3 API, and call sqlite3_enable_load_extension as described above. If the program is built so that loading extensions is permitted, the following will work: sqlite> SELECT load_extension('./libsqlitefunctions.so'); sqlite> select cos(radians(45));
︙
85 86 87 88 89 90 91 92 93 94 ~~95 96 97 98~~ 99 100 101 102 ~~103~~ 104 105 106 107 108 109 110	85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110	- + - - - - + + + + - +	would cause an error if any non-positive number was raised to any power. 2007-02-07 posted by Mikey C to sqlite mailing list. Original code 2006 June 05 by relicoder. / ~~//#include "config.h"~~ / #include "config.h" / #include <windows.h> ~~// #define COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE //#define HAVE_ACOSH 1 //#define HAVE_ASINH 1 //#define HAVE_ATANH 1~~ / #define COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE / / #define HAVE_ACOSH 1 / / #define HAVE_ASINH 1 / / #define HAVE_ATANH 1 / #define HAVE_SINH 1 #define HAVE_COSH 1 #define HAVE_TANH 1 #define HAVE_LOG10 1 ~~//#define HAVE_ISBLANK 1~~ / #define HAVE_ISBLANK 1 / #define SQLITE_SOUNDEX 1 #define HAVE_TRIM 1 / LMH 2007-03-25 if sqlite has trim functions */ #ifdef COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE #include "../core/sqlite3ext.h" SQLITE_EXTENSION_INIT1 #else
︙
126 127 128 129 130 131 132 ~~133~~ 134 135 136 137 138 139 140	126 127 128 129 130 131 132 133 134 135 136 137 138 139 140	- +	#include <stdlib.h> #include <assert.h> #ifndef _MAP_H_ #define _MAP_H_ ~~//#include <stdint.h>~~ /* #include <stdint.h> */ typedef signed char int8_t; typedef unsigned char uint8_t; typedef signed int int16_t; typedef unsigned int uint16_t; typedef signed long int int32_t; typedef unsigned long int uint32_t;
︙
193 194 195 196 197 198 199 ~~200~~ 201 202 203 204 205 206 207	193 194 195 196 197 198 199 200 201 202 203 204 205 206 207	- +	** to use with map_make / int double_cmp(const void a, const void b); #endif / _MAP_H_ / typedef uint8_t u8; ~~//typedef uint16_t u16;~~ / typedef uint16_t u16; / typedef int64_t i64; static char sqlite3StrDup( const char z ) { char res = sqlite3_malloc( strlen(z)+1 ); return strcpy( res, z ); }
︙
308 309 310 311 312 313 314 ~~315~~ 316 317 318 319 320 321 322	308 309 310 311 312 313 314 315 316 317 318 319 320 321 322	- +	/* This is a macro that facilitates writting wrappers for math.h functions it creates code for a function to use in SQlite that gets one numeric input and returns a floating point value. Could have been implemented using pointers to functions but this way it's inline and thus more efficient. Lower * ranking though... Parameters: name: function name to de defined (eg: sinFunc) function: function defined in math.h to wrap (eg: sin) domain: boolean condition that CAN'T happen in terms of the input parameter rVal ** (eg: rval<0 for sqrt) / / LMH 2007-03-25 Changed to use errno and remove domain; no pre-checking for errors. */
︙
353 354 355 356 357 358 359 ~~360~~ 361 362 363 364 365 366 367	353 354 355 356 357 358 359 360 361 362 363 364 365 366 367	- +	/* trignometric functions / GEN_MATH_WRAP_DOUBLE_1(acosFunc, acos) GEN_MATH_WRAP_DOUBLE_1(asinFunc, asin) GEN_MATH_WRAP_DOUBLE_1(atanFunc, atan) / Many of systems don't have inverse hyperbolic trig functions so this will emulate them on those systems in terms of log and sqrt (formulas are too trivial to demand them on those systems in terms of log and sqrt (formulas are too trivial to demand written proof here) / #ifndef HAVE_ACOSH static double acosh(double x){ return log(x + sqrt(xx - 1.0)); }
︙
508 509 510 511 512 513 514 ~~515~~ 516 517 518 519 520 521 522 ~~523~~ 524 ~~525~~ 526 527 528 529 530 531 532 ~~533~~ 534 ~~535~~ 536 537 538 539 540 541 542 543 544 545 546 ~~547~~ 548 ~~549~~ 550 551 552 553 554 555 556	508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556	- + - + - + - + - + - + - +	/* Wraps the pow math.h function When both the base and the exponent are integers the result should be integer ** (see sqrt just before this). Here the result is always double / / LMH 2007-03-25 Changed to use errno; no pre-checking for errors. Also removes ~~but that was present in the pre-checking that called sqlite3_result_error on~~ but that was present in the pre-checking that called sqlite3_result_error on a non-positive first argument, which is not always an error. / static void powerFunc(sqlite3_context context, int argc, sqlite3_value *argv){ double r1 = 0.0; double r2 = 0.0; double val; assert( argc==2 ); if( sqlite3_value_type(argv[0]) == SQLITE_NULL \|\| sqlite3_value_type(argv[1]) == SQLITE_NULL ){ ~~sqlite3_result_null(context);~~ sqlite3_result_null(context); }else{ r1 = sqlite3_value_double(argv[0]); r2 = sqlite3_value_double(argv[1]); errno = 0; val = pow(r1,r2); if (errno == 0) { sqlite3_result_double(context, val); ~~} else {~~ } else { sqlite3_result_error(context, strerror(errno), errno); } } } } / ** atan2 wrapper / static void atn2Func(sqlite3_context context, int argc, sqlite3_value **argv){ double r1 = 0.0; double r2 = 0.0; assert( argc==2 ); if( sqlite3_value_type(argv[0]) == SQLITE_NULL \|\| sqlite3_value_type(argv[1]) == SQLITE_NULL ){ ~~sqlite3_result_null(context);~~ sqlite3_result_null(context); }else{ r1 = sqlite3_value_double(argv[0]); r2 = sqlite3_value_double(argv[1]); sqlite3_result_double(context, atan2(r1,r2)); } }
︙
632 633 634 635 636 637 638 ~~639~~ 640 641 642 643 644 645 ~~646~~ 647 648 649 650 651 652 653	632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653	- + - +	sqlite3_result_int64(context, (i64) floor(rVal)); break; } } } /* Given a string (s) in the first argument and an integer (n) in the second returns the Given a string (s) in the first argument and an integer (n) in the second returns the ** string that constains s contatenated n times / static void replicateFunc(sqlite3_context context, int argc, sqlite3_value *argv){ unsigned char z; /* input string / unsigned char zo; /* result string / i64 iCount; / times to repeat / ~~i64 nLen; / length of the input string (no multibyte considerations) /~~ i64 nLen; / length of the input string (no multibyte considerations) / i64 nTLen; / length of the result string (no multibyte considerations) */ i64 i=0; if( argc!=2 \|\| SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; iCount = sqlite3_value_int64(argv[1]);
︙
674 675 676 677 678 679 680 ~~681~~ 682 683 684 685 686 687 688	674 675 676 677 678 679 680 681 682 683 684 685 686 687 688	- +	sqlite3_result_text(context, (char)z, -1, SQLITE_TRANSIENT); sqlite3_free(z); sqlite3_free(zo); } } / /* Some systems (win32 among others) don't have an isblank function, this will emulate it. This function is not UFT-8 safe since it only analyses a byte character. */ #ifndef HAVE_ISBLANK int isblank(char c){ return( ' '==c \|\| '\t'==c ); }
︙
739 740 741 742 743 744 745 ~~746~~ 747 ~~748~~ 749 750 751 752 753 754 755	739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755	- + - +	i64 zl; /* length of the input string (UTF-8 chars) / int i = 0; const char zi; /* input string / char zo; /* output string / char zt; assert( argc==2 ); if( sqlite3_value_type(argv[0]) == SQLITE_NULL ){ ~~sqlite3_result_null(context);~~ sqlite3_result_null(context); }else{ zi = (char )sqlite3_value_text(argv[0]); ilen = sqlite3_value_int64(argv[1]); / check domain */ if(ilen<0){ sqlite3_result_error(context, "domain error", -1); return;
︙
793 794 795 796 797 798 799 ~~800~~ 801 ~~802~~ 803 804 805 806 807 808 809	793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809	- + - +	i64 zll; /* length of the input string (bytes) / int i = 0; const char zi; /* input string / char zo; /* output string / char zt; assert( argc==2 ); if( sqlite3_value_type(argv[0]) == SQLITE_NULL ){ ~~sqlite3_result_null(context);~~ sqlite3_result_null(context); }else{ zi = (char )sqlite3_value_text(argv[0]); ilen = sqlite3_value_int64(argv[1]); / check domain */ if(ilen<0){ sqlite3_result_error(context, "domain error", -1); return;
︙
848 849 850 851 852 853 854 ~~855~~ 856 ~~857~~ 858 859 860 861 862 863 864	848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864	- + - +	i64 zll; /* length of the input string (bytes) / int i = 0; const char zi; /* input string / char zo; /* output string / char zt; assert( argc==2 ); if( sqlite3_value_type(argv[0]) == SQLITE_NULL ){ ~~sqlite3_result_null(context);~~ sqlite3_result_null(context); }else{ zi = (char )sqlite3_value_text(argv[0]); ilen = sqlite3_value_int64(argv[1]); / check domain */ if(ilen<0){ sqlite3_result_error(context, "domain error", -1); return;
︙
907 908 909 910 911 912 913 ~~914~~ 915 ~~916~~ 917 918 919 ~~920 921~~ 922 923 ~~924~~ 925 926 927 928 929 930 931	907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931	- + - + - - + + - +	const char z22; char zo; /* output string / char zot; int c1 = 0; int c2 = 0; assert( argc==2 ); if( sqlite3_value_type(argv[0]) == SQLITE_NULL \|\| sqlite3_value_type(argv[1]) == SQLITE_NULL ){ ~~sqlite3_result_null(context);~~ sqlite3_result_null(context); }else{ zi1 = (char )sqlite3_value_text(argv[0]); zi2 = (char )sqlite3_value_text(argv[1]); ~~/* ** maybe I could allocate less, but that would imply 2 passes, rather waste~~ /* maybe I could allocate less, but that would imply 2 passes, rather waste (possibly) some memory / ~~zo = sqlite3_malloc(strlen(zi1)+1);~~ zo = sqlite3_malloc(strlen(zi1)+1); if (!zo){ sqlite3_result_error_nomem(context); return; } zot = zo; z1 = zi1; while( (c1=sqliteCharVal((unsigned char )z1))!=0 ){
︙
961 962 963 964 965 966 967 ~~968~~ 969 970 971 ~~972~~ 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 ~~990~~ 991 992 993 994 995 996 ~~997~~ 998 ~~999~~ 1000 1001 1002 1003 1004 1005 1006	961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006	- + - + - + - + - +	const char* zt1; const char* zt2; int c1,c2; if( '\0'==z1 ){ return -1; } while( (sqliteCharVal((unsigned char )z2) != 0) && (c++)<s){ sqliteNextChar(z2); } c = 0; while( (sqliteCharVal((unsigned char )z2)) != 0 ){ zt1 = z1; zt2 = z2; do{ c1 = sqliteCharVal((unsigned char )zt1); c2 = sqliteCharVal((unsigned char )zt2); if (pColl->enc == SQLITE_UTF8){ if (pColl->xCmp(pColl->pUser, 1, zt1, 1, zt2) == 0) { c1 = c2; } else { c1 = (c1) ? 1 : 0; c2 = (c2) ? 2 : 0; } } ~~// TODO: Maybe try and convert the chars to UTF16 and run them thru the collating sequence?~~ / TODO: Maybe try and convert the chars to UTF16 and run them thru the collating sequence? / sqliteNextChar(zt1); sqliteNextChar(zt2); }while( c1 == c2 && c1 != 0 && c2 != 0 ); if( c1 == 0 ){ rVal = c; ~~break;~~ break; } sqliteNextChar(z2); ++c; } if(p){ p=z2; } return rVal >=0 ? rVal+s : rVal;
︙
1074 1075 1076 1077 1078 1079 1080 ~~1081~~ 1082 1083 1084 1085 1086 1087 1088	1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088	- +	rz = sqlite3_malloc(zt-z+1); if (!rz){ sqlite3_result_error_nomem(context); return; } strncpy((char) rz, (char) z, zt-z); (rz+cc) = '\0'; ~~sqlite3_result_text(context, (char)rz, -1, SQLITE_TRANSIENT);~~ sqlite3_result_text(context, (char)rz, -1, SQLITE_TRANSIENT); sqlite3_free(rz); } / given a string (s) and an integer (n) returns the n rightmost (UTF-8) characters if the string has a length<=n or is NULL this function is NOP */
︙
1113 1114 1115 1116 1117 1118 1119 ~~1120~~ 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 ~~1131~~ 1132 1133 1134 1135 1136 1137 1138	1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138	- + - +	ze = zt; zt = z; cc=c-l; if(cc<0) cc=0; while( cc-- > 0 ){ sqliteNextChar(zt); } rz = sqlite3_malloc(ze-zt+1); if (!rz){ sqlite3_result_error_nomem(context); return; } strcpy((char) rz, (char) (zt)); ~~sqlite3_result_text(context, (char)rz, -1, SQLITE_TRANSIENT);~~ sqlite3_result_text(context, (char)rz, -1, SQLITE_TRANSIENT); sqlite3_free(rz); } #ifndef HAVE_TRIM /* ** removes the whitespaces at the begining of a string. */
︙
1162 1163 1164 1165 1166 1167 1168 ~~1169~~ 1170 1171 1172 1173 1174 1175 1176	1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176	- +	assert( argc==1); if( SQLITE_NULL==sqlite3_value_type(argv[0]) ){ sqlite3_result_null(context); return; } z = sqlite3_value_text(argv[0]); ~~sqlite3_result_text(context, ltrim(z), -1, SQLITE_TRANSIENT);~~ sqlite3_result_text(context, ltrim(z), -1, SQLITE_TRANSIENT); } /* ** Removes the whitespace at the end of a string / static void rtrimFunc(sqlite3_context context, int argc, sqlite3_value *argv){ const char z;
︙
1214 1215 1216 1217 1218 1219 1220 ~~1221 1222 1223 1224~~ ~~1225~~ 1226 1227 1228 1229 1230 1231 1232	1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234	+ - - - - + + + + - + +	/* given a pointer to a string s1, the length of that string (l1), a new string (s2) and it's length (l2) appends s2 to s1. All lengths in bytes. This is just an auxiliary function / / ~~// static void _append(char *s1, int l1, const char s2, int l2){ // s1 = realloc(s1, (l1+l2+1)sizeof(char)); // strncpy((s1)+l1, s2, l2); // ((s1)+l1+l2) = '\0';~~ static void _append(char *s1, int l1, const char s2, int l2){ s1 = realloc(s1, (l1+l2+1)sizeof(char)); strncpy((s1)+l1, s2, l2); ((s1)+l1+l2) = '\0'; ~~// }~~ } / #ifndef HAVE_TRIM / ** given strings s, s1 and s2 replaces occurrences of s1 in s by s2 / static void replaceFunc(sqlite3_context context, int argc, sqlite3_value **argv){
︙
1401 1402 1403 1404 1405 1406 1407 ~~1408~~ 1409 1410 1411 1412 1413 1414 1415	1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417	- +	int type; assert( argc==1 ); type = sqlite3_value_numeric_type(argv[0]); if( type == SQLITE_NULL) return; p = sqlite3_aggregate_context(context, sizeof(p)); if( 0==(p->m) ){ p->m = calloc(1, sizeof(map)); if( type==SQLITE_INTEGER ){ / map will be used for integers / (p->m) = map_make(int_cmp);
︙
1440 1441 1442 1443 1444 1445 1446 ~~1447~~ 1448 1449 1450 1451 1452 1453 1454	1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456	- +	Auxiliary function that iterates all elements in a map and finds the mode (most frequent value) / static void modeIterate(void e, i64 c, void* pp){ i64 ei; double ed; ModeCtx p = (ModeCtx)pp; if( 0==p->is_double ){ ei = (int)(e); if( p->mcnt==c ){ ++p->mn; }else if( p->mcnt<c ){ p->riM = ei;
︙
1466 1467 1468 1469 1470 1471 1472 ~~1473~~ 1474 1475 1476 1477 1478 1479 1480	1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482	- +	p->mn=1; } } } /* Auxiliary function that iterates all elements in a map and finds the median (the value such that the number of elements smaller is equal the the number of (the value such that the number of elements smaller is equal the the number of elements larger) / static void medianIterate(void e, i64 c, void* pp){ i64 ei; double ed; double iL; double iR;
︙
1659 1660 1661 1662 1663 1664 1665 ~~1666~~ 1667 1668 1669 1670 ~~1671~~ 1672 1673 1674 1675 1676 1677 1678	1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680	- + - +	char zR2 = zResult2; int rVal = 0; int i = 0; const u8 zIn1; const u8 zIn2; assert( argc==2 ); if( sqlite3_value_type(argv[0])==SQLITE_NULL \|\| sqlite3_value_type(argv[1])==SQLITE_NULL ){ sqlite3_result_null(context); return; } zIn1 = (u8)sqlite3_value_text(argv[0]); zIn2 = (u8*)sqlite3_value_text(argv[1]); soundex(zIn1, zR1); soundex(zIn2, zR2); for(i=0; i<4; ++i){
︙
1783 1784 1785 1786 1787 1788 1789 ~~1790~~ 1791 1792 1793 1794 1795 ~~1796~~ 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 ~~1811~~ 1812 ~~1813~~ 1814 1815 1816 1817 1818 1819 1820	1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822	- + - + - + - +	for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){ void pArg = 0; switch( aFuncs[i].argType ){ case 1: pArg = db; break; case 2: pArg = (void )(-1); break; } ~~//sqlite3CreateFunc~~ /* sqlite3CreateFunc / / LMH no error checking / sqlite3_create_function(db, aFuncs[i].zName, aFuncs[i].nArg, aFuncs[i].eTextRep, pArg, aFuncs[i].xFunc, 0, 0); #if 1 if( aFuncs[i].needCollSeq ){ ~~struct FuncDef pFunc = sqlite3FindFunction(db, aFuncs[i].zName,~~ struct FuncDef pFunc = sqlite3FindFunction(db, aFuncs[i].zName, strlen(aFuncs[i].zName), aFuncs[i].nArg, aFuncs[i].eTextRep, 0); if( pFunc && aFuncs[i].needCollSeq ){ pFunc->flags \|= SQLITE_FUNC_NEEDCOLL; } } #endif } for(i=0; i<sizeof(aAggs)/sizeof(aAggs[0]); i++){ void pArg = 0; switch( aAggs[i].argType ){ case 1: pArg = db; break; case 2: pArg = (void )(-1); break; } ~~//sqlite3CreateFunc~~ / sqlite3CreateFunc / / LMH no error checking / ~~sqlite3_create_function(db, aAggs[i].zName, aAggs[i].nArg, SQLITE_UTF8,~~ sqlite3_create_function(db, aAggs[i].zName, aAggs[i].nArg, SQLITE_UTF8, pArg, 0, aAggs[i].xStep, aAggs[i].xFinalize); #if 0 if( aAggs[i].needCollSeq ){ struct FuncDefAgg pFunc = sqlite3FindFunction( db, aAggs[i].zName, strlen(aAggs[i].zName), aAggs[i].nArg, SQLITE_UTF8, 0); if( pFunc && aAggs[i].needCollSeq ){ pFunc->needCollSeq = 1;
︙

1 2 3 4 5 6 7 8 9 10 ~~11 12 13 14~~ 15 16 17 18 19 20 21 22 ~~23 24 25 26 27 28~~ 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 ~~45 46~~ 47 48 49 50 51 52 53 54 55 56 57 ~~58 59 60 61~~ 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 ~~99 100~~ 101 102 103 104 105 106 107 108 ~~109~~ 110 111 112 ~~113~~ 114 115 116 117 118 ~~119~~ 120 121 122 123 124 ~~125~~ 126 127 128 129 130 ~~131~~ 132 133 134 135 136 137 138 139 140 141 ~~142~~ 143 144 145 ~~146~~ 147 148 149 150 151 152 153 ~~154~~ 155 156 157 ~~158 159 160~~ 161 162 ~~163~~ 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 ~~179 180 181~~ 182 183 184 185 186 187 ~~188~~ 189 190 191 192 193 194 195 196 ~~197~~ 198 199 200 201 202 203 204	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203	- - - - - + - - - - - - + + + + + + - + - + - - + + + - - - - + + + + + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - - + + + - + - - - + + + + - + - +	/******************************************************** * 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! *******************************************************/ #ifndef SQLITE_OMIT_DISKIO #ifdef SQLITE_HAS_CODEC ~~//#ifdef SQLITE_DEBUG~~ ~~//#include "splitsource\pager.c"~~ ~~//#endif~~ #include <windows.h> #include <wincrypt.h> ~~// Extra padding before and after the cryptographic buffer~~ / Extra padding before and after the cryptographic buffer / #define CRYPT_OFFSET 8 typedef struct _CRYPTBLOCK { Pager pPager; // Pager this cryptblock belongs to HCRYPTKEY hReadKey; // Key used to read from the database and write to the journal HCRYPTKEY hWriteKey; // Key used to write to the database DWORD dwPageSize; // Size of pages LPVOID pvCrypt; // A buffer for encrypting/decrypting (if necessary) DWORD dwCryptSize; // Equal to or greater than dwPageSize. If larger, pvCrypt is valid and this is its size Pager pPager; / Pager this cryptblock belongs to / HCRYPTKEY hReadKey; / Key used to read from the database and write to the journal / HCRYPTKEY hWriteKey; / Key used to write to the database / DWORD dwPageSize; / Size of pages / LPVOID pvCrypt; / A buffer for encrypting/decrypting (if necessary) / DWORD dwCryptSize; / Equal to or greater than dwPageSize. If larger, pvCrypt is valid and this is its size / } CRYPTBLOCK, LPCRYPTBLOCK; ~~HCRYPTPROV g_hProvider = 0; // Global instance of the cryptographic provider~~ HCRYPTPROV g_hProvider = 0; /* Global instance of the cryptographic provider / #define SQLITECRYPTERROR_PROVIDER "Cryptographic provider not available" ~~// Needed for re-keying~~ / Needed for re-keying / static void sqlite3pager_get_codecarg(Pager pPager) { return (pPager->xCodec) ? pPager->pCodec: NULL; } void sqlite3_activate_see(const char info) { } ~~// Create a cryptographic context. Use the enhanced provider because it is available on // most platforms~~ /* Create a cryptographic context. Use the enhanced provider because it is available on ** most platforms / static BOOL InitializeProvider() { if (g_hProvider) return TRUE; if (!CryptAcquireContext(&g_hProvider, NULL, MS_ENHANCED_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { return FALSE; } return TRUE; } // Create or update a cryptographic context for a pager. // This function will automatically determine if the encryption algorithm requires // extra padding, and if it does, will create a temp buffer big enough to provide // space to hold it. / Create or update a cryptographic context for a pager. This function will automatically determine if the encryption algorithm requires extra padding, and if it does, will create a temp buffer big enough to provide ** space to hold it. / static LPCRYPTBLOCK CreateCryptBlock(HCRYPTKEY hKey, Pager pager, int pageSize, LPCRYPTBLOCK pExisting) { LPCRYPTBLOCK pBlock; ~~if (!pExisting) // Creating a new cryptblock~~ if (!pExisting) /* Creating a new cryptblock / { pBlock = sqlite3_malloc(sizeof(CRYPTBLOCK)); if (!pBlock) return NULL; ZeroMemory(pBlock, sizeof(CRYPTBLOCK)); pBlock->hReadKey = hKey; pBlock->hWriteKey = hKey; } ~~else // Updating an existing cryptblock~~ else / Updating an existing cryptblock / { pBlock = pExisting; } if (pageSize == -1) pageSize = pager->pageSize; pBlock->pPager = pager; pBlock->dwPageSize = (DWORD)pageSize; pBlock->dwCryptSize = pBlock->dwPageSize; ~~// Existing cryptblocks may have a buffer, if so, delete it~~ / Existing cryptblocks may have a buffer, if so, delete it / if (pBlock->pvCrypt) { sqlite3_free(pBlock->pvCrypt); pBlock->pvCrypt = NULL; } ~~// Figure out how big to make our spare crypt block~~ / Figure out how big to make our spare crypt block / CryptEncrypt(hKey, 0, TRUE, 0, NULL, &pBlock->dwCryptSize, pBlock->dwCryptSize 2); pBlock->pvCrypt = sqlite3_malloc(pBlock->dwCryptSize + (CRYPT_OFFSET * 2)); if (!pBlock->pvCrypt) { ~~// We created a new block in here, so free it. Otherwise leave the original intact if (pBlock != pExisting)~~ /* We created a new block in here, so free it. Otherwise leave the original intact / if (pBlock != pExisting) sqlite3_free(pBlock); return NULL; } return pBlock; } ~~// Destroy a cryptographic context and any buffers and keys allocated therein~~ / Destroy a cryptographic context and any buffers and keys allocated therein / static void sqlite3CodecFree(LPVOID pv) { LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)pv; ~~// Destroy the read key if there is one~~ / Destroy the read key if there is one / if (pBlock->hReadKey) { CryptDestroyKey(pBlock->hReadKey); } ~~// If there's a writekey and its not equal to the readkey, destroy it~~ / If there's a writekey and its not equal to the readkey, destroy it / if (pBlock->hWriteKey && pBlock->hWriteKey != pBlock->hReadKey) { CryptDestroyKey(pBlock->hWriteKey); } ~~// If there's extra buffer space allocated, free it as well~~ / If there's extra buffer space allocated, free it as well / if (pBlock->pvCrypt) { sqlite3_free(pBlock->pvCrypt); } ~~// All done with this cryptblock~~ / All done with this cryptblock / sqlite3_free(pBlock); } void sqlite3CodecSizeChange(void pArg, int pageSize, int reservedSize) { LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)pArg; if (pBlock->dwPageSize != pageSize) { CreateCryptBlock(pBlock->hReadKey, pBlock->pPager, pageSize, pBlock); ~~// If this fails, pvCrypt will be NULL, and the next time sqlite3Codec() is called, it will result in an error~~ /* If this fails, pvCrypt will be NULL, and the next time sqlite3Codec() is called, it will result in an error / } } ~~// Encrypt/Decrypt functionality, called by pager.c~~ / Encrypt/Decrypt functionality, called by pager.c / void sqlite3Codec(void pArg, void data, Pgno nPageNum, int nMode) { LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)pArg; DWORD dwPageSize; LPVOID pvTemp = NULL; if (!pBlock) return data; ~~if (pBlock->pvCrypt == NULL) return NULL; // This only happens if CreateCryptBlock() failed to make scratch space~~ if (pBlock->pvCrypt == NULL) return NULL; /* This only happens if CreateCryptBlock() failed to make scratch space / switch(nMode) { ~~case 0: // Undo a "case 7" journal file encryption case 2: // Reload a page case 3: // Load a page~~ case 0: / Undo a "case 7" journal file encryption / case 2: / Reload a page / case 3: / Load a page / if (!pBlock->hReadKey) break; ~~/ Block ciphers often need to write extra padding beyond the~~ /* Block ciphers often need to write extra padding beyond the data block. We don't have that luxury for a given page of data so we must copy the page data to a buffer that IS large enough to hold the padding. We then encrypt the block and write the buffer back to the page without the unnecessary padding. We only use the special block of memory if its absolutely necessary. / if (pBlock->dwCryptSize != pBlock->dwPageSize) { CopyMemory(((LPBYTE)pBlock->pvCrypt) + CRYPT_OFFSET, data, pBlock->dwPageSize); pvTemp = data; data = ((LPBYTE)pBlock->pvCrypt) + CRYPT_OFFSET; } dwPageSize = pBlock->dwCryptSize; CryptDecrypt(pBlock->hReadKey, 0, TRUE, 0, (LPBYTE)data, &dwPageSize); // If the encryption algorithm required extra padding and we were forced to encrypt or // decrypt a copy of the page data to a temp buffer, then write the contents of the temp // buffer back to the page data minus any padding applied. / If the encryption algorithm required extra padding and we were forced to encrypt or decrypt a copy of the page data to a temp buffer, then write the contents of the temp buffer back to the page data minus any padding applied. / if (pBlock->dwCryptSize != pBlock->dwPageSize) { CopyMemory(pvTemp, data, pBlock->dwPageSize); data = pvTemp; } break; ~~case 6: // Encrypt a page for the main database file~~ case 6: / Encrypt a page for the main database file / if (!pBlock->hWriteKey) break; CopyMemory(((LPBYTE)pBlock->pvCrypt) + CRYPT_OFFSET, data, pBlock->dwPageSize); data = ((LPBYTE)pBlock->pvCrypt) + CRYPT_OFFSET; dwPageSize = pBlock->dwPageSize; CryptEncrypt(pBlock->hWriteKey, 0, TRUE, 0, ((LPBYTE)pBlock->pvCrypt) + CRYPT_OFFSET, &dwPageSize, pBlock->dwCryptSize); break; ~~case 7: // Encrypt a page for the journal file~~ case 7: / Encrypt a page for the journal file / / Under normal circumstances, the readkey is the same as the writekey. However, when the database is being rekeyed, the readkey is not the same as the writekey. The rollback journal must be written using the original key for the database file because it is, by nature, a rollback journal. Therefore, for case 7, when the rollback is being written, always encrypt using the database's readkey, which is guaranteed to be the same key that was used to read the original data.
︙
212 213 214 215 216 217 218 ~~219~~ 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 ~~239~~ 240 241 242 ~~243~~ 244 245 246 247 248 ~~249~~ 250 251 252 253 ~~254~~ 255 ~~256~~ 257 ~~258 259~~ 260 261 262 ~~263 264~~ 265 266 ~~267~~ 268 269 ~~270~~ 271 272 273 274 275 276 277 278 279 ~~280~~ 281 282 283 284 285 286 287 ~~288 289~~ 290 291 292 293 294 295 ~~296 297~~ 298 299 300 301 302 303 304 305 306 307 ~~308~~ 309 310 311 312 313 ~~314~~ 315 316 317 318 319 320 321 322 323 324 325 326 327 328 ~~329~~ 330 ~~331 332 333~~ 334 335 336 337 338 ~~339~~ 340 ~~341 342~~ 343 ~~344~~ 345 346 347 348 349 350 ~~351~~ 352 353 354 355 ~~356~~ 357 358 359 360 361 362 363	211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361	- + - + - + - + - + - + - - + + + - - + + - + - + - + - - - - + + + - + - + - + - - - + + + + - + - - - + - + - +	CryptEncrypt(pBlock->hReadKey, 0, TRUE, 0, ((LPBYTE)pBlock->pvCrypt) + CRYPT_OFFSET, &dwPageSize, pBlock->dwCryptSize); break; } return data; } ~~// Derive an encryption key from a user-supplied buffer~~ /* Derive an encryption key from a user-supplied buffer / static HCRYPTKEY DeriveKey(const void pKey, int nKeyLen) { HCRYPTHASH hHash = 0; HCRYPTKEY hKey; if (!pKey \|\| !nKeyLen) return 0; if (!InitializeProvider()) { return MAXDWORD; } if (CryptCreateHash(g_hProvider, CALG_SHA1, 0, 0, &hHash)) { if (CryptHashData(hHash, (LPBYTE)pKey, nKeyLen, 0)) { CryptDeriveKey(g_hProvider, CALG_RC4, hHash, 0, &hKey); } CryptDestroyHash(hHash); } } return hKey; } ~~// Called by sqlite and sqlite3_key_interop to attach a key to a database.~~ /* Called by sqlite and sqlite3_key_interop to attach a key to a database. / int sqlite3CodecAttach(sqlite3 db, int nDb, const void pKey, int nKeyLen) { int rc = SQLITE_ERROR; HCRYPTKEY hKey = 0; ~~// No key specified, could mean either use the main db's encryption or no encryption~~ / No key specified, could mean either use the main db's encryption or no encryption / if (!pKey \|\| !nKeyLen) { if (!nDb) { ~~return SQLITE_OK; // Main database, no key specified so not encrypted~~ return SQLITE_OK; / Main database, no key specified so not encrypted / } ~~else // Attached database, use the main database's key~~ else / Attached database, use the main database's key / { ~~// Get the encryption block for the main database and attempt to duplicate the key // for use by the attached database~~ / Get the encryption block for the main database and attempt to duplicate the key ** for use by the attached database / Pager p = sqlite3BtreePager(db->aDb[0].pBt); LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)sqlite3pager_get_codecarg(p); ~~if (!pBlock) return SQLITE_OK; // Main database is not encrypted so neither will be any attached database if (!pBlock->hReadKey) return SQLITE_OK; // Not encrypted~~ if (!pBlock) return SQLITE_OK; /* Main database is not encrypted so neither will be any attached database / if (!pBlock->hReadKey) return SQLITE_OK; / Not encrypted / if (!CryptDuplicateKey(pBlock->hReadKey, NULL, 0, &hKey)) ~~return rc; // Unable to duplicate the key~~ return rc; / Unable to duplicate the key / } } ~~else // User-supplied passphrase, so create a cryptographic key out of it~~ else / User-supplied passphrase, so create a cryptographic key out of it / { hKey = DeriveKey(pKey, nKeyLen); if (hKey == MAXDWORD) { sqlite3Error(db, rc, SQLITECRYPTERROR_PROVIDER); return rc; } } ~~// Create a new encryption block and assign the codec to the new attached database~~ / Create a new encryption block and assign the codec to the new attached database / if (hKey) { Pager p = sqlite3BtreePager(db->aDb[nDb].pBt); LPCRYPTBLOCK pBlock = CreateCryptBlock(hKey, p, -1, NULL); if (!pBlock) return SQLITE_NOMEM; sqlite3PagerSetCodec(p, sqlite3Codec, sqlite3CodecSizeChange, sqlite3CodecFree, pBlock); ~~//db->aDb[nDb].pAux = pBlock;~~ ~~//db->aDb[nDb].xFreeAux = DestroyCryptBlock;~~ rc = SQLITE_OK; } return rc; } ~~// Once a password has been supplied and a key created, we don't keep the // original password for security purposes. Therefore return NULL.~~ /* Once a password has been supplied and a key created, we don't keep the ** original password for security purposes. Therefore return NULL. / void sqlite3CodecGetKey(sqlite3 db, int nDb, void *ppKey, int pnKeyLen) { Btree pbt = db->aDb[0].pBt; Pager p = sqlite3BtreePager(pbt); LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)sqlite3pager_get_codecarg(p); if (ppKey) ppKey = 0; if (pnKeyLen && pBlock) pnKeyLen = 1; } ~~// We do not attach this key to the temp store, only the main database.~~ /* We do not attach this key to the temp store, only the main database. / SQLITE_API int sqlite3_key(sqlite3 db, const unsigned char pKey, int nKeySize) { return sqlite3CodecAttach(db, 0, pKey, nKeySize); } ~~// Changes the encryption key for an existing database.~~ / Changes the encryption key for an existing database. / SQLITE_API int sqlite3_rekey(sqlite3 db, const unsigned char pKey, int nKeySize) { Btree pbt = db->aDb[0].pBt; Pager p = sqlite3BtreePager(pbt); LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)sqlite3pager_get_codecarg(p); HCRYPTKEY hKey = DeriveKey(pKey, nKeySize); int rc = SQLITE_ERROR; if (hKey == MAXDWORD) { sqlite3Error(db, rc, SQLITECRYPTERROR_PROVIDER); return rc; } ~~if (!pBlock && !hKey) return SQLITE_OK; // Wasn't encrypted to begin with~~ if (!pBlock && !hKey) return SQLITE_OK; / Wasn't encrypted to begin with / ~~// To rekey a database, we change the writekey for the pager. The readkey remains // the same if (!pBlock) // Encrypt an unencrypted database~~ / To rekey a database, we change the writekey for the pager. The readkey remains ** the same / if (!pBlock) / Encrypt an unencrypted database / { pBlock = CreateCryptBlock(hKey, p, -1, NULL); if (!pBlock) return SQLITE_NOMEM; ~~pBlock->hReadKey = 0; // Original database is not encrypted~~ pBlock->hReadKey = 0; / Original database is not encrypted / sqlite3PagerSetCodec(sqlite3BtreePager(pbt), sqlite3Codec, sqlite3CodecSizeChange, sqlite3CodecFree, pBlock); ~~//db->aDb[0].pAux = pBlock;~~ ~~//db->aDb[0].xFreeAux = DestroyCryptBlock;~~ } ~~else // Change the writekey for an already-encrypted database~~ else / Change the writekey for an already-encrypted database / { pBlock->hWriteKey = hKey; } sqlite3_mutex_enter(db->mutex); ~~// Start a transaction~~ / Start a transaction / rc = sqlite3BtreeBeginTrans(pbt, 1); if (!rc) { ~~// Rewrite all the pages in the database using the new encryption key~~ / Rewrite all the pages in the database using the new encryption key / Pgno nPage; Pgno nSkip = PAGER_MJ_PGNO(p); DbPage pPage; Pgno n; int count; sqlite3PagerPagecount(p, &count);
︙
371 372 373 374 375 376 377 ~~378~~ 379 380 381 382 383 ~~384~~ 385 386 387 388 389 ~~390 391~~ 392 393 394 395 396 397 398 399 ~~400 401~~ 402 403 404 405 406 407 408 409 410 ~~411 412~~ 413 414 415 416 417 418 419 420 421 422 ~~423~~ ~~424 425~~	369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425	- + - + - - + + + - - + + + - - + + + - + - - +	{ rc = sqlite3PagerWrite(pPage); sqlite3PagerUnref(pPage); } } } ~~// If we succeeded, try and commit the transaction~~ /* If we succeeded, try and commit the transaction / if (!rc) { rc = sqlite3BtreeCommit(pbt); } ~~// If we failed, rollback~~ // If we failed, rollback / if (rc) { sqlite3BtreeRollback(pbt, SQLITE_OK); } ~~// If we succeeded, destroy any previous read key this database used // and make the readkey equal to the writekey~~ /* If we succeeded, destroy any previous read key this database used ** and make the readkey equal to the writekey / if (!rc) { if (pBlock->hReadKey) { CryptDestroyKey(pBlock->hReadKey); } pBlock->hReadKey = pBlock->hWriteKey; } ~~// We failed. Destroy the new writekey (if there was one) and revert it back to // the original readkey~~ / We failed. Destroy the new writekey (if there was one) and revert it back to ** the original readkey / else { if (pBlock->hWriteKey) { CryptDestroyKey(pBlock->hWriteKey); } pBlock->hWriteKey = pBlock->hReadKey; } ~~// If the readkey and writekey are both empty, there's no need for a codec on this // pager anymore. Destroy the crypt block and remove the codec from the pager.~~ / If the readkey and writekey are both empty, there's no need for a codec on this ** pager anymore. Destroy the crypt block and remove the codec from the pager. / if (!pBlock->hReadKey && !pBlock->hWriteKey) { sqlite3PagerSetCodec(p, NULL, NULL, NULL, NULL); } sqlite3_mutex_leave(db->mutex); return rc; } ~~#endif // SQLITE_HAS_CODEC~~ #endif / SQLITE_HAS_CODEC / ~~#endif // SQLITE_OMIT_DISKIO~~ #endif / SQLITE_OMIT_DISKIO */

︙
10 11 12 13 14 15 16 17 18 19 20 ~~21 22 23 24 25~~ 26 27 28 29 30 31 32	10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28	+ - - - - -	#include "../core/sqlite3.c" #if defined(INTEROP_EXTENSION_FUNCTIONS) #include "../contrib/extension-functions.c" extern int RegisterExtensionFunctions(sqlite3 db); #endif #ifdef SQLITE_OS_WIN #if defined(INTEROP_CODEC) #include "crypt.c" #endif ~~#ifdef SQLITE_OS_WIN~~ ~~// Additional open flags, we use this one privately~~ ~~//#define SQLITE_OPEN_SHAREDCACHE 0x01000000~~ typedef void (SQLITEUSERFUNC)(sqlite3_context , int, sqlite3_value ); typedef void (SQLITEFUNCFINAL)(sqlite3_context ); #if SQLITE_VERSION_NUMBER < 3007014 SQLITE_PRIVATE void sqlite3DbMallocZero_interop(sqlite3 db, int n) { void p;
︙
83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 ~~102~~ 103 ~~104~~ 105 106 ~~107~~ 108 109 110 ~~111 112 113~~ ~~114~~ 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 ~~134 135~~ 136 ~~137~~ 138 ~~139~~ 140 141 142 143 144 145 146	79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138	- + - + - + - + - - - + + + - + - - - -	{ sqlite3_mutex_leave(db->mutex); return ret; } while (db->pVdbe) { ~~// Make a copy of the first prepared statement~~ /* Make a copy of the first prepared statement / Vdbe p = (Vdbe )sqlite3DbMallocZero_interop(db, sizeof(Vdbe)); Vdbe po = db->pVdbe; if (!p) { ret = SQLITE_NOMEM; break; } CopyMemory(p, po, sizeof(Vdbe)); ~~// Put it on the chain so we can free it~~ /* Put it on the chain so we can free it / db->pVdbe = p; ~~ret = sqlite3_finalize((sqlite3_stmt )p); // This will also free the copy's memory~~ ret = sqlite3_finalize((sqlite3_stmt )p); / This will also free the copy's memory / if (ret) { ~~// finalize failed -- so we must put back anything we munged~~ / finalize failed -- so we must put back anything we munged / CopyMemory(po, p, sizeof(Vdbe)); db->pVdbe = po; ~~// // NOTE: Ok, we must free this block that we* allocated (above) since // finalize did not do so.~~ /* ** NOTE: Ok, we must free this block that we allocated (above) since ** finalize did not do so. // / sqlite3DbFree_interop(db, p); break; } else { ZeroMemory(po, sizeof(Vdbe)); po->magic = VDBE_MAGIC_DEAD; } } sqlite3_mutex_leave(db->mutex); ret = sqlite3_close(db); } return ret; #endif } SQLITE_API int WINAPI sqlite3_open_interop(const charfilename, int flags, sqlite3 *ppdb) { int ret; ~~//int sharedcache = ((flags & SQLITE_OPEN_SHAREDCACHE) != 0);~~ ~~//flags &= ~SQLITE_OPEN_SHAREDCACHE;~~ ~~//sqlite3_enable_shared_cache(sharedcache);~~ ret = sqlite3_open_v2(filename, ppdb, flags, NULL); ~~//sqlite3_enable_shared_cache(0);~~ #if defined(INTEROP_EXTENSION_FUNCTIONS) if (ret == 0) RegisterExtensionFunctions(ppdb); #endif return ret;
︙
546 547 548 549 550 551 552 553 ~~554~~	538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +	} break; } sqlite3_mutex_leave(db->mutex); return ret; } #endif /* SQLITE_OS_WIN / /***************************************************************************/ / The INTEROP_TEST_EXTENSION block must be at the end of this source file because it includes the "sqlite3ext.h" file, which defines the sqlite3 public API function names to be macros and that would cause the code above this point to malfunction. / #if defined(INTEROP_TEST_EXTENSION) #include "../core/sqlite3ext.h" SQLITE_EXTENSION_INIT1 / The interopTest() SQL function returns its first argument or raises an error if there are not enough arguments. / static void interopTestFunc( sqlite3_context context, int argc, sqlite3_value *argv ){ const unsigned char z; if( argc!=1 ){ sqlite3_result_error(context, "need exactly one argument", -1); return; } z = sqlite3_value_text(argv[0]); if( z ){ sqlite3_result_text(context, (char)z, -1, SQLITE_STATIC); }else{ sqlite3_result_null(context); } } / SQLite invokes this routine once when it loads the extension. Create new functions, collating sequences, and virtual table modules here. This is usually the only exported symbol in ** the shared library. / SQLITE_API int interop_test_extension_init( sqlite3 db, char *pzErrMsg, const sqlite3_api_routines pApi ){ SQLITE_EXTENSION_INIT2(pApi) sqlite3_create_function(db, "interopTest", -1, SQLITE_ANY, 0, interopTestFunc, 0, 0); return 0; } ~~#endif ~~// SQLITE_OS_WIN~~~~ #endif

︙
13 14 15 16 17 18 19 20 21 22 23 24 25 26	13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32	+ + + + + +	REM SET __ECHO=ECHO IF NOT DEFINED _AECHO (SET _AECHO=REM) IF NOT DEFINED _CECHO (SET _CECHO=REM) IF NOT DEFINED _VECHO (SET _VECHO=REM) %_AECHO% Running %0 %* SET DUMMY2=%1 IF DEFINED DUMMY2 ( GOTO usage ) SET TOOLS=%~dp0 SET TOOLS=%TOOLS:~0,-1% %_VECHO% Tools = '%TOOLS%' IF NOT DEFINED FRAMEWORK (
︙
66 67 68 69 70 71 72 73 74 75 76 77 78 79	72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91	+ + + + + +	VERIFY > NUL GOTO :EOF :fn_SetErrorLevel VERIFY MAYBE 2> NUL GOTO :EOF :usage ECHO. ECHO Usage: %~nx0 ECHO. GOTO errors :errors CALL :fn_SetErrorLevel ENDLOCAL ECHO. ECHO Bake failure, errors were encountered. GOTO end_of_file
︙

︙
14 15 16 17 18 19 20 21 22 23 24 25 26 27	14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33	+ + + + + +	REM SET __ECHO=ECHO REM SET __ECHO3=ECHO IF NOT DEFINED _AECHO (SET _AECHO=REM) IF NOT DEFINED _CECHO (SET _CECHO=REM) IF NOT DEFINED _VECHO (SET _VECHO=REM) %_AECHO% Running %0 %* SET DUMMY2=%1 IF DEFINED DUMMY2 ( GOTO usage ) SET TOOLS=%~dp0 SET TOOLS=%TOOLS:~0,-1% %_VECHO% Tools = '%TOOLS%' CALL :fn_ResetErrorLevel
︙
84 85 86 87 88 89 90 91 92 93 94 95 96 97	90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109	+ + + + + +	VERIFY > NUL GOTO :EOF :fn_SetErrorLevel VERIFY MAYBE 2> NUL GOTO :EOF :usage ECHO. ECHO Usage: %~nx0 ECHO. GOTO errors :errors CALL :fn_SetErrorLevel ENDLOCAL ECHO. ECHO Failure, errors were encountered. GOTO end_of_file
︙

︙
15 16 17 18 19 20 21 22 23 24 25 26 27 28	15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34	+ + + + + +	REM SET __ECHO2=ECHO REM SET __ECHO3=ECHO IF NOT DEFINED _AECHO (SET _AECHO=REM) IF NOT DEFINED _CECHO (SET _CECHO=REM) IF NOT DEFINED _VECHO (SET _VECHO=REM) %_AECHO% Running %0 %* SET DUMMY2=%3 IF DEFINED DUMMY2 ( GOTO usage ) SET ROOT=%~dp0\.. SET ROOT=%ROOT:\\=\% %_VECHO% Root = '%ROOT%' SET CONFIGURATION=%1
︙
286 287 288 289 290 291 292 ~~293~~ 294 295 296 297 298 299 300	292 293 294 295 296 297 298 299 300 301 302 303 304 305 306	- +	:fn_SetErrorLevel VERIFY MAYBE 2> NUL GOTO :EOF :usage ECHO. ~~ECHO Usage: %~nx0 [configuration] [platform] ~~[...]~~~~ ECHO Usage: %~nx0 [configuration] [platform] ECHO. GOTO errors :errors CALL :fn_SetErrorLevel ENDLOCAL ECHO.
︙

︙
64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80	64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81	- + +	/// The opaque pointer returned to us by the sqlite provider /// </summary> protected internal SQLiteConnectionHandle _sql; protected string _fileName; protected bool _usePool; protected int _poolVersion; ~~#if !PLATFORM_COMPACTFRAMEWORK~~ #if (NET_35 \|\| NET_40) && !PLATFORM_COMPACTFRAMEWORK private bool _buildingSchema; #endif /// <summary> /// The user-defined functions registered on this connection /// </summary> protected SQLiteFunction[] _functionsArray; internal SQLite3(SQLiteDateFormats fmt, DateTimeKind kind) : base(fmt, kind)
︙
291 292 293 294 295 296 297 298 299 ~~300 301~~ ~~302~~ 303 304 305 306 307 308 309 310	292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317	+ + + - - + + + - + + +	Trace.WriteLine(String.Format("Open (Pool): {0}", (_sql != null) ? _sql.ToString() : "<null>")); #endif } if (_sql == null) { IntPtr db; SQLiteErrorCode n; #if !SQLITE_STANDARD if ((connectionFlags & SQLiteConnectionFlags.NoExtensionFunctions) != SQLiteConnectionFlags.NoExtensionFunctions) { ~~~~SQLiteErrorCode~~ n = UnsafeNativeMethods.sqlite3_open_interop(ToUTF8(strFilename), ~~(int)~~openFlags, out db); #else~~ n = UnsafeNativeMethods.sqlite3_open_interop(ToUTF8(strFilename), openFlags, out db); } else ~~SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_open_v2(ToUTF8(strFilename), out db, (int)openFlags, IntPtr.Zero);~~ #endif { n = UnsafeNativeMethods.sqlite3_open_v2(ToUTF8(strFilename), out db, openFlags, IntPtr.Zero); } #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(String.Format("Open: {0}", db)); #endif if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, null);
︙
519 520 521 522 523 524 525 ~~526~~ 527 528 529 530 531 532 533	526 527 528 529 530 531 532 533 534 535 536 537 538 539 540	- +	} if (cmd != null) cmd.SetTypes(typedefs); return cmd; } ~~#if !PLATFORM_COMPACTFRAMEWORK~~ #if (NET_35 \|\| NET_40) && !PLATFORM_COMPACTFRAMEWORK else if (_buildingSchema == false && String.Compare(GetLastError(), 0, "no such table: TEMP.SCHEMA", 0, 26, StringComparison.OrdinalIgnoreCase) == 0) { strRemain = ""; _buildingSchema = true; try { ISQLiteSchemaExtensions ext = ((IServiceProvider)SQLiteFactory.Instance).GetService(typeof(ISQLiteSchemaExtensions)) as ISQLiteSchemaExtensions;
︙
1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 ~~1393~~ 1394 1395 1396 1397 1398 1399 1400	1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + +	UnsafeNativeMethods.sqlite3_result_text(context, ToUTF8(value), b.Length - 1, (IntPtr)(-1)); } internal override IntPtr AggregateContext(IntPtr context) { return UnsafeNativeMethods.sqlite3_aggregate_context(context, 1); } /// <summary> /// Enables or disabled extension loading by SQLite. /// </summary> /// <param name="bOnOff"> /// True to enable loading of extensions, false to disable. /// </param> internal override void SetLoadExtension(bool bOnOff) { SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_enable_load_extension( _sql, (bOnOff ? -1 : 0)); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } /// <summary> /// Loads a SQLite extension library from the named file. /// </summary> /// <param name="fileName"> /// The name of the dynamic link library file containing the extension. /// </param> /// <param name="procName"> /// The name of the exported function used to initialize the extension. /// If null, the default "sqlite3_extension_init" will be used. /// </param> internal override void LoadExtension(string fileName, string procName) { if (fileName == null) throw new ArgumentNullException("fileName"); IntPtr pError = IntPtr.Zero; try { byte[] utf8FileName = UTF8Encoding.UTF8.GetBytes(fileName + '\0'); byte[] utf8ProcName = null; if (procName != null) utf8ProcName = UTF8Encoding.UTF8.GetBytes(procName + '\0'); SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_load_extension( _sql, utf8FileName, utf8ProcName, ref pError); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, UTF8ToString(pError, -1)); } finally { if (pError != IntPtr.Zero) { UnsafeNativeMethods.sqlite3_free(pError); pError = IntPtr.Zero; } } } /// Enables or disabled extended result codes returned by SQLite internal override void SetExtendedResultCodes(bool bOnOff) { ~~UnsafeNativeMethods.sqlite3_extended_result_codes(~~_sql, (bOnOff ? -1 : 0));~~~~ SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_extended_result_codes( _sql, (bOnOff ? -1 : 0)); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } /// Gets the last SQLite error code internal override SQLiteErrorCode ResultCode() { return UnsafeNativeMethods.sqlite3_errcode(_sql); } /// Gets the last SQLite extended error code
︙

︙
9 10 11 12 13 14 15 16 17 18 19 20 21 22	9 10 11 12 13 14 15 16 17 18 19 20 21 22 23	+	{ using System; #if !NET_COMPACT_20 && TRACE_CONNECTION using System.Diagnostics; #endif using System.IO; using System.Runtime.InteropServices; /// <summary> /// Alternate SQLite3 object, overriding many text behaviors to support UTF-16 (Unicode) /// </summary> internal class SQLite3_UTF16 : SQLite3 {
︙
105 106 107 108 109 110 111 112 113 ~~114 115 116 117~~ 118 ~~119~~ ~~120~~ 121 122 123 124 125 126 127	106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140	+ + + - - - - + + + + + + + + + + + + + - + - +	Trace.WriteLine(String.Format("Open (Pool): {0}", (_sql != null) ? _sql.ToString() : "<null>")); #endif } if (_sql == null) { IntPtr db; SQLiteErrorCode n; #if !SQLITE_STANDARD if ((connectionFlags & SQLiteConnectionFlags.NoExtensionFunctions) != SQLiteConnectionFlags.NoExtensionFunctions) { ~~SQLiteErrorCode~~ n = UnsafeNativeMethods.sqlite3_open16_interop(ToUTF8(strFilename), ~~(int)~~openFlags, out db); #else if ((openFlags & SQLiteOpenFlagsEnum.Create) ~~== 0~~ && ~~System.IO.~~File.Exists(strFilename) ~~== false~~) throw new SQLiteException(~~(int)~~SQLiteErrorCode.CantOpen, strFilename); n = UnsafeNativeMethods.sqlite3_open16_interop(ToUTF8(strFilename), openFlags, out db); } else #endif { // // NOTE: This flag check is designed to enforce the constraint that opening // a database file that does not already exist requires specifying the // "Create" flag, even when a native API is used that does not accept // a flags parameter. // if (((openFlags & SQLiteOpenFlagsEnum.Create) != SQLiteOpenFlagsEnum.Create) && !File.Exists(strFilename)) throw new SQLiteException(SQLiteErrorCode.CantOpen, strFilename); ~~~~SQLiteErrorCode~~ n = UnsafeNativeMethods.sqlite3_open16(strFilename, out db);~~ n = UnsafeNativeMethods.sqlite3_open16(strFilename, out db); ~~#endif~~ } #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(String.Format("Open: {0}", db)); #endif if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, null);
︙

︙
187 188 189 190 191 192 193 194 195 196 197 198 199 200	187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218	+ + + + + + + + + + + + + + + + + +	internal abstract void ReturnError(IntPtr context, string value); internal abstract void ReturnInt32(IntPtr context, Int32 value); internal abstract void ReturnInt64(IntPtr context, Int64 value); internal abstract void ReturnNull(IntPtr context); internal abstract void ReturnText(IntPtr context, string value); /// <summary> /// Enables or disabled extension loading by SQLite. /// </summary> /// <param name="bOnOff"> /// True to enable loading of extensions, false to disable. /// </param> internal abstract void SetLoadExtension(bool bOnOff); /// <summary> /// Loads a SQLite extension library from the named file. /// </summary> /// <param name="fileName"> /// The name of the dynamic link library file containing the extension. /// </param> /// <param name="procName"> /// The name of the exported function used to initialize the extension. /// If null, the default "sqlite3_extension_init" will be used. /// </param> internal abstract void LoadExtension(string fileName, string procName); /// <summary> /// Enables or disabled extened result codes returned by SQLite /// </summary> /// <param name="bOnOff">true to enable extended result codes, false to disable.</param> /// <returns></returns> internal abstract void SetExtendedResultCodes(bool bOnOff); /// <summary> /// Returns the numeric result code for the most recent failed SQLite API call
︙
615 616 617 618 619 620 621 622 623 624 625 626 627 628	633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652	+ + + + + +	LogCallbackException = 0x8, /// <summary> /// Enable logging of backup API errors. /// </summary> LogBackup = 0x10, /// <summary> /// Skip adding the extension functions provided by the native /// interop assembly. /// </summary> NoExtensionFunctions = 0x20, /// <summary> /// Enable all logging. /// </summary> LogAll = LogPrepare \| LogPreBind \| LogBind \| LogCallbackException \| LogBackup, /// <summary>
︙

︙
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70	30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86	+ + + + + + + + + + + + + + + +	public readonly SQLiteConnectionEventType EventType; /// <summary> /// The <see cref="StateChangeEventArgs" /> associated with this event, if any. /// </summary> public readonly StateChangeEventArgs EventArgs; /// <summary> /// The transaction associated with this event, if any. /// </summary> public readonly IDbTransaction Transaction; /// <summary> /// The command associated with this event, if any. /// </summary> public readonly IDbCommand Command; /// <summary> /// Command or message text associated with this event, if any. /// </summary> public readonly string Text; /// <summary> /// Extra data associated with this event, if any. /// </summary> public readonly object Data; /// <summary> /// Constructs the object. /// </summary> /// <param name="eventType">The type of event being raised.</param> /// <param name="eventArgs">The base <see cref="EventArgs" /> associated /// with this event, if any.</param> /// <param name="transaction">The transaction associated with this event, if any.</param> /// <param name="command">The command associated with this event, if any.</param> /// <param name="text">The command or message text, if any.</param> /// <param name="data">The extra data, if any.</param> internal ConnectionEventArgs( SQLiteConnectionEventType eventType, StateChangeEventArgs eventArgs, IDbTransaction transaction, IDbCommand command, string text, object data ) { EventType = eventType; EventArgs = eventArgs; Transaction = transaction; Command = command; Text = text; Data = data; } } /////////////////////////////////////////////////////////////////////////////////////////////////
︙
481 482 483 484 485 486 487 ~~488~~ 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 ~~505~~ 506 507 508 509 510 511 512	497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531	- + + + + - +	/// </summary> /// <param name="connection"> /// The connection associated with this event. /// </param> /// <param name="e"> /// A <see cref="ConnectionEventArgs" /> that contains the event data. /// </param> ~~~~pub~~lic static void OnChanged(~~ internal static void OnChanged( SQLiteConnection connection, ConnectionEventArgs e ) { if (connection == null) return; #if !PLATFORM_COMPACTFRAMEWORK if (!connection.CanRaiseEvents) return; #endif SQLiteConnectionEventHandler handlers; lock (_syncRoot) { if (_handlers != null) handlers = _handlers.Clone() as SQLiteConnectionEventHandler; else ~~handlers = ~~_handlers~~;~~ handlers = null; } if (handlers != null) handlers(connection, e); } ///////////////////////////////////////////////////////////////////////////////////////////////
︙
821 822 823 824 825 826 827 ~~828~~ 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 ~~848~~ 849 ~~850~~ 851 852 853 854 855 856 857 ~~858~~ 859 860 861 862 863 864 865 866 867 868 869 870 871 ~~872~~ 873 874 875 ~~876~~ 877 878 879 880 881 ~~882~~ 883 884 885 886 887 888 889 890 891 892 ~~893~~ 894 895 896 897 898 899 900	840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931	- + + - + - + - + + - + + + + + + - + + + + + + - + - +	public SQLiteTransaction BeginTransaction(bool deferredLock) { CheckDisposed(); return (SQLiteTransaction)BeginDbTransaction(deferredLock == false ? IsolationLevel.Serializable : IsolationLevel.ReadCommitted); } /// <summary> ~~/// Creates a new SQLiteTransaction if one isn't already active on the connection.~~ /// Creates a new <see cref="SQLiteTransaction" /> if one isn't already active on the connection. /// </summary> /// <param name="isolationLevel">Supported isolation levels are Serializable, ReadCommitted and Unspecified.</param> /// <remarks> /// Unspecified will use the default isolation level specified in the connection string. If no isolation level is specified in the /// connection string, Serializable is used. /// Serializable transactions are the default. In this mode, the engine gets an immediate lock on the database, and no other threads /// may begin a transaction. Other threads may read from the database, but not write. /// With a ReadCommitted isolation level, locks are deferred and elevated as needed. It is possible for multiple threads to start /// a transaction in ReadCommitted mode, but if a thread attempts to commit a transaction while another thread /// has a ReadCommitted lock, it may timeout or cause a deadlock on both threads until both threads' CommandTimeout's are reached. /// </remarks> /// <returns>Returns a SQLiteTransaction object.</returns> public new SQLiteTransaction BeginTransaction(IsolationLevel isolationLevel) { CheckDisposed(); return (SQLiteTransaction)BeginDbTransaction(isolationLevel); } /// <summary> /// Creates a new <see cref="SQLiteTransaction" /> if one isn't already ~~/// ~~Creates a new SQLiteTransaction if one isn't already~~ active on the connection.~~ /// active on the connection. /// </summary> ~~/// <returns>Returns a ~~SQLiteT~~ransaction object.</returns>~~ /// <returns>Returns the new transaction object.</returns> public new SQLiteTransaction BeginTransaction() { CheckDisposed(); return (SQLiteTransaction)BeginDbTransaction(_defaultIsolation); } /// <summary> ~~/// Forwards to the local BeginTransaction() function~~ /// Forwards to the local <see cref="BeginTransaction(IsolationLevel)" /> function /// </summary> /// <param name="isolationLevel">Supported isolation levels are Unspecified, Serializable, and ReadCommitted</param> /// <returns></returns> protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel) { if (_connectionState != ConnectionState.Open) throw new InvalidOperationException(); if (isolationLevel == IsolationLevel.Unspecified) isolationLevel = _defaultIsolation; if (isolationLevel != IsolationLevel.Serializable && isolationLevel != IsolationLevel.ReadCommitted) throw new ArgumentException("isolationLevel"); SQLiteTransaction transaction = ~~~~return~~ new SQLiteTransaction(this, isolationLevel != IsolationLevel.Serializable);~~ new SQLiteTransaction(this, isolationLevel != IsolationLevel.Serializable); OnChanged(this, new ConnectionEventArgs( SQLiteConnectionEventType.NewTransaction, null, transaction, null, null, null)); return transaction; } /// <summary> ~~/// Not implemented~~ /// This method is not implemented; however, the <see cref="Changed" /> /// event will still be raised. /// </summary> /// <param name="databaseName"></param> public override void ChangeDatabase(string databaseName) { CheckDisposed(); OnChanged(this, new ConnectionEventArgs( SQLiteConnectionEventType.ChangeDatabase, null, null, null, databaseName, null)); ~~throw new NotImplementedException();~~ throw new NotImplementedException(); // NOTE: For legacy compatibility. } /// <summary> /// When the database connection is closed, all commands linked to this connection are automatically reset. /// </summary> public override void Close() { CheckDisposed(); OnChanged(this, new ConnectionEventArgs( ~~SQLiteConnectionEventType.Closing, null, null, null));~~ SQLiteConnectionEventType.Closing, null, null, null, null, null)); if (_sql != null) { #if !PLATFORM_COMPACTFRAMEWORK if (_enlistment != null) { // If the connection is enlisted in a transaction scope and the scope is still active,
︙
922 923 924 925 926 927 928 ~~929~~ 930 931 932 933 934 935 936	953 954 955 956 957 958 959 960 961 962 963 964 965 966 967	- +	_transactionLevel = 0; } StateChangeEventArgs eventArgs = null; OnStateChange(ConnectionState.Closed, ref eventArgs); OnChanged(this, new ConnectionEventArgs( ~~SQLiteConnectionEventType.Closed, eventArgs, null, null));~~ SQLiteConnectionEventType.Closed, eventArgs, null, null, null, null)); } /// <summary> /// Returns the number of pool entries for the file name associated with this connection. /// </summary> public int PoolCount {
︙
1161 1162 1163 1164 1165 1166 1167 ~~1168~~ 1169 ~~1170~~ 1171 1172 1173 1174 1175 1176 1177 ~~1178~~ 1179 1180 1181 1182 1183 1184 1185 1186 ~~1187~~ 1188 1189 1190 1191 1192 1193 1194	1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225	- + - + - + - +	throw new InvalidOperationException(); _connectionString = value; } } /// <summary> ~~/// Create a new SQLiteCommand and associate it with this connection.~~ /// Create a new <see cref="SQLiteCommand" /> and associate it with this connection. /// </summary> ~~/// <returns>Returns an ~~instantiated SQLiteC~~ommand object already assigned to this connection.</returns>~~ /// <returns>Returns a new command object already assigned to this connection.</returns> public new SQLiteCommand CreateCommand() { CheckDisposed(); return new SQLiteCommand(this); } /// <summary> ~~/// Forwards to the local CreateCommand() function~~ /// Forwards to the local <see cref="CreateCommand" /> function. /// </summary> /// <returns></returns> protected override DbCommand CreateDbCommand() { return CreateCommand(); } /// <summary> ~~/// Returns the ~~file~~name without extension or path~~ /// Returns the data source file name without extension or path. /// </summary> #if !PLATFORM_COMPACTFRAMEWORK [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] #endif public override string DataSource { get
︙
1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283	1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317	+ + +	if (_transactionLevel > 0 && transaction != null) throw new ArgumentException("Unable to enlist in transaction, a local transaction already exists"); else if (transaction == null) throw new ArgumentNullException("Unable to enlist in transaction, it is null"); _enlistment = new SQLiteEnlistment(this, transaction); OnChanged(this, new ConnectionEventArgs( SQLiteConnectionEventType.EnlistTransaction, null, null, null, null, _enlistment)); } #endif /// <summary> /// Looks for a key in the array of key/values of the parameter string. If not found, return the specified default value /// </summary> /// <param name="items">The list to look in</param>
︙
1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 ~~1329~~ 1330 1331 1332 1333 1334 1335 1336	1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +	catch { // do nothing. } return null; } /// <summary> /// Enables or disabled extension loading. /// </summary> /// <param name="enable"> /// True to enable loading of extensions, false to disable. /// </param> public void EnableExtensions( bool enable ) { CheckDisposed(); if (_sql == null) throw new InvalidOperationException(String.Format( "Database connection not valid for {0} extensions.", enable ? "enabling" : "disabling")); _sql.SetLoadExtension(enable); } /// <summary> /// Loads a SQLite extension library from the named dynamic link library file. /// </summary> /// <param name="fileName"> /// The name of the dynamic link library file containing the extension. /// </param> public void LoadExtension( string fileName ) { CheckDisposed(); LoadExtension(fileName, null); } /// <summary> /// Loads a SQLite extension library from the named dynamic link library file. /// </summary> /// <param name="fileName"> /// The name of the dynamic link library file containing the extension. /// </param> /// <param name="procName"> /// The name of the exported function used to initialize the extension. /// If null, the default "sqlite3_extension_init" will be used. /// </param> public void LoadExtension( string fileName, string procName ) { CheckDisposed(); if (_sql == null) throw new InvalidOperationException( "Database connection not valid for loading extensions."); _sql.LoadExtension(fileName, procName); } /// <summary> /// Opens the connection using the parameters found in the <see cref="ConnectionString" />. /// </summary> public override void Open() { CheckDisposed(); OnChanged(this, new ConnectionEventArgs( ~~SQLiteConnectionEventType.Opening, null, null, null));~~ SQLiteConnectionEventType.Opening, null, null, null, null, null)); if (_connectionState != ConnectionState.Closed) throw new InvalidOperationException(); Close(); SortedList<string, string> opts = ParseConnectionString(_connectionString);
︙
1565 1566 1567 1568 1569 1570 1571 ~~1572~~ 1573 1574 1575 1576 1577 1578 1579	1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672	- +	_connectionState = oldstate; StateChangeEventArgs eventArgs = null; OnStateChange(ConnectionState.Open, ref eventArgs); OnChanged(this, new ConnectionEventArgs( ~~SQLiteConnectionEventType.Opened, eventArgs, null, null));~~ SQLiteConnectionEventType.Opened, eventArgs, null, null, null, null)); } catch { _connectionState = oldstate; throw; } }
︙
3168 3169 3170 3171 3172 3173 3174 ~~3175~~ 3176 3177 3178 3179 3180 3181 3182	3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275	- +	SQLiteBase.UTF8ToString(table, -1), (UpdateEventType)type, rowid)); } /// <summary> /// This event is raised whenever SQLite is committing a transaction. ~~/// Return non-zero to trigger a rollback~~ /// Return non-zero to trigger a rollback. /// </summary> public event SQLiteCommitHandler Commit { add { CheckDisposed();
︙
3233 3234 3235 3236 3237 3238 3239 ~~3240~~ ~~3241~~ 3242 3243 3244 3245 3246 3247 3248	3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340	- + -	private void TraceCallback(IntPtr puser, IntPtr statement) { _traceHandler(this, new TraceEventArgs( SQLiteBase.UTF8ToString(statement, -1))); } /// <summary> ~~/// This event is raised whenever SQLite is ~~committ~~ing a transaction.~~ /// This event is raised whenever SQLite is rolling back a transaction. ~~/// Return non-zero to trigger a rollback~~ /// </summary> public event EventHandler RollBack { add { CheckDisposed();
︙

︙
8 9 10 11 12 13 14 15 16 17 18 ~~19 20 21~~ 22 23 24 25 26 27 28 29 30	8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27	- + - - - - +	namespace System.Data.SQLite { using System; using System.Data.Common; #if !PLATFORM_COMPACTFRAMEWORK /// <summary> ~~/// SQLite implementation of DbProviderFactory.~~ /// SQLite implementation of <see cref="DbProviderFactory" />. /// </summary> public sealed partial class SQLiteFactory : DbProviderFactory, IDisposable { ~~/// <overloads>~~ ~~/// Constructs a new SQLiteFactory object~~ ~~/// </overloads>~~ /// <summary> ~~/// ~~Default c~~onstructor~~ /// Constructs a new instance. /// </summary> public SQLiteFactory() { // // NOTE: Do nothing here now. All the logging setup related code has // been moved to the new SQLiteLog static class. //
︙
85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 ~~101~~ 102 103 104 105 ~~106~~ 107 ~~108~~ 109 110 111 112 113 114 115 ~~116~~ 117 ~~118~~ 119 120 121 122 123 124 125 ~~126~~ 127 ~~128~~ 129 130 131 132 133 134 135 ~~136~~ 137 ~~138~~ 139 140 141 142 143 144 145 ~~146~~ 147 ~~148~~ 149 150 151 152 153 154 155 ~~156~~ 157 ~~158~~ 159 160 161 162 163 164 165 166	82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163	- + - + - + - + - + - + - + - + - + - + - + - + - + - +	/////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// This event is raised whenever SQLite raises a logging event. /// Note that this should be set as one of the first things in the /// application. This event is provided for backward compatibility only. ~~/// New code should use the SQLiteLog class instead.~~ /// New code should use the <see cref="SQLiteLog" /> class instead. /// </summary> public event SQLiteLogEventHandler Log { add { CheckDisposed(); SQLiteLog.Log += value; } remove { CheckDisposed(); SQLiteLog.Log -= value; } } /// <summary> ~~/// Static instance member which returns an instanced SQLiteFactory class.~~ /// Static instance member which returns an instanced <see cref="SQLiteFactory" /> class. /// </summary> public static readonly SQLiteFactory Instance = new SQLiteFactory(); /// <summary> ~~/// Returns a new SQLiteCommand object.~~ /// Creates and returns a new <see cref="SQLiteCommand" /> object. /// </summary> ~~/// <returns>A ~~SQLiteCommand~~ object.</returns>~~ /// <returns>The new object.</returns> public override DbCommand CreateCommand() { CheckDisposed(); return new SQLiteCommand(); } /// <summary> ~~/// Returns a new SQLiteCommandBuilder object.~~ /// Creates and returns a new <see cref="SQLiteCommandBuilder" /> object. /// </summary> ~~/// <returns>A ~~SQLiteCommandBuilder~~ object.</returns>~~ /// <returns>The new object.</returns> public override DbCommandBuilder CreateCommandBuilder() { CheckDisposed(); return new SQLiteCommandBuilder(); } /// <summary> ~~/// Creates a ~~new~~ SQLiteConnection.~~ /// Creates and returns a new <see cref="SQLiteConnection" /> object. /// </summary> ~~/// <returns>~~A SQLiteCon~~ne~~ction~~ object.</returns>~~ /// <returns>The new object.</returns> public override DbConnection CreateConnection() { CheckDisposed(); return new SQLiteConnection(); } /// <summary> ~~/// Creates a ~~new~~ SQLiteConnectionStringBuilder.~~ /// Creates and returns a new <see cref="SQLiteConnectionStringBuilder" /> object. /// </summary> ~~/// <returns>~~A SQLiteCon~~ne~~ctionStringBuilder~~ object.</returns>~~ /// <returns>The new object.</returns> public override DbConnectionStringBuilder CreateConnectionStringBuilder() { CheckDisposed(); return new SQLiteConnectionStringBuilder(); } /// <summary> ~~/// Creates a ~~new~~ SQLiteDataAdapter.~~ /// Creates and returns a new <see cref="SQLiteDataAdapter" /> object. /// </summary> ~~/// <returns>A ~~SQLiteDataAdapter~~ object.</returns>~~ /// <returns>The new object.</returns> public override DbDataAdapter CreateDataAdapter() { CheckDisposed(); return new SQLiteDataAdapter(); } /// <summary> ~~/// Creates a ~~new~~ SQLiteParameter.~~ /// Creates and returns a new <see cref="SQLiteParameter" /> object. /// </summary> ~~/// <returns>A ~~SQLiteParameter~~ object.</returns>~~ /// <returns>The new object.</returns> public override DbParameter CreateParameter() { CheckDisposed(); return new SQLiteParameter(); } } #endif }

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 ~~17 18 19 20~~ 21 22 23 24 25 26 27 28 29	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49	- + - - - - + + + + + + + + + + + + + + + + + + + + + + + +	<!-- * * System.Data.SQLite.Properties.targets - * * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! * --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- NOTE: Only use functionality available in the .NET Framework 2.0? By default, this is disabled. This must be enabled to successfully ~~build the project using Visual Studio 2008 and/or the .NET~~ build the project using Visual Studio 2005 and/or the .NET Framework 2.0 (if necessary, it will typically be enabled from within the project file itself). --> <PropertyGroup Condition="'$(NetFx20)' != 'false' Or ~~'$(TargetFrameworkVersion)' == 'v2.0' Or~~ ~~'$(TargetFrameworkVersion)' == 'v3.5'">~~ <DefineConstants>$(DefineConstants);NET_20</DefineConstants> <PropertyGroup Condition="'$(NetFx20)' != 'false'"> <DefineConstants>$(DefineConstants);NET_20</DefineConstants> </PropertyGroup> <!-- NOTE: Only use functionality available in the .NET Framework 3.5? By default, this is disabled. This must be enabled to successfully build the project using Visual Studio 2008 and/or the .NET Framework 3.5 (if necessary, it will typically be enabled from within the project file itself). --> <PropertyGroup Condition="'$(NetFx35)' != 'false'"> <DefineConstants>$(DefineConstants);NET_35</DefineConstants> </PropertyGroup> <!-- NOTE: Only use functionality available in the .NET Framework 4.0? By default, this is disabled. This must be enabled to successfully build the project using Visual Studio 2010 and/or the .NET Framework 4.0 (if necessary, it will typically be enabled from within the project file itself). --> <PropertyGroup Condition="'$(NetFx40)' != 'false'"> <DefineConstants>$(DefineConstants);NET_40</DefineConstants> </PropertyGroup> <!-- NOTE: Only use functionality available in the .NET Compact Framework 2.0? By default, this is disabled. This must be enabled to successfully build the project using Visual Studio 2005 and/or the .NET Compact Framework 2.0 (if necessary, it will typically be enabled from within the project file itself). -->
︙
88 89 90 91 92 93 94 95 96 97 98 99 100 101	108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128	+ + + + + + +	NOTE: Enable support (in the managed assemblies) for the custom extension functions? --> <PropertyGroup Condition="'$(InteropExtensionFunctions)' != 'false'"> <DefineConstants>$(DefineConstants);INTEROP_EXTENSION_FUNCTIONS</DefineConstants> </PropertyGroup> <!-- NOTE: Enable support (in the managed assemblies) for the test extension? --> <PropertyGroup Condition="'$(InteropTestExtension)' != 'false'"> <DefineConstants>$(DefineConstants);INTEROP_TEST_EXTENSION</DefineConstants> </PropertyGroup> <!-- NOTE: Enable support (in the managed assemblies) for encrypted databases using the CryptoAPI based codec? --> <PropertyGroup Condition="'$(InteropCodec)' != 'false'"> <DefineConstants>$(DefineConstants);INTEROP_CODEC</DefineConstants> </PropertyGroup>
︙

︙
577 578 579 580 581 582 583 ~~584~~ 585 586 ~~587~~ 588 589 590 591 592 593 594	577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594	- + - +	[DllImport(SQLITE_DLL)] internal static extern SQLiteErrorCode sqlite3_create_function_interop(IntPtr db, byte[] strName, int nArgs, int nType, IntPtr pvUser, SQLiteCallback func, SQLiteCallback fstep, SQLiteFinalCallback ffinal, int needCollSeq); [DllImport(SQLITE_DLL)] internal static extern SQLiteErrorCode sqlite3_finalize_interop(IntPtr stmt); [DllImport(SQLITE_DLL)] ~~internal static extern SQLiteErrorCode sqlite3_open_interop(byte[] utf8Filename, ~~int~~ flags, out IntPtr db);~~ internal static extern SQLiteErrorCode sqlite3_open_interop(byte[] utf8Filename, SQLiteOpenFlagsEnum flags, out IntPtr db); [DllImport(SQLITE_DLL)] ~~internal static extern SQLiteErrorCode sqlite3_open16_interop(byte[] utf8Filename, ~~int~~ flags, out IntPtr db);~~ internal static extern SQLiteErrorCode sqlite3_open16_interop(byte[] utf8Filename, SQLiteOpenFlagsEnum flags, out IntPtr db); [DllImport(SQLITE_DLL)] internal static extern SQLiteErrorCode sqlite3_reset_interop(IntPtr stmt); #endif // !SQLITE_STANDARD
︙
623 624 625 626 627 628 629 ~~630 631 632 633 634 635 636 637 638 639 640 641 642 643~~ 644 645 646 647 648 649 650	623 624 625 626 627 628 629 630 631 632 633 634 635 636	- - - - - - - - - - - - - -	#if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif internal static extern SQLiteErrorCode sqlite3_finalize(IntPtr stmt); ~~#if !PLATFORM_COMPACTFRAMEWORK~~ ~~[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]~~ ~~#else~~ ~~[DllImport(SQLITE_DLL)]~~ ~~#endif~~ ~~internal static extern SQLiteErrorCode sqlite3_open_v2(byte[] utf8Filename, out IntPtr db, int flags, IntPtr vfs);~~ ~~#if !PLATFORM_COMPACTFRAMEWORK~~ ~~[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)]~~ ~~#else~~ ~~[DllImport(SQLITE_DLL, CharSet = CharSet.Unicode)]~~ ~~#endif~~ ~~internal static extern SQLiteErrorCode sqlite3_open16(string fileName, out IntPtr db);~~ #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif internal static extern SQLiteErrorCode sqlite3_reset(IntPtr stmt);
︙
807 808 809 810 811 812 813 814 815 816 817 818 819 820	793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822	+ + + + + + + + + + + + + + + +	// !SQLITE_STANDARD #endregion // Standard API calls global across versions. There are a few instances of interop calls // scattered in here, but they are only active when PLATFORM_COMPACTFRAMEWORK is declared. #region standard sqlite api calls #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif internal static extern SQLiteErrorCode sqlite3_enable_load_extension( IntPtr db, int enable); #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif internal static extern SQLiteErrorCode sqlite3_load_extension( IntPtr db, byte[] fileName, byte[] procName, ref IntPtr pError); #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)] #else [DllImport(SQLITE_DLL, CharSet = CharSet.Unicode)] #endif internal static extern SQLiteErrorCode sqlite3_win32_set_directory(uint type, string value);
︙
849 850 851 852 853 854 855 856 857 858 859 860 861 862	851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878	+ + + + + + + + + + + + + +	#if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif internal static extern void sqlite3_free(IntPtr p); #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif internal static extern SQLiteErrorCode sqlite3_open_v2(byte[] utf8Filename, out IntPtr db, SQLiteOpenFlagsEnum flags, IntPtr vfs); #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)] #else [DllImport(SQLITE_DLL, CharSet = CharSet.Unicode)] #endif internal static extern SQLiteErrorCode sqlite3_open16(string fileName, out IntPtr db); #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif internal static extern void sqlite3_interrupt(IntPtr db);
︙

︙
1024 1025 1026 1027 1028 1029 1030 ~~1031~~ 1032 1033 1034 1035 1036 1037 1038	1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038	- +	\{file:test.db, FullUri=file:test\.db\} 0 \{60, Default Timeout=60\} 0 \{False,\ Enlist=False\} 0 \{True, FailIfMissing=True\} 0 \{False, Legacy Format=False\}\ 0 \{True, Read Only=True\} 0 \{secret, Password=secret\} 0 \{4096, Page\ Size=4096\} 0 \{1024, Max Page Count=1024\} 0 \{8192, Cache Size=8192\} 0\ \{UnixEpoch, DateTimeFormat=UnixEpoch\} 0 \{Utc, DateTimeKind=Utc\} 0\ \{sqlite_schema, BaseSchemaName=sqlite_schema\} 0 \{Memory, Journal\ Mode=Memory\} 0 \{Serializable, Default IsolationLevel=Serializable\} 0\ ~~\{False, Foreign Keys=False\} 0 \{LogCallbackException,\~~ \{False, Foreign Keys=False\} 0 \{(?:Default\|LogCallbackException),\ Flags=(?:Default\|LogCallbackException)\} 0 \{False, SetDefaults=False\} 0\ \{False, ToFullPath=False\}$}} ############################################################################### runTest {test data-1.17 {SQLiteConvert ToDateTime (Julian Day)} -body { set dateTime [object invoke System.Data.SQLite.SQLiteConvert ToDateTime \
︙
1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904	1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	} -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ {1 2 1}} ############################################################################### runTest {test data-1.38 {NoExtensionFunctions connection flag} -setup { setupDb [set fileName data-1.38.db] } -body { set result [list] lappend result [catch {sql execute -execute scalar $db \ "SELECT replicate('1234', 2);"} output] $output cleanupDb $fileName setupDb $fileName "" "" "" NoExtensionFunctions lappend result [catch {sql execute -execute scalar $db \ "SELECT replicate('1234', 3);"} output] $output cleanupDb $fileName setupDb $fileName lappend result [catch {sql execute -execute scalar $db \ "SELECT replicate('1234', 4);"} output] $output set result } -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -match \ regexp -result {^0 12341234 1 \{System\.Data\.SQLite\.SQLiteException\ \(0x80004005\): SQL logic error or missing database.*?\} 0 1234123412341234$}} ############################################################################### unset -nocomplain systemDataSQLiteDllFile systemDataSQLiteLinqDllFile \ testExeFile testLinqExeFile northwindEfDbFile testLinqOutFile ############################################################################### runSQLiteTestEpilogue runTestEpilogue

︙
493 494 495 496 497 498 499 500 501 502 503 504 505 506	493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	if {[string length $item] > 0} then { lappend result [$item ToString] } } return $result } proc catchAndReturn { script {stackTrace false} {strict true} } { # # NOTE: Evaluate the script provided by the caller in their context, # capturing both the result and the return code. # set code [catch {uplevel 1 $script} result] # # NOTE: Did the script provided by the caller NOT raise an error? # if {$strict && $code == 0 \|\| !$strict && $code != 1} then { # # NOTE: Success. Return a list with the return code and the result. # return [list $code $result] } elseif {$stackTrace} then { # # NOTE: Failure. The caller wants a full stack trace (if applicable), # return a list with the return code and the result verbatim. # return [list $code $result] } else { # # NOTE: Failure. The caller does not want a full stack trace (if # applicable), return a list with the return code, the error # code for the interpreter, and the error message up to the # point where the stack trace should start. # set index [string first " at " $result]; # HACK: Reliable? return [list $code $::errorCode [expr {$index != -1 ? \ [string trim [string range $result 0 $index]] : $result}]] } } proc compileCSharpWith { text memory symbols strict resultsVarName errorsVarName fileNames args } { # # NOTE: Since we are going to use this method name a lot, assign it to a # variable first.
︙
1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042	1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080	+ + +	CHECK_STATE checkForSQLiteDefineConstant $::test_channel \ USE_INTEROP_DLL checkForSQLiteDefineConstant $::test_channel \ INTEROP_EXTENSION_FUNCTIONS checkForSQLiteDefineConstant $::test_channel \ INTEROP_TEST_EXTENSION # # NOTE: Report the resource usage prior to running any tests. # reportSQLiteResources $::test_channel #
︙








































































1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	############################################################################### # # tkt-17045010df.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 tkt-17045010df-1.1 {EnableExtensions & LoadExtension} -setup { setupDb [set fileName tkt-17045010df-1.1.db] } -body { set connection [object invoke -flags +NonPublic -objectflags +NoDispose \ -alias Interpreter.GetActive.connections get_Item $db] lappend result [catchAndReturn {$connection EnableExtensions false}] lappend result [catchAndReturn {$connection LoadExtension [file join \ [getBinaryDirectory] SQLite.Interop.dll] interop_test_extension_init}] lappend result [catchAndReturn {sql execute -execute scalar $db \ "SELECT interopTest('test1');"}] lappend result [catchAndReturn {sql execute -execute scalar $db \ "SELECT interopTest('test1', '1234');"}] lappend result [catchAndReturn {$connection EnableExtensions true}] lappend result [catchAndReturn {$connection LoadExtension [file join \ [getBinaryDirectory] SQLite.Interop.dll] interop_test_extension_init}] lappend result [catchAndReturn {sql execute -execute scalar $db \ "SELECT interopTest('test2');"}] lappend result [catchAndReturn {sql execute -execute scalar $db \ "SELECT interopTest('test2', '5678');"}] string map [list \r\n ", "] $result } -cleanup { unset -nocomplain result connection cleanupDb $fileName unset -nocomplain db fileName } -constraints \ {eagle monoBug28 defineConstant.System.Data.SQLite.INTEROP_TEST_EXTENSION\ command.sql compile.DATA SQLite System.Data.SQLite} -result {{0 {}} {1\ {EXCEPTION System.Data.SQLite.SQLiteException}\ {System.Reflection.TargetInvocationException: Exception has been thrown by the\ target of an invocation. ---> System.Data.SQLite.SQLiteException: SQL logic\ error or missing database, not authorized}} {1 {EXCEPTION\ System.Data.SQLite.SQLiteException} {System.Data.SQLite.SQLiteException\ (0x80004005): SQL logic error or missing database, no such function:\ interopTest}} {1 {EXCEPTION System.Data.SQLite.SQLiteException}\ {System.Data.SQLite.SQLiteException (0x80004005): SQL logic error or missing\ database, no such function: interopTest}} {0 {}} {0 {}} {0 test2} {1 {EXCEPTION\ System.Data.SQLite.SQLiteException} {System.Data.SQLite.SQLiteException\ (0x80004005): SQL logic error or missing database, need exactly one argument}}}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue

︙
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29	15 16 17 18 19 20 21 22 23 24 25 26 27 28 29	- +	#if WINDOWS using System.Runtime.InteropServices; #endif using System.Security; ~~#if NET_20~~ #if NET_20 \|\| NET_35 using System.Security.Permissions; #endif using System.Threading; using System.Windows.Forms; using System.Xml; using Microsoft.Win32;
︙
146 147 148 149 150 151 152 ~~153~~ 154 155 156 157 158 159 160	146 147 148 149 150 151 152 153 154 155 156 157 158 159 160	- +	Default = Medium } #endregion /////////////////////////////////////////////////////////////////////////// #region Installer Class ~~#if ~~!NET_2~~0~~ #if NET_40 [SecurityCritical()] #else [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)] #endif internal static class Installer { #region Unsafe Native Methods Class
︙