Version History

1.0.75.0 - September XX, 2011

Updated to SQLite 3.7.8 [3e0da808d2].
More enhancements to the build system.
Add official NuGet package.
Add Changes and LastInsertRowId properties to the connection class.
Make all the assembly versioning attributes consistent.
Add unit testing infrastructure using Eagle.
Integrate all legacy unit tests, including the "testlinq" project, into the new test suite.
Add projects to build the interop assembly statically linked to the Visual C++ runtime. Fix for [53f0c5cbf6].
Add SQLITE_ENABLE_STAT2 compile-time option to the interop assembly. Fix for [74807fbf27].
Fix mutex issues exposed when running the test suite with the debug version of SQLite.
Fix transaction enlistment when repeated attempts are made to enlist in the same transaction. Fix for [ccfa69fc32].
Support the SQLITE_FCNTL_WIN32_AV_RETRY file control to mitigate the impact of file sharing violations caused by external processes.
Refactor the logging interface to be thread-safe and self-initializing.
Shutdown the SQLite native interface when the AppDomain is being unloaded. Fix for [b4a7ddc83f].
Support Skip operation for LINQ using OFFSET. Fix for [8b7d179c3c].
Support EndsWith operation for LINQ using SUBSTR. Fix for [59edc1018b].
Support all SQLite journal modes. Fix for [448d663d11].
Do not throw exceptions when disposing SQLiteDataReader. Fix for [e1b2e0f769].
The REAL type should be mapped to System.Double. Fix for [2c630bffa7] and [b0a5990f48].
Minor optimization to GetParamValueBytes(). Fix for [201128cc88].
Support the ON UPDATE, ON DELETE, and MATCH clause information when generating schema metadata for foreign keys. Partial fix for [b226147b37]. VS designer changes are not yet tested.
Fix incorrect resource name for SR.resx in the mixed-mode assembly.

1.0.74.0 - July 4, 2011

Updated to SQLite 3.7.7.1 [af0d91adf4].
Fix incorrect hard-coded .NET Framework version information SQLiteFactory_Linq.cs that was causing IServiceProvider.GetService to fail when running against the .NET Framework 3.5.
Fix all XML documentation warnings.
Add the testlinq project to the new build system and make it work properly with Visual Studio 2008 and 2010.

1.0.73.0 - June 2, 2011

Updated to SQLite 3.7.6.3 [ed1da510a2].
Minor optimization to GetBytes(). Fix for [8c1650482e].
Minor optimization to GetBytes(). Fix for [8c1650482e].
Update various assembly information settings.
Correct System.Data.SQLite.Linq version and resource information. Fix for [6489c5a396] and [133daf50d6].
Correct System.Data.SQLite.Linq version and resource information. Fix for [6489c5a396] and [133daf50d6].
Moved log handler from SQLiteConnection object to SQLiteFactory object to prevent if from being prematurely GCed.
We should block x64 installs on x86 and we should install native only if the setup package itself is native. Fix for [e058ce156e].
We should block x64 installs on x86 and we should install native only if the setup package itself is native. Fix for [e058ce156e].

1.0.72.0 - May 1, 2011

Add the correct directory to the path. Fix for [50515a0c8e].
Add the correct directory to the path. Fix for [50515a0c8e].

1.0.71.0 - April 27, 2011

Updated to SQLite 3.7.6+ [1bd1484cd7] to get additional Windows error logging.
Updated setup to optionally add install directory to PATH if GAC option selected.

Distributing the Binaries (Compact Framework)

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

DELETED Externals/Eagle/Tests/constraints.eagle Index: Externals/Eagle/Tests/constraints.eagle ================================================================== --- Externals/Eagle/Tests/constraints.eagle +++ /dev/null @@ -1,1574 +0,0 @@ -############################################################################### -# -# constraints.eagle -- -# -# Extensible Adaptable Generalized Logic Engine (Eagle) -# Test Constraints File -# -# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. -# -# See the file "license.terms" for information on usage and redistribution of -# this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: $ -# -############################################################################### - -# -# NOTE: Use our own namespace here because even though we do not directly -# support namespaces ourselves, we do not want to pollute the global -# namespace if this script actually ends up being evaluated in Tcl. -# -namespace eval ::Eagle { - proc checkForPlatform { channel } { - tputs $channel "---- checking for platform... " - - addConstraint $::tcl_platform(platform) - - if {![isEagle]} then { - # - # BUGFIX: We do not want to skip any Mono bugs in Tcl. - # Also, fake the culture. - # - set constraints [list monoToDo monoBug monoCrash culture.en_US] - - # - # NOTE: Add the necessary constraints for each version - # of Mono we know about. - # - foreach version [list 20 22 24 26 28 210 30] { - addConstraint [appendArgs monoToDo $version] - addConstraint [appendArgs monoBug $version] - addConstraint [appendArgs monoCrash $version] - } - - foreach constraint $constraints { - addConstraint $constraint; # running in Tcl. - } - } - - tputs $channel [appendArgs $::tcl_platform(platform) \n] - } - - proc checkForEagle { channel } { - tputs $channel "---- checking for Eagle... " - - if {[isEagle]} then { - # - # NOTE: We are running inside Eagle. - # - addConstraint eagle - - # - # NOTE: We do not want to skip bugs or crashing - # issues for Tcl since we are not running - # in Tcl. - # - addConstraint tclBug - addConstraint tclCrash - - # - # NOTE: Add the necessary constraints for each - # version of Tcl we know about. - # - foreach version [list 84 85 86] { - addConstraint [appendArgs tclBug $version] - addConstraint [appendArgs tclCrash $version] - } - - tputs $channel yes\n - } else { - # - # NOTE: We are running inside Tcl. - # - addConstraint tcl - - # - # NOTE: Each Tcl bug and crash constraint is set - # based on the exact Tcl version (i.e. not - # greater than or equal to). - # - if {[info exists ::tcl_version]} then { - # - # NOTE: For each Tcl version we know about, - # check it against the currently running - # Tcl version. If the two are not equal, - # add the test constraints that prevent - # skipping those tests that are buggy - # only for the particular version of Tcl. - # - foreach dotVersion [list 8.4 8.5 8.6] { - if {$::tcl_version ne $dotVersion} then { - set version [string map [list . ""] $dotVersion] - - addConstraint [appendArgs tclBug $version] - addConstraint [appendArgs tclCrash $version] - } - } - } - - # - # NOTE: We do not want to skip bugs or crashing - # issues for Eagle since we are not running - # in Eagle. - # - addConstraint eagleBug - addConstraint eagleCrash - - tputs $channel no\n - } - } - - proc checkForGaruda { channel } { - tputs $channel "---- checking for Garuda... " - - if {[haveGaruda packageId]} then { - # - # NOTE: We are running with or via Garuda. - # - addConstraint garuda - - tputs $channel [appendArgs "yes (" $packageId ")\n"] - } else { - tputs $channel no\n - } - } - - proc checkForShell { channel } { - tputs $channel "---- checking for shell... " - - set name [file rootname [file tail [info nameofexecutable]]] - - if {[isEagle]} then { - if {$name eq "EagleShell"} then { - # - # NOTE: We are running in Eagle via the EagleShell. - # - addConstraint shell - - tputs $channel "yes (Eagle)\n" - - # - # NOTE: We are done here, return now. - # - return - } - } else { - if {[string match tclsh* $name]} then { - # - # NOTE: We are running in Tcl via tclsh. - # - addConstraint shell - - tputs $channel "yes (Tcl)\n" - - # - # NOTE: We are done here, return now. - # - return - } - } - - tputs $channel no\n - } - - proc checkForDebug { channel } { - tputs $channel "---- checking for debug... " - - if {[info exists ::tcl_platform(debug)] && $::tcl_platform(debug)} then { - addConstraint debug - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForVersion { channel } { - tputs $channel "---- checking for language version... " - - if {[info exists ::tcl_version]} then { - # - # TODO: Cleanup the semantics for adding test - # constraints here. - # - if {$::tcl_version eq "8.4"} then { - # - # NOTE: Baseline reported language and feature - # version. - # - addConstraint tcl84 - addConstraint tcl84OrHigher - addConstraint tcl84Feature - - if {[isEagle]} then { - # - # NOTE: *EAGLE* We do want to include any - # tests that target "Tcl 8.5 or higher" - # features and/or "Tcl 8.6 or higher" - # features because they would not be in - # the test suite if we did not support - # that particular feature, regardless - # of the language version. - # - addConstraint tcl85Feature - addConstraint tcl86Feature - } - } elseif {$::tcl_version eq "8.5"} then { - # - # NOTE: Baseline reported language and feature - # version. Tcl 8.5 includes all the - # features from itself and Tcl 8.4. - # - addConstraint tcl85 - addConstraint tcl84OrHigher - addConstraint tcl85OrHigher - addConstraint tcl84Feature - addConstraint tcl85Feature - - if {[isEagle]} then { - # - # NOTE: *EAGLE* We do want to include any - # tests that target "Tcl 8.5 or higher" - # features and/or "Tcl 8.6 or higher" - # features because they would not be in - # the test suite if we did not support - # that particular feature, regardless - # of the language version. - # - addConstraint tcl86Feature - } - } elseif {$::tcl_version eq "8.6"} then { - # - # NOTE: Baseline reported language and feature - # version. Tcl 8.6 includes all the - # features from itself Tcl 8.4, and Tcl - # 8.5. - # - addConstraint tcl86 - addConstraint tcl84OrHigher - addConstraint tcl85OrHigher - addConstraint tcl86OrHigher - addConstraint tcl84Feature - addConstraint tcl85Feature - addConstraint tcl86Feature - } - - tputs $channel [appendArgs $::tcl_version \n] - } else { - tputs $channel no\n - } - } - - proc checkForCommand { channel name } { - tputs $channel [appendArgs "---- checking for command \"" $name \ - "\"... "] - - # - # NOTE: Is the command available? - # - if {[llength [info commands $name]] > 0} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint command.$name - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForFile { channel name {constraint ""} } { - tputs $channel [appendArgs "---- checking for file \"" $name \ - "\"... "] - - if {[file exists $name]} then { - # - # NOTE: Yes, it appears that it is available. - # - if {[string length $constraint] > 0} then { - addConstraint file_$constraint - } else { - addConstraint file_[file tail $name] - } - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForPathFile { channel name {constraint ""} } { - tputs $channel [appendArgs "---- checking for file \"" $name \ - "\" along PATH... "] - - if {[file exists $name]} then { - # - # NOTE: Yes, it appears that it is available [in the exact location they - # specified]. - # - if {[string length $constraint] > 0} then { - addConstraint file_$constraint - } else { - addConstraint file_[file tail $name] - } - - tputs $channel yes\n - - # - # NOTE: We are done here, return now. - # - return - } else { - # - # NOTE: Use the appropriate environment variable for the platform. - # - if {$::tcl_platform(platform) eq "windows"} then { - set pathName PATH - } else { - # - # HACK: For shared libraries, use the LD_LIBRARY_PATH. - # - if {[file extension $name] eq [info sharedlibextension]} then { - set pathName LD_LIBRARY_PATH - } else { - set pathName PATH - } - } - - # - # NOTE: Is the required environment variable available? - # - if {[info exists ::env($pathName)]} then { - # - # NOTE: Ok, grab it now. - # - set path $::env($pathName) - - # - # NOTE: Use the appropriate path separator for the platform. - # - if {[info exists ::tcl_platform(pathSeparator)]} then { - set separator $::tcl_platform(pathSeparator) - } elseif {$::tcl_platform(platform) eq "windows"} then { - set separator \; - } else { - set separator : - } - - # - # NOTE: Grab just the file name from the possibly fully qualified file - # name provided by the caller. - # - set tail [file tail $name] - - # - # NOTE: Check each directory in the PATH for the file. - # - foreach directory [split $path $separator] { - # - # NOTE: Check for the file in this directory contained in the PATH. - # This strips the directory portion off the file name specified - # by the caller, if any, before joining that file name to the - # current directory of the PATH being searched. - # - if {[file exists [file join $directory $tail]]} then { - # - # NOTE: Yes, it appears that it is available in the PATH. - # - if {[string length $constraint] > 0} then { - addConstraint file_$constraint - } else { - addConstraint file_[file tail $name] - } - - tputs $channel yes\n - - # - # NOTE: We are done here, return now. - # - return - } - } - } - } - - tputs $channel no\n - } - - proc checkForNativeCode { channel } { - tputs $channel "---- checking for native code... " - - if {[isEagle]} then { - if {[info exists ::eagle_platform(compileOptions)] && \ - [info exists ::tcl_platform(platform)] && \ - [lsearch -exact -nocase $::eagle_platform(compileOptions) \ - $::tcl_platform(platform)] != -1} then { - # - # NOTE: Yes, the binary matches the current platform, - # native code can be used. - # - addConstraint native - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } else { - # - # NOTE: Tcl is always native code and can always execute native code. - # - addConstraint native - - # - # HACK: Needed by test "benchmark-1.22". - # - addConstraint compile.NATIVE - - tputs $channel yes\n - } - } - - proc checkForTip127 { channel } { - tputs $channel "---- checking for TIP #127... " - - # - # NOTE: Is the interpreter TIP #127 ready? - # - if {[catch {lsearch -index 0 0 0}] == 0} then { - addConstraint tip127 - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForTip194 { channel } { - tputs $channel "---- checking for TIP #194... " - - # - # NOTE: Is the interpreter TIP #194 ready? - # - catch {apply} error - - if {$error ne {invalid command name "apply"}} then { - addConstraint tip194 - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForTip241 { channel } { - tputs $channel "---- checking for TIP #241... " - - # - # NOTE: Is the interpreter TIP #241 ready? - # - if {[catch {lsearch -nocase 0 0}] == 0} then { - addConstraint tip241 - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForTip285 { channel } { - tputs $channel "---- checking for TIP #285... " - - # - # NOTE: Is the interpreter TIP #285 ready? - # - catch {interp cancel} error - - if {$error eq "eval canceled"} then { - addConstraint tip285 - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForTiming { channel threshold } { - tputs $channel "---- checking for precision timing... " - - # - # NOTE: Are we allowed to do precision timing tests? - # - if {![info exists ::no(timing)]} then { - # - # NOTE: Attempt to block for exactly one second. - # - set start [expr {[clock clicks -milliseconds] & 0x7fffffff}] - after 1000; # wait for "exactly" one second. - set stop [expr {[clock clicks -milliseconds] & 0x7fffffff}] - - # - # NOTE: Calculate the difference between the actual and expected - # number of milliseconds. - # - set difference [expr {abs($stop - $start - 1000)}] - - # - # NOTE: Are we within the threshold specified by the caller? - # - if {$difference >= 0 && $difference <= $threshold} then { - addConstraint timing - - tputs $channel [appendArgs "yes (0 <= " $difference " <= " \ - $threshold " milliseconds)\n"] - } else { - tputs $channel [appendArgs "no (0 <= " $difference " > " \ - $threshold " milliseconds)\n"] - } - } else { - tputs $channel no\n - } - } - - proc checkForPerformance { channel } { - tputs $channel "---- checking for performance testing... " - - # - # NOTE: Are we allowed to do performance testing? - # - if {![info exists ::no(performance)]} then { - addConstraint performance - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForInteractive { channel } { - tputs $channel "---- checking for interactive user... " - - # - # NOTE: Is there an interactive user? - # - if {[info exists ::tcl_interactive] && $::tcl_interactive} then { - addConstraint interactive - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForUserInteraction { channel } { - tputs $channel "---- checking for user interaction... " - - # - # HACK: For now, do the exact same check as checkForInteractive; however, - # this is still useful as a separate constraint because it can be - # individually disabled in "prologue.eagle". - # - if {[info exists ::tcl_interactive] && $::tcl_interactive} then { - addConstraint userInteraction - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForNetwork { channel host timeout } { - tputs $channel [appendArgs \ - "---- checking for network connectivity to host \"" $host "\"... "] - - if {[isEagle]} then { - # - # BUGBUG: Tcl 8.4 does not like this expression (and Tcl tries to - # compile it even though it will only actually ever be - # evaluated in Eagle). - # - set expr {[llength [info commands uri]] > 0 && \ - [catch {uri ping $host $timeout} response] == 0 && \ - [lindex $response 0] in [list Success TimedOut] && \ - [string is integer -strict [lindex $response 1]] && \ - [lindex $response 1] <= $timeout} - - # - # NOTE: Does it look like we are able to contact the network host? - # - if {[expr $expr]} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint network_$host - - tputs $channel [appendArgs "yes (" $response ")\n"] - } else { - tputs $channel no\n - } - } else { - # - # HACK: Running in Tcl, just assume we have network access. - # - addConstraint network_$host - - tputs $channel yes\n - } - } - - if {[isEagle]} then { - ########################################################################### - ############################ BEGIN Eagle ONLY ############################# - ########################################################################### - - proc checkForSoftwareUpdateTrust { channel } { - tputs $channel "---- checking for software update trust... " - - if {[llength [info commands uri]] > 0 && \ - [catch {uri softwareupdates} result] == 0 && \ - $result eq "software update certificate is trusted"} then { - # - # NOTE: Yes, it appears that we trust our software updates. - # Since this setting is off by default, the user (or - # a script evaluated by the user) must have manually - # turned it on. - # - addConstraint softwareUpdate - - tputs $channel "trusted\n" - } else { - tputs $channel "untrusted\n" - } - } - - proc checkForAdministrator { channel } { - tputs $channel "---- checking for administrator... " - - if {[isAdministrator]} then { - addConstraint administrator; # running as full admin. - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForHost { channel } { - tputs $channel "---- checking for host... " - - if {[set code [catch {host isopen} result]] == 0 && $result} then { - addConstraint hostIsOpen - - tputs $channel open\n - } elseif {$code == 0} then { - tputs $channel closed\n - } else { - tlog $result; tputs $channel error\n] - } - } - - proc checkForPrimaryThread { channel } { - tputs $channel "---- checking for primary thread... " - - set threadId [object invoke Interpreter.GetActive ThreadId] - - if {[info tid] == $threadId} then { - addConstraint primaryThread - - tputs $channel [appendArgs "yes (" $threadId ")\n"] - } else { - tputs $channel [appendArgs "no (" $threadId ")\n"] - } - } - - proc checkForRuntime { channel } { - tputs $channel "---- checking for runtime... " - - # - # NOTE: Are we running inside Mono (regardless of operating system)? - # - if {[isMono]} then { - # - # NOTE: Yes, it appears that we are running inside Mono. - # - addConstraint mono; # running on Mono. - - tputs $channel [appendArgs [expr {[info exists \ - ::eagle_platform(runtime)] ? \ - $::eagle_platform(runtime) : "Mono"}] \n] - } else { - # - # NOTE: No, it appears that we are not running inside Mono. - # - addConstraint dotNet; # running on .NET. - - # - # NOTE: We do not want to skip Mono bugs on .NET. - # - addConstraint monoToDo; # running on .NET. - addConstraint monoBug; # running on .NET. - addConstraint monoCrash; # running on .NET. - - tputs $channel [appendArgs [expr {[info exists \ - ::eagle_platform(runtime)] ? \ - $::eagle_platform(runtime) : "Microsoft.NET"}] \n] - } - } - - proc checkForImageRuntimeVersion { channel } { - tputs $channel "---- checking for image runtime version... " - - if {[info exists ::eagle_platform(imageRuntimeVersion)] && \ - [string length $::eagle_platform(imageRuntimeVersion)] > 0} then { - # - # NOTE: Get the major and minor portions of the version only. - # - set dotVersion [join [lrange [split \ - $::eagle_platform(imageRuntimeVersion) .] 0 1] .] - - # - # NOTE: Now create a version string for use in the constraint name - # (remove the periods). - # - set version [string map [list v "" . ""] $dotVersion] - - # - # NOTE: Keep track of the specific image runtime version for usage in - # test constraints. - # - addConstraint imageRuntime$version - - tputs $channel [appendArgs $::eagle_platform(imageRuntimeVersion) \ - " " ( $dotVersion ) \n] - } else { - tputs $channel no\n - } - } - - proc checkForRuntimeVersion { channel } { - tputs $channel "---- checking for runtime version... " - - if {[info exists ::eagle_platform(runtimeVersion)] && \ - [string length $::eagle_platform(runtimeVersion)] > 0} then { - # - # NOTE: Get the major and minor portions of the version only. - # - set dotVersion [join [lrange [split \ - $::eagle_platform(runtimeVersion) .] 0 1] .] - - # - # NOTE: Now create a version string for use in the constraint name - # (remove the periods). - # - set version [string map [list . ""] $dotVersion] - - if {[isMono]} then { - if {[string length $version] > 0} then { - # - # NOTE: We are running on Mono. Keep track of the specific - # version for usage in test constraints. - # - addConstraint mono$version - } - - if {[string length $dotVersion] > 0 && \ - [regexp -- {^(\d+)\.(\d+)$} $dotVersion dummy \ - majorVersion minorVersion]} then { - set monoVersions [list] - - # - # NOTE: Check for any Mono version 2.x or higher. - # - if {$majorVersion >= 2} then { - # - # NOTE: Check for any Mono version higher than 2.0. - # - if {$majorVersion > 2 || $minorVersion > 0} then { - lappend monoVersions 20 - } - - # - # NOTE: Check for any Mono version higher than 2.2. - # - if {$majorVersion > 2 || $minorVersion > 2} then { - lappend monoVersions 22 - } - - # - # NOTE: Check for any Mono version higher than 2.4. - # - if {$majorVersion > 2 || $minorVersion > 4} then { - lappend monoVersions 24 - } - - # - # NOTE: Check for any Mono version higher than 2.6. - # - if {$majorVersion > 2 || $minorVersion > 6} then { - lappend monoVersions 26 - } - - # - # NOTE: Check for any Mono version higher than 2.8. - # - if {$majorVersion > 2 || $minorVersion > 8} then { - lappend monoVersions 28 - } - - # - # NOTE: Check for any Mono version higher than 2.10. - # - if {$majorVersion > 2 || $minorVersion > 10} then { - lappend monoVersions 210 - } - } - - # - # NOTE: Check for any Mono version 3.x or higher. - # - if {$majorVersion >= 3} then { - # - # NOTE: Check for any Mono version higher than 3.0. - # - if {$majorVersion > 3 || $minorVersion > 0} then { - lappend monoVersions 30 - } - } - - # - # NOTE: Add the necessary constraints for each version of Mono we - # should NOT skip bugs for. - # - foreach monoVersion $monoVersions { - addConstraint [appendArgs monoToDo $monoVersion] - addConstraint [appendArgs monoBug $monoVersion] - addConstraint [appendArgs monoCrash $monoVersion] - } - } - } else { - if {[string length $version] > 0} then { - # - # NOTE: We are running on the .NET Framework. Keep track of the - # specific version for usage in test constraints. - # - addConstraint dotNet$version - } - - # - # NOTE: We do not want to skip any Mono bugs on .NET. Add the - # necessary constraints for each version of Mono we know - # about. - # - foreach monoVersion [list 20 22 24 26 28 210 30] { - addConstraint [appendArgs monoToDo $monoVersion] - addConstraint [appendArgs monoBug $monoVersion] - addConstraint [appendArgs monoCrash $monoVersion] - } - } - - tputs $channel [appendArgs $::eagle_platform(runtimeVersion) \ - " " ( $dotVersion ) \n] - } else { - tputs $channel no\n - } - } - - proc checkForMachine { channel bits machine } { - tputs $channel [appendArgs "---- checking for machine \"" $bits \ - "-bit " $machine "\"... "] - - # - # NOTE: What are the machine architecture and the - # number of bits for this operating system? - # - if {[info exists ::tcl_platform(machine)] && \ - [info exists ::tcl_platform(osBits)]} then { - # - # NOTE: Does the machine and number of bits match - # what the caller specified? - # - if {$::tcl_platform(machine) eq $machine && \ - $::tcl_platform(osBits) eq $bits} then { - # - # NOTE: Yes, it matches. - # - addConstraint $machine.${bits}bit - - set result yes - } else { - set result no - } - - tputs $channel [appendArgs $result ", " $::tcl_platform(osBits) -bit \ - " " $::tcl_platform(machine)\n] - } else { - tputs $channel "no, unknown\n" - } - } - - proc checkForGarudaDll { channel } { - # - # NOTE: Check for the Garuda DLL of the same platform (i.e. machine - # type) as the native Tcl shell. - # - return [checkForFile $channel [file join $::base_path bin \ - [machineToPlatform [getMachineForTclShell]] \ - [appendArgs $::eagle_platform(configuration) Dll] \ - [appendArgs Garuda [info sharedlibextension]]]] - } - - proc checkForCulture { channel } { - tputs $channel "---- checking for culture... " - - # - # NOTE: Grab the current culture. - # - set culture [info culture] - - if {[string length $culture] > 0} then { - # - # NOTE: The culture information is present, use it and show it. - # - addConstraint culture.[string map [list - _] $culture] - - tputs $channel [appendArgs $culture \n] - } else { - tputs $channel [appendArgs unknown \n] - } - } - - proc checkForReferenceCountTracking { channel } { - tputs $channel "---- checking for object reference count tracking... " - - if {[info exists ::eagle_platform(compileOptions)] && \ - ([lsearch -exact -nocase $::eagle_platform(compileOptions) \ - NOTIFY] != -1 || \ - [lsearch -exact -nocase $::eagle_platform(compileOptions) \ - NOTIFY_OBJECT] != -1)} then { - # - # NOTE: Yes, support for object reference count tracking is present. - # - addConstraint refCount - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForCompileOption { channel option } { - tputs $channel [appendArgs "---- checking for compile option \"" \ - $option "\"... "] - - if {[info exists ::eagle_platform(compileOptions)] && \ - [lsearch -exact -nocase $::eagle_platform(compileOptions) \ - $option] != -1} then { - # - # NOTE: Yes, support for the compile option is present. - # - addConstraint compile.$option - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForRuntimeOption { channel option } { - tputs $channel [appendArgs "---- checking for runtime option \"" \ - $option "\"... "] - - if {[info exists ::eagle_platform(runtimeOptions)] && \ - [lsearch -exact -nocase $::eagle_platform(runtimeOptions) \ - $option] != -1} then { - # - # NOTE: Yes, support for the runtime option is present. - # - addConstraint runtime.$option - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForDynamicLoading { channel } { - tputs $channel "---- checking for dynamic loading... " - - # - # NOTE: As far as we know, dynamic loading always works on Windows. - # On some Unix systems, dlopen does not work (e.g. because - # Mono is statically linked, etc). - # - if {$::tcl_platform(platform) eq "windows" || \ - ([llength [info commands library]] > 0 && \ - [catch {library test}] == 0)} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint dynamic - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForWindowsForms { channel } { - tputs $channel "---- checking for Windows Forms... " - - # - # HACK: When running on Windows, we do not need to do any other - # special checks here; however, on Unix (and Mac OS X?), - # we should check for the DISPLAY environment variable as - # some basic indication that the X server is available. - # This appears to be very necessary on Mono because it - # crashes after repeated failed attempts to create a - # Windows Form when the X server is unavailable (e.g. on - # OpenBSD). - # - if {$::tcl_platform(platform) eq "windows" || \ - [info exists ::env(DISPLAY)]} then { - # - # NOTE: Is the Windows Forms assembly available? - # - if {[catch {object resolve System.Windows.Forms} assembly] == 0} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint winForms - - tputs $channel yes\n - - # - # NOTE: We are done here, return now. - # - return - } - } - - tputs $channel no\n - } - - proc checkForStaThread { channel } { - tputs $channel "---- checking for STA thread... " - - if {[catch {object invoke System.Threading.Thread.CurrentThread \ - GetApartmentState} apartmentState] == 0 && \ - $apartmentState eq "STA"} then { - # - # NOTE: Yes, we are running in an STA thread. - # - addConstraint staThread - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForWindowsPresentationFoundation { channel } { - tputs $channel "---- checking for Windows Presentation Foundation... " - - # - # NOTE: Is the Windows Presentation Foundation available? - # - if {[catch {object resolve PresentationFramework} assembly] == 0} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint wpf - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForDatabase { channel string } { - tputs $channel "---- checking for database... " - - # - # HACK: Disable database connectivity testing on Mono because - # it fails to timeout (unless special test suite hacks - # for Mono have been disabled by the user). - # - if {[info exists ::no(mono)] || ![isMono]} then { - # - # NOTE: Can we access the local database? - # - if {[catch {sql open $string} connection] == 0} then { - # - # NOTE: Yes, it appears that we can connect to the local database. - # - addConstraint sql - - # - # NOTE: Cleanup the database connection we just opened. - # - sql close $connection - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } else { - tputs $channel "disabled\n" - } - } - - proc checkForAssembly { channel name } { - tputs $channel [appendArgs "---- checking for assembly \"" $name \ - "\"... "] - - # - # NOTE: Can the assembly be loaded? - # - if {[catch {object resolve $name} assembly] == 0} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint $name - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForObjectMember { channel object member } { - tputs $channel [appendArgs "---- checking for object member \"" \ - $object . $member "\"... "] - - if {[catch {object members -flags +NonPublic -pattern $member $object} \ - members] == 0 && [llength $members] > 0} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint $object.[string trim $member *?] - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForTclInstalls { channel } { - tputs $channel "---- checking for Tcl installs... " - - # - # NOTE: Check for dynamically loadable Tcl libraries (for this - # architecture only). - # - if {[catch {tcl select -architecture} tcl] == 0} then { - # - # NOTE: Did we find one? Attempt to grab the index - # of the version field from the list. - # - set index [lsearch -exact $tcl version] - - if {$index != -1} then { - # - # NOTE: The very next list index contains the value - # (i.e. like a Tcl 8.5+ dict). - # - set dotVersion [lindex $tcl [incr index]] - - # - # NOTE: Do we know the version? - # - if {[string length $dotVersion] > 0 && \ - [regexp -- {^\d+\.\d+$} $dotVersion]} then { - # - # NOTE: Yes, some version of Tcl is available. - # - addConstraint tclLibrary - - # - # NOTE: Is the version 8.x or higher? - # - if {$dotVersion >= 8.6} then { - addConstraint tclLibrary86 - } elseif {$dotVersion >= 8.5} then { - addConstraint tclLibrary85 - } elseif {$dotVersion >= 8.4} then { - addConstraint tclLibrary84 - } - - tputs $channel [appendArgs $dotVersion \n] - - # - # NOTE: We are done here, return now. - # - return - } - } - } - - tputs $channel no\n - } - - proc checkForTclReady { channel } { - tputs $channel "---- checking for Tcl readiness... " - - if {[catch {tcl ready} result] == 0 && $result} then { - # - # NOTE: Yes, native Tcl is loaded and ready. - # - addConstraint tclReady - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForTclShell { channel } { - # - # HACK: We do not care about the machine type returned from this - # procedure, we only care if it returns "error" because that - # would indicate an error was caught during [exec] (i.e. the - # native Tcl shell could not be executed). - # - if {[catch {getMachineForTclShell} result] == 0 && \ - $result ne "error"} then { - # - # NOTE: Yes, a native Tcl shell appears to be available. - # - addConstraint tclShell - - tputs $channel "---- checking for Tcl shell... yes\n" - } else { - tputs $channel "---- checking for Tcl shell... no\n" - } - } - - proc checkForPowerShell { channel } { - tputs $channel "---- checking for PowerShell... " - - # - # NOTE: Can the PowerShell assembly be loaded? - # - if {[catch {object resolve System.Management.Automation} \ - assembly] == 0} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint powerShell - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForWix { channel } { - tputs $channel "---- checking for WiX... " - - # - # NOTE: Platform must be Windows for this constraint to - # even be checked (i.e. we require the registry). - # - if {$::tcl_platform(platform) eq "windows"} then { - # - # NOTE: Indicate that we have not found it yet. - # - set directory "" - - # - # NOTE: Have we not found the directory yet? - # - # Yes, this is somewhat redundant because we just set - # the directory to an empty string (above); however, - # maintaining a uniform pattern is more important. - # - if {[string length $directory] == 0} then { - # - # NOTE: Check for the WIX environment variable. - # - if {[info exists ::env(WIX)]} then { - set directory [file normalize [string trimright $::env(WIX)]] - - if {[string length $directory] > 0} then { - # - # NOTE: We need the directory containing the binaries. - # - set directory [file join $directory bin] - - # - # NOTE: Does the directory actually exist? - # - if {[file isdirectory $directory]} then { - # - # NOTE: The file name of the primary WiX assembly. - # - set fileName [file join $directory wix.dll] - - # - # NOTE: We do not know the file version yet. - # - set version "" - - # - # NOTE: Attempt to query the version of the file. - # - if {[catch {file version $fileName} version] == 0 && \ - [string length $version] > 0} then { - # - # NOTE: Indicate where we found the file. - # - set where environment - } else { - # - # NOTE: The file does not exist or is not properly - # versioned. - # - set directory "" - } - } else { - # - # NOTE: The directory does not exist. - # - set directory "" - } - } - } - } - - # - # NOTE: Have we not found the directory yet? - # - if {[string length $directory] == 0} then { - # - # NOTE: Registry hive where WiX install information - # is stored. - # - set key {HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML} - - # - # NOTE: The versions of WiX that we support. - # - set versions [list 3.5 3.0] - - # - # NOTE: Check each version, stopping when one is found. - # - foreach version $versions { - # - # NOTE: Attempt to fetch the WiX install directory - # value from the registry, removing the - # trailing backslash, if any. - # - set directory [file normalize [string trimright [object invoke \ - Microsoft.Win32.Registry GetValue \ - [appendArgs $key \\ $version] InstallRoot \ - null] \\]] - - # - # NOTE: Does the directory name look valid and - # does it actually exist? - # - if {[string length $directory] > 0} then { - # - # NOTE: Does the directory actually exist? - # - if {[file isdirectory $directory]} then { - # - # NOTE: The file name of the primary WiX assembly. - # - set fileName [file join $directory wix.dll] - - # - # NOTE: We do not know the file version yet. - # - set version "" - - # - # NOTE: Attempt to query the version of the file. - # - if {[catch {file version $fileName} version] == 0 && \ - [string length $version] > 0} then { - # - # NOTE: Indicate where we found the file. - # - set where registry - - # - # NOTE: We found it, bail out now. - # - break - } else { - # - # NOTE: The file does not exist or is not properly - # versioned. - # - set directory "" - } - } else { - # - # NOTE: The directory does not exist. - # - set directory "" - } - } - } - } - - # - # NOTE: Did we find the directory? - # - if {[string length $directory] > 0 && \ - [file isdirectory $directory]} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint wix - - # - # NOTE: Save the directory for later usage by - # the test itself. - # - set ::test_wix $directory - - # - # NOTE: Show where we found it. - # - tputs $channel [appendArgs "yes (" $version ", via " $where ", \"" \ - $directory "\")\n"] - - # - # NOTE: We are done here, return now. - # - return - } - } - - tputs $channel no\n - } - - proc checkForManagedDebugger { channel } { - tputs $channel "---- checking for managed debugger... " - - # - # NOTE: Is the managed debugger attached? - # - if {[object invoke System.Diagnostics.Debugger IsAttached]} then { - # - # NOTE: Yes, it appears that it is attached. - # - addConstraint managedDebugger - - tputs $channel yes\n - } else { - tputs $channel no\n - } - } - - proc checkForScriptDebugger { channel } { - tputs $channel "---- checking for script debugger... " - - # - # NOTE: Is the script debugger available? - # - if {[catch {object invoke -flags +NonPublic Interpreter.GetActive \ - Debugger} debugger] == 0} then { - # - # NOTE: We do not own this, do not dispose it. - # - if {[string length $debugger] > 0} then { - object flags $debugger +NoDispose - } - - if {[regexp -- {^Debugger#\d+$} $debugger]} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint scriptDebugger - - tputs $channel yes\n - - # - # NOTE: We are done here, return now. - # - return - } - } - - tputs $channel no\n - } - - proc checkForScriptDebuggerInterpreter { channel } { - tputs $channel "---- checking for script debugger interpreter... " - - # - # NOTE: Is the script debugger interpreter available? - # - if {[catch {object invoke -flags +NonPublic Interpreter.GetActive \ - Debugger} debugger] == 0} then { - # - # NOTE: We do not own this, do not dispose it. - # - if {[string length $debugger] > 0} then { - object flags $debugger +NoDispose - } - - if {[regexp -- {^Debugger#\d+$} $debugger] && \ - [catch {object invoke $debugger Interpreter} interp] == 0} then { - # - # NOTE: We do not own this, do not dispose it. - # - if {[string length $interp] > 0} then { - object flags $interp +NoDispose - } - - if {[regexp -- {^Interpreter#\d+$} $interp]} then { - # - # NOTE: Yes, it appears that it is available. - # - addConstraint scriptDebuggerInterpreter - - tputs $channel yes\n - - # - # NOTE: We are done here, return now. - # - return - } - } - } - - tputs $channel no\n - } - - ########################################################################### - ############################# END Eagle ONLY ############################## - ########################################################################### - } else { - ########################################################################### - ############################# BEGIN Tcl ONLY ############################## - ########################################################################### - - # - # NOTE: We need several of our test constraint related commands in the - # global namespace. - # - exportAndImportPackageCommands [namespace current] [list checkForPlatform \ - checkForEagle checkForGaruda checkForShell checkForDebug \ - checkForVersion checkForCommand checkForFile checkForNativeCode \ - checkForTip127 checkForTip194 checkForTip241 checkForTip285 \ - checkForPerformance checkForTiming checkForInteractive \ - checkForUserInteraction checkForNetwork] false false - - ########################################################################### - ############################## END Tcl ONLY ############################### - ########################################################################### - } - - # - # NOTE: Provide the Eagle test constraints package to the interpreter. - # - package provide EagleTestConstraints \ - [expr {[isEagle] ? [info engine PatchLevel] : 1.0}] -} - DELETED Externals/Eagle/Tests/epilogue.eagle Index: Externals/Eagle/Tests/epilogue.eagle ================================================================== --- Externals/Eagle/Tests/epilogue.eagle +++ /dev/null @@ -1,281 +0,0 @@ -############################################################################### -# -# epilogue.eagle -- -# -# Extensible Adaptable Generalized Logic Engine (Eagle) -# Test Epilogue File -# -# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. -# -# See the file "license.terms" for information on usage and redistribution of -# this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: $ -# -############################################################################### - -if {![info exists no([file tail [info script]])]} then { - if {[info level] > 0} then { - error "cannot run, current level is not global" - } - - if {[isEagle]} then { - # - # NOTE: Show the current state of the memory. - # - tputs $test_channel [appendArgs "---- ending memory: " \ - [formatListAsDict [debug memory]] \n] - - # - # NOTE: Show the current state of the native stack. - # - catch {debug stack true} stack - - tputs $test_channel [appendArgs "---- ending stack: " \ - [formatListAsDict $stack] \n] - - unset stack - } - - # - # NOTE: Show when the tests actually ended (now). - # - tputs $test_channel [appendArgs "---- tests ended at " \ - [clock format [clock seconds]] \n] - - if {[isEagle]} then { - tputs $test_channel \n; # NOTE: Blank line. - - if {$eagle_tests(passed) > 0} then { - host result Ok [appendArgs "PASSED: " $eagle_tests(passed) \n] - tlog [appendArgs "PASSED: " $eagle_tests(passed) \n] - } - - if {$eagle_tests(failed) > 0} then { - host result Error [appendArgs "FAILED: " $eagle_tests(failed) \n] - tlog [appendArgs "FAILED: " $eagle_tests(failed) \n] - - if {[llength $eagle_tests(failedNames)] > 0} then { - host result Error [appendArgs "FAILED: " $eagle_tests(failedNames) \n] - tlog [appendArgs "FAILED: " $eagle_tests(failedNames) \n] - } - } - - if {$eagle_tests(skipped) > 0} then { - host result Break [appendArgs "SKIPPED: " $eagle_tests(skipped) \n] - tlog [appendArgs "SKIPPED: " $eagle_tests(skipped) \n] - } - - if {$eagle_tests(total) > 0} then { - host result Return [appendArgs "TOTAL: " $eagle_tests(total) \n] - tlog [appendArgs "TOTAL: " $eagle_tests(total) \n] - - # - # HACK: Temporarily modify the floating point precision so that the - # pass percentage does not end up with excessive detail. In - # theory, we could use [string format] here; however, that - # would fail under Mono. - # - if {$tcl_precision != 4} then { - set tcl_precision_save $tcl_precision - set tcl_precision 4 - } - - if {$eagle_tests(skipped) > 0} then { - set percent [getSkipPercentage] - host result Break [appendArgs "SKIP PERCENTAGE: " $percent %\n] - tlog [appendArgs "SKIP PERCENTAGE: " $percent %\n] - } - - set percent [getPassPercentage] - host result Return [appendArgs "PASS PERCENTAGE: " $percent %\n] - tlog [appendArgs "PASS PERCENTAGE: " $percent% \n] - - # - # NOTE: Restore the saved floating point precision. - # - if {[info exists tcl_precision_save]} then { - set tcl_precision $tcl_precision_save - unset tcl_precision_save - } - } else { - # - # NOTE: No tests. - # - set percent 0 - } - - # - # NOTE: Has the test pass threshold been set? If so, is it set to - # the default value? - # - if {![info exists test_threshold] || $test_threshold == 100} then { - # - # NOTE: The test pass threshold is set to the default value (100%). - # Check to make sure that all tests pass and then set the - # exit code to success; otherwise, we set it to failure. - # - set passedOrSkipped [expr {$eagle_tests(passed) + \ - $eagle_tests(skipped)}] - - if {$passedOrSkipped == $eagle_tests(total)} then { - set exitCode Success - - host result Ok "OVERALL RESULT: SUCCESS\n" - tlog "OVERALL RESULT: SUCCESS\n" - } else { - set exitCode Failure - - host result Error "OVERALL RESULT: FAILURE\n" - tlog "OVERALL RESULT: FAILURE\n" - } - - unset passedOrSkipped - } else { - # - # NOTE: They specified a non-default test pass threshold. Check to - # make sure that we meet or exceed the requirement and then - # set the exit code to success; otherwise, set it to failure. - # - if {$percent >= $test_threshold} then { - set exitCode Success - - host result Ok [appendArgs "OVERALL RESULT: SUCCESS (" \ - $percent "% >= " $test_threshold %)\n] - - tlog [appendArgs "OVERALL RESULT: SUCCESS (" \ - $percent "% >= " $test_threshold %)\n] - } else { - set exitCode Failure - - host result Error [appendArgs \ - "OVERALL RESULT: FAILURE (" $percent "% < " $test_threshold %)\n] - - tlog [appendArgs \ - "OVERALL RESULT: FAILURE (" $percent "% < " $test_threshold %)\n] - } - } - - unset percent - - tputs $test_channel \n; # NOTE: Blank line. - } else { - tputs $test_channel \n; # NOTE: Blank line. - - if {$::tcltest::numTests(Passed) > 0} then { - tputs $test_channel \ - [appendArgs "PASSED: " $::tcltest::numTests(Passed) \n] - } - - if {$::tcltest::numTests(Failed) > 0} then { - tputs $test_channel \ - [appendArgs "FAILED: " $::tcltest::numTests(Failed) \n] - - if {[llength $::tcltest::failFiles] > 0} then { - tputs $test_channel \ - [appendArgs "FAILED: " $::tcltest::failFiles \n] - } - } - - if {$::tcltest::numTests(Skipped) > 0} then { - tputs $test_channel \ - [appendArgs "SKIPPED: " $::tcltest::numTests(Skipped) \n] - } - - if {$::tcltest::numTests(Total) > 0} then { - tputs $test_channel \ - [appendArgs "TOTAL: " $::tcltest::numTests(Total) \n] - - if {$::tcltest::numTests(Skipped) > 0} then { - set percent [getSkipPercentage] - tputs $test_channel [appendArgs "SKIP PERCENTAGE: " \ - [format "%.4f" $percent] %\n] - } - - set percent [getPassPercentage] - tputs $test_channel [appendArgs "PASS PERCENTAGE: " \ - [format "%.4f" $percent] %\n] - } else { - # - # NOTE: No tests. - # - set percent 0 - } - - # - # NOTE: Has the test pass threshold been set? If so, is it set to - # the default value? - # - if {![info exists test_threshold] || $test_threshold == 100} then { - # - # NOTE: The test pass threshold is set to the default value (100%). - # Check to make sure that all tests pass and then set the - # exit code to success; otherwise, we set it to failure. - # - set passedOrSkipped [expr {$::tcltest::numTests(Passed) + \ - $::tcltest::numTests(Skipped)}] - - if {$passedOrSkipped == $::tcltest::numTests(Total)} then { - set exitCode 0; # Success. - - tputs $test_channel "OVERALL RESULT: SUCCESS\n" - } else { - set exitCode 1; # Failure. - - tputs $test_channel "OVERALL RESULT: FAILURE\n" - } - - unset passedOrSkipped - } else { - # - # NOTE: They specified a non-default test pass threshold. Check to - # make sure that we meet or exceed the requirement and then - # set the exit code to success; otherwise, set it to failure. - # - if {$percent >= $test_threshold} then { - set exitCode 0; # Success. - - tputs $test_channel [appendArgs "OVERALL RESULT: SUCCESS (" \ - $percent "% >= " $test_threshold %)\n] - } else { - set exitCode 1; # Failure. - - tputs $test_channel [appendArgs "OVERALL RESULT: FAILURE (" \ - $percent "% < " $test_threshold %)\n] - } - } - - unset percent - - tputs $test_channel \n; # NOTE: Blank line. - } - - # - # NOTE: Check for and process any custom test epilogue script that may - # be set in the environment. - # - sourceIfValid epilogue [getEnvironmentVariable testEpilogue] - - # - # NOTE: Do we need to exit now? - # - if {[isExitOnComplete]} then { - # - # NOTE: Exit now. In Eagle, this will not exit the entire process. - # Zero (0) will be the exit code if all the selected tests have - # succeeded or the test success threshold has been met or - # exceeded; otherwise, one (1) will be the exit code. - # - exit $exitCode - } else { - # - # NOTE: For Eagle, even when not exiting, we still set the ExitCode - # property of the interpreter. - # - if {[isEagle]} then { - object invoke -alias Interpreter.GetActive ExitCode $exitCode - } - - unset exitCode - } -} DELETED Externals/Eagle/Tests/pkgIndex.eagle Index: Externals/Eagle/Tests/pkgIndex.eagle ================================================================== --- Externals/Eagle/Tests/pkgIndex.eagle +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################### -# -# pkgIndex.eagle -- -# -# Extensible Adaptable Generalized Logic Engine (Eagle) -# Package Index File -# -# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. -# -# See the file "license.terms" for information on usage and redistribution of -# this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: $ -# -############################################################################### - -if {![package vsatisfies [package provide Tcl] 8.4]} {return} -if {![package vsatisfies [package provide Eagle] 1.0]} {return} - -package ifneeded EagleTestConstraints 1.0 [list source [file join $dir \ - constraints.eagle]] DELETED Externals/Eagle/Tests/pkgIndex.tcl Index: Externals/Eagle/Tests/pkgIndex.tcl ================================================================== --- Externals/Eagle/Tests/pkgIndex.tcl +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################### -# -# pkgIndex.tcl -- -# -# Extensible Adaptable Generalized Logic Engine (Eagle) -# Package Index File -# -# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. -# -# See the file "license.terms" for information on usage and redistribution of -# this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: $ -# -############################################################################### - -if {![package vsatisfies [package provide Tcl] 8.4]} {return} -if {[string length [package provide Eagle]] > 0} then {return} - -package ifneeded EagleTestConstraints 1.0 [list source [file join $dir \ - constraints.eagle]] DELETED Externals/Eagle/Tests/prologue.eagle Index: Externals/Eagle/Tests/prologue.eagle ================================================================== --- Externals/Eagle/Tests/prologue.eagle +++ /dev/null @@ -1,1481 +0,0 @@ -############################################################################### -# -# prologue.eagle -- -# -# Extensible Adaptable Generalized Logic Engine (Eagle) -# Test Prologue File -# -# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. -# -# See the file "license.terms" for information on usage and redistribution of -# this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: $ -# -############################################################################### - -if {![info exists no([file tail [info script]])]} then { - if {[info level] > 0} then { - error "cannot run, current level is not global" - } - - # - # NOTE: Set the location of the test suite, if necessary. - # - if {![info exists test_path]} then { - set test_path [file normalize [file dirname [info script]]] - } - - # - # NOTE: Set the location of the base Eagle directory, if - # necessary. - # - if {![info exists base_path]} then { - # - # NOTE: Start out going up one level and check for a "lib" - # sub-directory. If not found, go up another level - # because we will always be two levels down from the - # base directory when running inside the source tree. - # - set base_path [file normalize [file dirname $test_path]] - - # - # HACK: We must verify that the "init.eagle" file can eventually - # be found under the "lib" directory since Visual Studio - # insists on creating a superfluous (and empty) "lib\Eagle1.0" - # sub-directory inside of the "Library" project directory - # simply due to the links contained in the project file that - # actually point to the "lib\Eagle1.0" sub-directory under the - # solution directory. - # - # WARNING: The Eagle package name and version are hard-coded here. - # - if {![file exists [file join $base_path lib]] || \ - ![file isdirectory [file join $base_path lib]] || \ - ![file exists [file join $base_path lib Eagle1.0]] || \ - ![file isdirectory [file join $base_path lib Eagle1.0]] || \ - ![file exists [file join $base_path lib Eagle1.0 init.eagle]] || \ - ![file isfile [file join $base_path lib Eagle1.0 init.eagle]]} then { - # - # NOTE: We do not bother to check if the "lib" sub-directory - # actually exists as a child of this one. This is the - # previous (legacy) behavior (i.e. where we always went - # up two levels to the base directory). - # - set base_path [file dirname $base_path] - } - } - - # - # NOTE: Set the executable file name for the process, if - # necessary. - # - if {![info exists bin_file]} then { - set bin_file [info nameofexecutable] - } - - # - # NOTE: Set the location of the directory containing the - # executable file for the process, if necessary. - # - if {![info exists bin_path]} then { - set bin_path [file normalize [file dirname $bin_file]] - } - - # - # NOTE: Set the location of the [non-script] library directory - # (i.e. the directory where the plugins are located), if - # necessary. - # - if {![info exists lib_path]} then { - # - # NOTE: This should go one directory up from the directory - # containing the executable file for the process (e.g. - # the shell) and then into the "lib" directory just - # beneath that. - # - set lib_path [file normalize [file join [file dirname $bin_path] lib]] - } - - # - # NOTE: Set the web host to test against, if necessary. - # - if {![info exists test_host]} then { - set test_host eagle.to - } - - # - # NOTE: Set the port to use for server sockets, if necessary. - # - if {![info exists test_port]} then { - set test_port 12346; # IANA, 12346-12752 Unassigned - } - - # - # NOTE: Set the network timeout, if necessary. - # - if {![info exists test_timeout]} then { - set test_timeout 2000; # in milliseconds. - } - - # - # NOTE: Set the channel to use for test output, if necessary. - # - if {![info exists test_channel]} then { - set test_channel stdout - } - - # - # NOTE: Set the primary package path, if necessary. - # - if {![info exists test_package_path]} then { - set test_package_path [file join $base_path lib] - } - - # - # NOTE: Make sure our primary package path is part of the auto path. - # - if {[lsearch -exact $auto_path $test_package_path] == -1} then { - lappend auto_path $test_package_path - } - - # - # NOTE: Make sure our test package path is part of the auto path. - # - if {[lsearch -exact $auto_path $test_path] == -1} then { - lappend auto_path $test_path - } - - ############################################################################# - - # - # NOTE: Check for and load the Eagle library package, if necessary. - # - if {[catch {package present EagleLibrary}]} then { - package require EagleLibrary - } - - # - # NOTE: Check for and load the Eagle test package, if necessary. - # - if {[catch {package present EagleTest}]} then { - package require EagleTest - } - - # - # NOTE: Check for and load the Eagle test constraints package, if - # necessary. - # - if {[catch {package present EagleTestConstraints}]} then { - package require EagleTestConstraints - } - - ############################################################################# - - # - # NOTE: If command line arguments were supplied, process them now. - # - set test_flags(-configuration) ""; # build configuration, default to empty. - set test_flags(-suffix) ""; # build suffix, default to empty. - set test_flags(-file) [list *.eagle]; # default to running all test files. - set test_flags(-notFile) [list l.*.eagle]; # COMPAT: Tcl. - set test_flags(-match) [list *]; # default to running all tests. - set test_flags(-skip) [list]; # default to skipping no tests. - set test_flags(-constraints) [list]; # default to no manual constraints. - set test_flags(-logFile) ""; # default to using standard log file naming. - set test_flags(-threshold) ""; # default to requiring all tests to pass. - set test_flags(-stopOnFailure) ""; # default to continue on failure. - set test_flags(-exitOnComplete) ""; # default to not exit after complete. - - # - # NOTE: Check for and process any command line arguments. - # - if {[info exists argv]} then { - eval processTestArguments test_flags $argv - - if {[info exists test_flags(-logFile)] && \ - [string length $test_flags(-logFile)] > 0} then { - # - # NOTE: Set the log file name to the one provided by the command line. - # - set test_log $test_flags(-logFile) - } - - if {[info exists test_flags(-threshold)] && \ - [string is integer -strict $test_flags(-threshold)]} then { - # - # NOTE: Set the test pass threshold to the one provided by the command - # line. - # - set test_threshold $test_flags(-threshold) - } - - if {[info exists test_flags(-stopOnFailure)] && \ - [string is boolean -strict $test_flags(-stopOnFailure)]} then { - # - # NOTE: Set the test stop-on-failure flag to the one provided by the - # command line. - # - set test_stop_on_failure $test_flags(-stopOnFailure) - } - - if {[info exists test_flags(-exitOnComplete)] && \ - [string is boolean -strict $test_flags(-exitOnComplete)]} then { - # - # NOTE: Set the test exit-on-complete flag to the one provided by the - # command line. - # - set test_exit_on_complete $test_flags(-exitOnComplete) - } - } - - # - # NOTE: Set the default test configuration (i.e. Debug or Release), if - # necessary. - # - if {![info exists test_configuration]} then { - set test_configuration [getPlatformInfo configuration Release] - } - - # - # NOTE: Set the Tcl shell executable to use for those specialized - # tests that may require it, if necessary. - # - if {![info exists test_tclsh]} then { - if {[isEagle] || ![string match tclsh* $bin_file]} then { - set test_tclsh tclsh - } else { - set test_tclsh $bin_file - } - } - - # - # NOTE: Has logging been disabled? - # - if {![info exists no(log)]} then { - # - # NOTE: Set the log to use for test output, if necessary. - # - if {![info exists test_log]} then { - set test_log [file join [getTemporaryPath] [file tail [info \ - nameofexecutable]][getTestLogId].test.[pid].log] - } - } - - # - # NOTE: Check for and process any custom test prologue script that may be set - # in the environment. This must be done after the Eagle test package - # has been made available and after the log file has been setup. - # - sourceIfValid prologue [getEnvironmentVariable testPrologue] - - # - # NOTE: Show the name of the executable and the command line arguments, if - # any. This must be done after the log file has been setup; otherwise, - # this information will not be visible in the log file. - # - tputs $test_channel [appendArgs "---- testRunId: " \ - [getTestRunId] \n] - - tputs $test_channel [appendArgs "---- processId: " \ - [pid] \n] - - tputs $test_channel [appendArgs "---- test channel: " \ - $test_channel \n] - - tputs $test_channel [appendArgs "---- test configuration: " \ - $test_configuration \n] - - if {[isEagle]} then { - tputs $test_channel [appendArgs "---- original command line: " \ - [info cmdline] \n] - - tputs $test_channel [appendArgs "---- threadId: " \ - [info tid] \n] - - tputs $test_channel [appendArgs "---- processors: " \ - [info processors] \n] - - catch {object invoke Console.InputEncoding WebName} encoding - - tputs $test_channel [appendArgs "---- input encoding: " \ - $encoding \n] - - catch {object invoke Console.OutputEncoding WebName} encoding - - tputs $test_channel [appendArgs "---- output encoding: " \ - $encoding \n] - - tputs $test_channel [appendArgs "---- starting memory: " \ - [formatListAsDict [debug memory]] \n] - - catch {debug stack true} stack - - tputs $test_channel [appendArgs "---- starting stack: " \ - [formatListAsDict $stack] \n] - - unset stack - catch {file drive} drive - - tputs $test_channel [appendArgs "---- system drive: " \ - [formatListAsDict $drive] \n] - - unset drive - } - - tputs $test_channel [appendArgs "---- executable: \"" \ - $bin_file \"\n] - - tputs $test_channel [appendArgs "---- command line: " \ - [expr {[info exists argv] && [string length $argv] > 0 ? \ - $argv : ""}] \n] - - tputs $test_channel [appendArgs "---- logging to: " \ - [expr {[info exists test_log] && [string length $test_log] > 0 ? \ - [appendArgs \" $test_log \"] : ""}] \n] - - tputs $test_channel [appendArgs "---- pass threshold: " \ - [expr {[info exists test_threshold] && \ - [string is integer -strict $test_threshold] ? \ - [appendArgs $test_threshold %] : ""}] \n] - - tputs $test_channel [appendArgs "---- stop on failure: " \ - [expr {[info exists test_stop_on_failure] && \ - [string is boolean -strict $test_stop_on_failure] ? \ - $test_stop_on_failure : ""}] \n] - - tputs $test_channel [appendArgs "---- exit on complete: " \ - [expr {[info exists test_exit_on_complete] && \ - [string is boolean -strict $test_exit_on_complete] ? \ - $test_exit_on_complete : ""}] \n] - - # - # NOTE: Show the information about which tests and files are being run and/or - # skipped (COMPAT: Tcl). - # - if {[llength $test_flags(-file)] > 0} then { - tputs $test_channel [appendArgs "---- running test files that match: " \ - $test_flags(-file) \n] - } - - if {[llength $test_flags(-notFile)] > 0} then { - tputs $test_channel [appendArgs "---- skipping test files that match: " \ - $test_flags(-notFile) \n] - } - - if {[llength $test_flags(-match)] > 0} then { - tputs $test_channel [appendArgs "---- running tests that match: " \ - $test_flags(-match) \n] - } - - if {[llength $test_flags(-skip)] > 0} then { - tputs $test_channel [appendArgs "---- skipping tests that match: " \ - $test_flags(-skip) \n] - } - - tputs $test_channel [appendArgs "---- path: \"" \ - [expr {[info exists path] && [string length $path] > 0 ? \ - $path : ""}] \"\n] - - tputs $test_channel [appendArgs "---- base path: \"" \ - $base_path \"\n] - - tputs $test_channel [appendArgs "---- binary path: \"" \ - $bin_path \"\n] - - tputs $test_channel [appendArgs "---- library path: \"" \ - $lib_path \"\n] - - tputs $test_channel [appendArgs "---- tests located in: \"" \ - $test_path \"\n] - - tputs $test_channel [appendArgs "---- tests running in: \"" \ - [pwd] \"\n] - - tputs $test_channel [appendArgs "---- temporary files stored in: \"" \ - [getTemporaryPath] \"\n] - - tputs $test_channel [appendArgs "---- native Tcl shell: \"" \ - $test_tclsh \"\n] - - # - # NOTE: Initialize the Eagle test constraints. - # - if {[isEagle]} then { - initializeTests - - # - # NOTE: If the "no(mono)" variable is set (to anything) then any - # special test suite hacks for Mono will be disabled. This - # does not control or change any hacks for Mono that may - # be present in the library itself. - # - # if {![info exists no(mono)] && [isMono]} then { - # set no(mono) true - # } - - # - # NOTE: Has administrator detection support been disabled? We do - # this check [nearly] first as it may [eventually] be used - # to help determine if other constraints should be skipped. - # - if {![info exists no(administrator)]} then { - checkForAdministrator $test_channel - } - - # - # NOTE: Has host detection support been disabled? - # - if {![info exists no(host)]} then { - checkForHost $test_channel - } - - # - # NOTE: Has primary thread detection support been disabled? We do - # this check [nearly] first as it may [eventually] be used - # to help determine if other constraints should be skipped. - # - if {![info exists no(primaryThread)]} then { - checkForPrimaryThread $test_channel - } - - # - # NOTE: Has runtime detection support been disabled? We do this - # checking [nearly] first as it may skip other constraints. - # - if {![info exists no(runtime)]} then { - checkForRuntime $test_channel - } - - # - # NOTE: Check the runtime version (i.e. what version of the runtime - # are we currently running on?). - # - if {![info exists no(runtimeVersion)]} then { - checkForRuntimeVersion $test_channel - } - - # - # NOTE: Check the image runtime version (i.e. what version of the - # runtime was this assembly compiled against?). - # - if {![info exists no(imageRuntimeVersion)]} then { - checkForImageRuntimeVersion $test_channel - } - - # - # NOTE: Has machine detection support been disabled? - # - if {![info exists no(machine)]} then { - checkForMachine $test_channel 32 intel; # (i.e. x86) - checkForMachine $test_channel 64 amd64; # (i.e. x64) - } - - # - # NOTE: Has culture detection support been disabled? - # - if {![info exists no(culture)]} then { - checkForCulture $test_channel - } - - # - # NOTE: Has software update trust detection support been disabled? - # - if {![info exists no(softwareUpdate)]} then { - checkForSoftwareUpdateTrust $test_channel - } - - # - # NOTE: Has database testing support been disabled? - # - if {![info exists no(sql)]} then { - # - # NOTE: Set the server name, if necessary. - # - if {![info exists server]} then { - set server . - } - - # - # NOTE: Set the database name, if necessary. - # - if {![info exists database]} then { - set database master - } - - # - # NOTE: Set the connection timeout, if necessary. - # - if {![info exists timeout]} then { - set timeout [expr {$test_timeout / 1000}]; # milliseconds to seconds. - } - - # - # NOTE: Set the test user name, if necessary. - # - if {![info exists user]} then { - set user [getEnvironmentVariable user] - } - - # - # NOTE: Set the test password, if necessary. - # - if {![info exists password]} then { - set password [getEnvironmentVariable password] - } - - # - # NOTE: Set the database connection string, if necessary. - # - if {![info exists test_database]} then { - # - # NOTE: Mono does not have support for trusted connections; - # therefore, we must create a slightly different - # connection string. - # - set test_database [subst \ - {Data Source=${server};Initial Catalog=${database};Connect\ - Timeout=${timeout};[expr {[isMono] ? [subst \ - {User Id=${user};Password=${password};}] : {Integrated\ - Security=SSPI;}}]}] - } - - # - # NOTE: Can we access the local database? - # - checkForDatabase $test_channel $test_database - unset password user timeout database server - } - - # - # NOTE: Has object handle reference count tracking support been disabled - # (at compile-time)? - # - if {![info exists no(refCount)]} then { - # - # NOTE: For tests "excel-*", "object-2.*", "object-7.1", "object-8.*", - # and "object-98.*". - # - checkForReferenceCountTracking $test_channel - } - - # - # NOTE: Has compile/runtime option testing support been disabled? - # - if {![info exists no(compileOptions)]} then { - # - # NOTE: Has callback queue support been enabled (at compile-time)? - # - if {![info exists no(compileCallbackQueue)]} then { - # - # NOTE: For test "commands-1.4". - # - checkForCompileOption $test_channel CALLBACK_QUEUE - } - - # - # NOTE: Has console support been enabled (at compile-time)? - # - if {![info exists no(compileConsole)]} then { - # - # NOTE: For test "host-1.2". - # - checkForCompileOption $test_channel CONSOLE - } - - # - # NOTE: Has database support been enabled (at compile-time)? - # - if {![info exists no(compileData)]} then { - # - # NOTE: For tests "sql-1.1" and "upvar-99.1". - # - checkForCompileOption $test_channel DATA - } - - # - # NOTE: Has script debugger support been enabled (at compile-time)? - # - if {![info exists no(compileDebugger)]} then { - # - # NOTE: For tests "debug-1.1", "debug-2.1", "debug-3.1" and - # "debug-4.1". - # - checkForCompileOption $test_channel DEBUGGER - } - - # - # NOTE: Has isolated interpreter support been enabled (at compile-time)? - # - if {![info exists no(compileIsolatedInterpreters)]} then { - # - # NOTE: For test "xaml-1.2". - # - checkForCompileOption $test_channel ISOLATED_INTERPRETERS - } - - # - # NOTE: Has isolated plugin support been enabled (at compile-time)? - # - if {![info exists no(compileIsolatedPlugins)]} then { - # - # NOTE: For test "load-1.1.1". - # - checkForCompileOption $test_channel ISOLATED_PLUGINS - } - - # - # NOTE: Has PowerShell approved-verbs support been enabled (at - # compile-time)? - # - if {![info exists no(compileApprovedVerbs)]} then { - # - # NOTE: For test "object-4.8". - # - checkForCompileOption $test_channel APPROVED_VERBS - } - - # - # NOTE: Has Mono support been enabled (at compile-time)? - # - if {![info exists no(compileMono)]} then { - # - # NOTE: For test "object-4.13". - # - checkForCompileOption $test_channel MONO - } - - # - # NOTE: Has Windows support been enabled (at compile-time)? - # - if {![info exists no(compileWindows)]} then { - # - # NOTE: For test "garuda-1.0". - # - checkForCompileOption $test_channel WINDOWS - } - - # - # NOTE: Has native code support been enabled (at compile-time)? - # - if {![info exists no(compileNative)]} then { - # - # NOTE: For tests "debug-3.2", "expr-3.2", and "host-1.1". - # - checkForCompileOption $test_channel NATIVE - } - - # - # NOTE: Has native package support been enabled (at compile-time)? - # - if {![info exists no(compileNativePackage)]} then { - # - # NOTE: For test "garuda-1.0". - # - checkForCompileOption $test_channel NATIVE_PACKAGE - } - - # - # NOTE: Has network support been enabled (at compile-time)? - # - if {![info exists no(compileNetwork)]} then { - # - # NOTE: For tests "commands-1.4", "socket-1.*", "socket-2.1", and - # "socket-3.1". - # - checkForCompileOption $test_channel NETWORK - } - - # - # NOTE: Has native Tcl support been enabled (at compile-time)? - # - if {![info exists no(compileTcl)]} then { - # - # NOTE: For tests "commands-1.1.*", "excel-2.2", "tclCancel-1.1", - # "tclEncoding-1.*", "tclErrorInfo-1.*", "tclLoad-1.*", - # "tclResetCancel-1.1", "tclResetCancel-2.1", - # "tclResetCancel-2.2", "tclResetCancel-3.1", - # "tclResetCancel-4.1", "tclSet-1.1", and "tclSubst-1.1". - # - checkForCompileOption $test_channel TCL - } - - # - # NOTE: Has xml support been enabled (at compile-time)? - # - if {![info exists no(compileXml)]} then { - # - # NOTE: For tests "commands-1.4", "object-7.3" and "xml-1.1.*". - # - checkForCompileOption $test_channel XML - } - - # - # NOTE: Has dedicated test support been enabled (at compile-time)? - # - if {![info exists no(compileTest)]} then { - # - # NOTE: For tests "basic-1.20", "basic-1.21", "function-1.1", - # "object-2.1", "object-3.1", "object-4.1", "object-7.1", - # "object-7.2", "object-7.4", "object-14.4", "object-14.5", - # "object-14.6", "remotingServer-1.*", and "debug-5.*". - # - checkForCompileOption $test_channel TEST - } - - # - # NOTE: Has threading support been enabled (at compile-time)? - # - if {![info exists no(compileThreading)]} then { - # - # NOTE: For tests "object-10.2" and "object-10.3". - # - checkForCompileOption $test_channel THREADING - } - - # - # NOTE: Has Tcl threading support been enabled (at compile-time)? - # - if {![info exists no(compileTclThreaded)]} then { - # - # NOTE: For tests "tclLoad-1.5" and "tclLoad-1.6". - # - checkForCompileOption $test_channel TCL_THREADED - } - - # - # NOTE: Has Tcl isolated interpreter thread support been enabled (at - # compile-time)? - # - if {![info exists no(compileTclThreads)]} then { - # - # NOTE: For tests "tclLoad-1.5" and "tclLoad-1.6". - # - checkForCompileOption $test_channel TCL_THREADS - } - } - - # - # NOTE: Has dynamic loading testing support been disabled? - # - if {![info exists no(dynamic)]} then { - # - # NOTE: For tests "commands-1.1.*", "library-3.*", and "tcl*-*.*". - # - checkForDynamicLoading $test_channel - } - - # - # NOTE: Has Tcl testing support been disabled? - # - if {![info exists no(tcl)]} then { - if {![info exists no(tclInstalls)]} then { - # - # NOTE: For tests "commands-1.1.*", "library-3.*", and "tcl*-*.*". - # - checkForTclInstalls $test_channel - } - - if {![info exists no(tclReady)]} then { - checkForTclReady $test_channel - } - - if {![info exists no(tclShell)]} then { - # - # NOTE: For test "garuda-1.0". - # - checkForTclShell $test_channel - } - } - - # - # NOTE: Has custom test method support been disabled? - # - if {![info exists no(test)]} then { - # - # NOTE: Has remoting testing support been disabled? - # - if {![info exists no(testRemoting)]} then { - # - # NOTE: For tests "remotingServer-1.*". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestRemoting* - } - - # - # NOTE: Has asynchronous testing support been disabled? - # - if {![info exists no(testAsynchronous)]} then { - # - # NOTE: For tests "basic-1.20" and "basic-1.21". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestEvaluateAsync* - } - - # - # NOTE: Has custom function testing support been disabled? - # - if {![info exists no(testFunction)]} then { - # - # NOTE: For test "function-1.1". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestAddFunction* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestRemoveFunction* - } - - # - # NOTE: Has write-box testing support been disabled? - # - if {![info exists no(testWriteBox)]} then { - # - # NOTE: For tests "debug-5.*". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestWriteBox* - } - - # - # NOTE: Has core marshaller testing support been disabled? - # - if {![info exists no(testMarshaller)]} then { - # - # NOTE: For test "object-2.1". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestComplexMethod* - - # - # NOTE: For test "object-2.3". - # - checkForObjectMember $test_channel Eagle._Components.Private.ArrayOps \ - *ToHexadecimalString* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestMulti2Array* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestMulti3Array* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestNestedArray* - - # - # NOTE: For test "object-3.1". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *get_Item* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *set_Item* - - # - # NOTE: For test "object-3.6.*". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestStringIListReturnValue* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestStringIListIListIListReturnValue* - - # - # NOTE: For test "object-4.1". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestExpr* - - # - # NOTE: For test "object-7.1". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestByRefValueTypeMethod* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestNullableValueTypeMethod* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestByRefNullableValueTypeMethod* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestIntArrayReturnValue* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestStringArrayReturnValue* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestStringListReturnValue* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestStringListArrayReturnValue* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestByRefStringListArray* - - # - # NOTE: For tests "object-14.4" and "object-14.5". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *StaticObjectProperty* - - # - # NOTE: For test "object-14.6". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TypeProperty* - - # - # NOTE: For test "basic-1.29". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestExecuteStaticDelegates* - - # - # NOTE: For tests "basic-1.30" and "basic-1.31". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestExecuteDelegateCommands* - - # - # NOTE: For test "object-7.2" and "object-7.4". - # - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestNullArray* - - checkForObjectMember $test_channel Eagle._Tests.Default \ - *TestOutArray* - } - } - - # - # NOTE: Has Excel testing support been disabled? - # - if {![info exists no(excel)]} then { - # - # NOTE: For tests "excel-*.*". - # - checkForAssembly $test_channel Microsoft.Office.Interop.Excel - } - - # - # NOTE: Has speech testing support been disabled? - # - if {![info exists no(speech)]} then { - # - # NOTE: Set the audio volume, if necessary. - # - if {![info exists test_volume]} then { - set test_volume 0; # in percent, 0 is silent. - } - - # - # NOTE: For test "object-4.5". - # - checkForAssembly $test_channel System.Speech - } - - # - # NOTE: Has WinForms testing support been disabled? - # - if {![info exists no(winForms)]} then { - # - # NOTE: For tests "object-13.1.*", "object-13.2.*", and - # "winForms-*.*". - # - checkForWindowsForms $test_channel - } - - # - # NOTE: Are we running in an STA thread? - # - if {![info exists no(staThread)]} then { - # - # NOTE: For test "xaml-1.*". - # - checkForStaThread $test_channel - } - - # - # NOTE: Has WPF testing support been disabled? - # - if {![info exists no(wpf)]} then { - # - # NOTE: For test "xaml-1.*". - # - checkForWindowsPresentationFoundation $test_channel - } - - # - # NOTE: Has PowerShell testing support been disabled? - # - if {![info exists no(powerShell)]} then { - # - # NOTE: For tests "object-4.7", "object-4.8", and "object-4.9". - # - checkForPowerShell $test_channel - } - - # - # NOTE: Has WiX testing support been disabled? - # - if {![info exists no(wix)]} then { - # - # NOTE: For test "object-4.10". - # - checkForWix $test_channel - } - - # - # NOTE: Has managed debugger testing support been disabled? - # - if {![info exists no(managedDebugger)]} then { - checkForManagedDebugger $test_channel - } - - # - # NOTE: Has script debugger testing support been disabled? - # - if {![info exists no(scriptDebugger)]} then { - # - # NOTE: For tests "debug-1.1", "debug-2.1", "debug-3.1", and - # "debug-4.1". - # - checkForScriptDebugger $test_channel - } - - # - # NOTE: Has script debugger interpreter testing support been - # disabled? - # - if {![info exists no(scriptDebuggerInterpreter)]} then { - # - # NOTE: For test "debug-2.1". - # - checkForScriptDebuggerInterpreter $test_channel - } - - # - # NOTE: Are we running under the Mono debugger? If so, several - # tests will have to be disabled because they do not appear - # to work there. - # - if {![info exists no(monoDebugger)]} then { - tputs $test_channel "---- checking for Mono debugger... " - - if {[haveConstraint mono] && [haveConstraint managedDebugger]} then { - # - # NOTE: Add a special test constraint to simplify the Mono debugger - # test constraint checking for the tests that need it. - # - addConstraint monoDebugger - - tputs $test_channel yes\n - } else { - tputs $test_channel no\n - } - } - - # - # NOTE: Has Garuda testing support been disabled? - # - if {![info exists no(garudaDll)]} then { - # - # NOTE: For test "garuda-1.0". - # - checkForGarudaDll $test_channel - } - } else { - # - # HACK: Reset the test counts for tcltest. - # - set ::tcltest::numTests(Total) 0 - set ::tcltest::numTests(Skipped) 0 - set ::tcltest::numTests(Passed) 0 - set ::tcltest::numTests(Failed) 0 - - # - # HACK: Reset the list of failed files. - # - set ::tcltest::failFiles [list] - } - - # - # NOTE: For test "package-1.0". - # - if {![info exists no(pkgAll.tcl)]} then { - checkForFile $test_channel [file join $base_path Package Tests all.tcl] \ - pkgAll.tcl - } - - # - # NOTE: For test "subst-1.*". - # - if {![info exists no(bad_subst.txt)]} then { - checkForFile $test_channel [file join $test_path bad_subst.txt] - } - - # - # NOTE: For test "fileIO-1.*". - # - if {![info exists no(file.dat)]} then { - checkForFile $test_channel [file join $test_path file.dat] - } - - # - # NOTE: For test "garbage-1.1". - # - if {![info exists no(garbage.txt)]} then { - checkForFile $test_channel [file join $test_path garbage.txt] - } - - # - # NOTE: For test "xaml-1.*". - # - if {![info exists no(test.png)]} then { - checkForFile $test_channel [file join $test_path test.png] - } - - # - # NOTE: For test "socket-1.2". - # - if {![info exists no(client.tcl)]} then { - checkForFile $test_channel [file join $test_path client.tcl] - } - - # - # NOTE: For test "tclLoad-1.2". - # - if {![info exists no(tcl_unload.tcl)]} then { - checkForFile $test_channel [file join $test_path tcl_unload.tcl] - } - - # - # NOTE: For test "read.eagle". - # - if {![info exists no(read.eagle)]} then { - checkForFile $test_channel [file join $test_path read.eagle] - } - - # - # NOTE: For test "read2.eagle". - # - if {![info exists no(read2.eagle)]} then { - checkForFile $test_channel [file join $test_path read2.eagle] - } - - # - # NOTE: For test "read3.eagle". - # - if {![info exists no(read3.eagle)]} then { - checkForFile $test_channel [file join $test_path read3.eagle] - } - - # - # NOTE: For test "read4.eagle". - # - if {![info exists no(read4.eagle)]} then { - checkForFile $test_channel [file join $test_path read4.eagle] - } - - # - # NOTE: For test "source.eagle". - # - if {![info exists no(source.eagle)]} then { - checkForFile $test_channel [file join $test_path source.eagle] - } - - # - # NOTE: For test "unbalanced_brace.eagle". - # - if {![info exists no(unbalanced_brace.eagle)]} then { - checkForFile $test_channel [file join $test_path unbalanced_brace.eagle] - } - - # - # NOTE: For test "unbalanced_brace2.eagle". - # - if {![info exists no(unbalanced_brace2.eagle)]} then { - checkForFile $test_channel [file join $test_path unbalanced_brace2.eagle] - } - - # - # NOTE: For test "excel-2.*". - # - if {![info exists no(test.xls)]} then { - checkForFile $test_channel [file join $test_path test.xls] - } - - # - # NOTE: For test "load-1.1.*". - # - if {![info exists no(Plugin.dll)]} then { - checkForFile $test_channel [file join $lib_path Plugin1.0 Plugin.dll] - } - - # - # NOTE: For test "object-6.1". - # - if {![info exists no(Sample.exe)]} then { - checkForFile $test_channel [file join $bin_path Sample.exe] - } - - # - # NOTE: For test "object-4.8". - # - if {![info exists no(EagleCmdlets.dll)]} then { - checkForFile $test_channel [file join $bin_path EagleCmdlets.dll] - } - - # - # NOTE: For test "object-4.10". - # - if {![info exists no(EagleExtensions.dll)]} then { - checkForFile $test_channel [file join $bin_path EagleExtensions.dll] - } - - # - # NOTE: For test "object-4.10". - # - if {![info exists no(test.wxs)]} then { - checkForFile $test_channel [file join $base_path Installer Tests test.wxs] - } - - # - # NOTE: For test "sql-1.2". - # - if {![info exists no(sqlite3.dll)]} then { - checkForFile $test_channel [file join $bin_path sqlite3.dll] - } - - if {![info exists no(System.Data.SQLite.dll)]} then { - checkForFile $test_channel [file join $bin_path System.Data.SQLite.dll] - } - - if {![info exists no(test.sqlite3)]} then { - checkForFile $test_channel [file join $test_path test.sqlite3] - } - - # - # NOTE: Check the core test constraints unless they have been - # explicitly disabled. - # - if {![info exists no(platform)]} then { - checkForPlatform $test_channel - } - - if {![info exists no(version)]} then { - checkForVersion $test_channel - } - - if {![info exists no(eagle)]} then { - checkForEagle $test_channel - } - - if {![info exists no(garuda)]} then { - checkForGaruda $test_channel - } - - if {![info exists no(shell)]} then { - checkForShell $test_channel - } - - if {![info exists no(debug)]} then { - checkForDebug $test_channel - } - - # - # NOTE: Has native code detection support been disabled? - # - if {![info exists no(native)]} then { - checkForNativeCode $test_channel - } - - # - # NOTE: Check for various extra commands that may be present. - # - if {![info exists no(callbackCommand)]} then { - checkForCommand $test_channel callback - } - - if {![info exists no(libraryCommand)]} then { - checkForCommand $test_channel library - } - - if {![info exists no(socketCommand)]} then { - checkForCommand $test_channel socket - } - - if {![info exists no(sqlCommand)]} then { - checkForCommand $test_channel sql - } - - if {![info exists no(tclCommand)]} then { - checkForCommand $test_channel tcl - } - - if {![info exists no(xmlCommand)]} then { - checkForCommand $test_channel xml - } - - # - # NOTE: Check for various features that were added through - # the TIP process. - # - if {![info exists no(tip127)]} then { - checkForTip127 $test_channel - } - - if {![info exists no(tip194)]} then { - checkForTip194 $test_channel - } - - if {![info exists no(tip241)]} then { - checkForTip241 $test_channel - } - - if {![info exists no(tip285)]} then { - checkForTip285 $test_channel - } - - # - # NOTE: Has performance testing been disabled? - # - if {![info exists no(performance)]} then { - checkForPerformance $test_channel - } - - # - # NOTE: Have precision timing tests been disabled? - # - if {![info exists no(timing)]} then { - checkForTiming $test_channel 50; # 1/20th second. - } - - # - # NOTE: Has interactive testing been disabled? - # - if {![info exists no(interactive)]} then { - checkForInteractive $test_channel - } - - if {![info exists no(userInteraction)]} then { - checkForUserInteraction $test_channel - } - - # - # NOTE: Check for network connectivity to our test host (i.e. - # the Eagle distribution site). - # - if {![info exists no(network)]} then { - checkForNetwork $test_channel $test_host $test_timeout - } - - # - # NOTE: For Eagle, dump the platform information, including - # the compile options. - # - if {[isEagle]} then { - # - # NOTE: Figure out the approximate relative performance - # of this machine. - # - if {[haveConstraint performance]} then { - tputs $test_channel [appendArgs \ - "---- checking for baseline BogoCops (commands-per-second)... "] - - if {![info exists test_base_cops]} then { - # - # NOTE: The expected performance numbers for all the - # performance tests will be calibrated based on - # this number (which is based on the measured - # performance of the actual machine that was - # used to determine those expected performance - # numbers). - # - set test_base_cops 36000.0 - } - - tputs $test_channel [appendArgs $test_base_cops \n] - tputs $test_channel [appendArgs \ - "---- checking for current BogoCops (commands-per-second)... "] - - if {![info exists test_cops]} then { - set test_cops [calculateBogoCops] - } - - tputs $test_channel [appendArgs $test_cops \n] - } - - ########################################################################### - - set timeStamp [getPlatformInfo timeStamp ""] - - if {[string length $timeStamp] > 0} then { - ######################################################################### - # MONO: Bug, see: https://bugzilla.novell.com/show_bug.cgi?id=479061 - ######################################################################### - - if {[isMono]} then { - # - # HACK: We need something to go into the log file. - # - set timeStamp [lindex $timeStamp 0] - } else { - set timeStamp [clock format [clock scan $timeStamp] -iso] - } - } else { - set timeStamp - } - - tputs $test_channel [appendArgs "---- build: " \ - [getPlatformInfo engine ] " " \ - [getPlatformInfo patchLevel ] " " \ - [getPlatformInfo tag ] " " \ - [getPlatformInfo text ] " " \ - [getPlatformInfo configuration ] " " \ - [getPlatformInfo suffix ] " " \ - $timeStamp \n] - - tputs $test_channel [appendArgs "---- os: " \ - [getPlatformInfo os ] \n] - - tputs $test_channel [appendArgs "---- globalAssemblyCache: " \ - [getPlatformInfo globalAssemblyCache ] \n] - - tputs $test_channel [appendArgs "---- moduleVersionId: " \ - [getPlatformInfo moduleVersionId ] \n] - - tputs $test_channel [appendArgs "---- compileOptions: " \ - [formatList [getPlatformInfo compileOptions ]] \n] - - tputs $test_channel [appendArgs "---- strongName: " \ - [getPlatformInfo strongName ] \n] - - tputs $test_channel [appendArgs "---- certificate: " \ - [getPlatformInfo certificate ] \n] - - unset timeStamp - } - - # - # NOTE: Show the current test file name, if any. - # - tputs $test_channel [appendArgs "---- test file: " \ - [expr {[info exists test_file] && [string length $test_file] > 0 ? \ - $test_file : ""}] \n] - - # - # NOTE: Show the active test constraints. - # - tputs $test_channel [appendArgs "---- constraints: " \ - [formatList [lsort [getConstraints]]] \n] - - # - # NOTE: Show when the tests actually began (now). - # - tputs $test_channel [appendArgs "---- tests began at " \ - [clock format [clock seconds]] \n] -} Index: Externals/Eagle/bin/Eagle.dll ================================================================== --- Externals/Eagle/bin/Eagle.dll +++ Externals/Eagle/bin/Eagle.dll cannot compute difference between binary files Index: Externals/Eagle/bin/EagleShell.exe ================================================================== --- Externals/Eagle/bin/EagleShell.exe +++ Externals/Eagle/bin/EagleShell.exe cannot compute difference between binary files Index: Externals/Eagle/lib/Eagle1.0/init.eagle ================================================================== --- Externals/Eagle/lib/Eagle1.0/init.eagle +++ Externals/Eagle/lib/Eagle1.0/init.eagle @@ -217,10 +217,36 @@ fconfigure $file_id -encoding binary -translation binary; # BINARY DATA set result [read $file_id] close $file_id return $result } + + proc readSharedFile { fileName } { + # + # NOTE: This should work properly in both Tcl and Eagle. + # + set command [list open $fileName RDONLY] + + # + # HACK: Tcl appears to do this by default; however Eagle does not and + # will not. Therefore, manually add the -share option to the + # command if running in Eagle. + # + if {[isEagle]} then { + lappend command 0 file -share readWrite + } + + # + # NOTE: Open the file using the command constructed above, configure + # the channel for binary data, and output the data to it. + # + set file_id [eval $command] + fconfigure $file_id -encoding binary -translation binary; # BINARY DATA + set result [read $file_id] + close $file_id + return $result + } proc writeFile { fileName data } { # # NOTE: This should work properly in both Tcl and Eagle. # @@ -531,13 +557,17 @@ lappend command -- # # HACK: Assume that Mono is somewhere along the PATH. # - if {[isMono]} then { lappend command mono } + if {[isMono]} then { + lappend command mono \ + [appendArgs \" [file nativename [info nameofexecutable]] \"] + } else { + lappend command [info nameofexecutable] + } - lappend command [info nameofexecutable] eval lappend command $args return [uplevel 1 $command] } @@ -589,75 +619,10 @@ } return $result } - proc testShim { args } { - # - # NOTE: Call the original (saved) [test] command, wrapping it in - # our standard test wrapper. - # - uplevel 1 [list runTest [concat ::savedTest $args]] - } - - proc tsource { fileName {prologue true} {epilogue true} } { - # - # NOTE: At this point, we need to require the test package so that - # we can run the test prologue. Besides, the contained test(s) - # will almost certainly require access to procedures defined in - # our test package. - # - package require EagleTest - - # - # NOTE: Run the test prologue in the context of the caller (which - # must be global)? - # - if {$prologue} then { - uplevel 1 runTestPrologue - } - - # - # NOTE: Save the original [test] command and setup our test shim in - # its place. - # - rename test ::savedTest - interp alias {} test {} testShim - - # - # NOTE: Source the specified test file in the context of the - # caller (which should be global). - # - set code [catch {uplevel 1 [list source $fileName]} result] - set error [expr {$code == 0 ? false : true}] - - # - # NOTE: Remove our test shim and restore the original (saved) - # [test] command. - # - interp alias {} test {} - rename ::savedTest test - - # - # NOTE: Run the test epilogue in the context of the caller (which - # must be global)? - # - if {$epilogue} then { - uplevel 1 runTestEpilogue - } - - # - # NOTE: If the test raised an error, re-raise it now; otherwise, - # just return the result. - # - if {$error} then { - error $result - } else { - return $result - } - } - if {[isEagle]} then { ########################################################################### ############################ BEGIN Eagle ONLY ############################# ########################################################################### @@ -667,10 +632,17 @@ # rights on this machine. # return [expr {[info exists ::eagle_platform(administrator)] && \ $::eagle_platform(administrator)}] } + + proc hasRuntimeOption { name } { + # + # NOTE: Returns non-zero if the specified runtime option is set. + # + return [object invoke Interpreter.GetActive HasRuntimeOption $name] + } proc getPluginFlags { pattern } { foreach loaded [info loaded] { set plugin [lindex $loaded end] @@ -1601,12 +1573,12 @@ # them into the global namespace. # exportAndImportPackageCommands [namespace current] [list \ exportAndImportPackageCommands isEagle isMono getEnvironmentVariable \ getPluginPath getDictionaryValue getColumnValue getRowColumnValue \ - appendArgs haveGaruda lappendArgs readFile filter map reduce tsource \ - getPlatformInfo testShim] false false + appendArgs haveGaruda lappendArgs readFile filter map reduce \ + getPlatformInfo] false false ########################################################################### ############################## END Tcl ONLY ############################### ########################################################################### } Index: Externals/Eagle/lib/Eagle1.0/test.eagle ================================================================== --- Externals/Eagle/lib/Eagle1.0/test.eagle +++ Externals/Eagle/lib/Eagle1.0/test.eagle @@ -199,11 +199,12 @@ # # TODO: Add more support for standard tcltest options here. # set options [list -configuration -suffix -file -notFile -match -skip \ - -constraints -logFile -threshold -stopOnFailure -exitOnComplete] + -constraints -logFile -preTest -postTest -threshold -stopOnFailure \ + -exitOnComplete] foreach {name value} $args { if {[lsearch -exact $options $name] != -1} then { set array($name) $value @@ -228,13 +229,12 @@ foreach name [list TEMP TMP] { # # NOTE: Make sure we handle all the reasonable "cases" of # the environment variable names. # - lappend names [string toupper $name] - lappend names [string tolower $name] - lappend names [string totitle $name] + lappend names [string toupper $name] [string tolower $name] \ + [string totitle $name] } # # NOTE: Check if we can use any of the environment variables. # @@ -310,33 +310,58 @@ # evaluated in Eagle). # set expr {random()} # - # HACK: Mono does not currently support calling the String.Format - # overload that takes a variable number of arguments via - # reflection (Mono bug #636939). + # NOTE: Include the host name to make the result more unique in both + # time and space. Also, hash the entire constructed string. # if {![isMono]} then { - return [string format "{0:X16}{1:X16}{2:X16}" \ - [clock now] [clock clicks] [expr $expr]] - } else { - # - # NOTE: Strip any leading minus signs for cleanliness. - # - return [appendArgs \ - [string trimleft [clock now] -] \ - [string trimleft [clock clicks] -] \ - [string trimleft [expr $expr] -]] - } - } else { - set seconds [clock seconds]; set clicks [clock clicks] - binary scan [binary format d* [expr {rand()}]] w* random - - return [format [appendArgs % [getLengthModifier $seconds] X% \ - [getLengthModifier $clicks] X% [getLengthModifier $random] X] \ - $seconds $clicks $random] + # + # NOTE: When running on the .NET Framework, we can simply use the + # [string format] command. + # + return [hash normal sha256 [string format \ + "{0}{1:X8}{2:X8}{3:X16}{4:X16}{5:X16}" [info host] [pid] \ + [info tid] [clock now] [clock clicks] [expr $expr]]] + } else { + # + # HACK: Mono does not currently support calling the String.Format + # overload that takes a variable number of arguments via + # reflection (Mono bug #636939). Also, strip any leading + # minus signs for cleanliness. + # + return [hash normal sha256 [appendArgs [info host] [string trimleft \ + [pid] -] [string trimleft [info tid] -] [string trimleft \ + [clock now] -] [string trimleft [clock clicks] -] [string trimleft \ + [expr $expr] -]]] + } + } else { + # + # NOTE: Generate a random number using [expr] and then convert it + # to hexadecimal. + # + binary scan [binary format d* [expr {rand()}]] w* random + + # + # NOTE: Convert the host name to a hexadecimal string and include + # it in the result in an attempt to make it more unique in + # both time and space. + # + binary scan [info host] c* host + set host [eval [list format [string repeat %X [llength $host]]] $host] + + # + # NOTE: Build the final result with the [format] command, converting + # all the pieces to hexadecimal (except the host, which is + # already hexadecimal). + # + set pid [pid]; set seconds [clock seconds]; set clicks [clock clicks] + + return [appendArgs $host [format [appendArgs % [getLengthModifier $pid] \ + X% [getLengthModifier $seconds] X% [getLengthModifier $clicks] X% \ + [getLengthModifier $random] X] $pid $seconds $clicks $random]] } } proc getTestLogId {} { return [expr {[info exists ::test_log_id] ? \ @@ -350,13 +375,11 @@ proc testExec { commandName options args } { set command [list exec] if {[llength $options] > 0} then {eval lappend command $options} - lappend command -- - lappend command $commandName - + lappend command -- $commandName eval lappend command $args tputs $::test_channel [appendArgs "---- running command: " $command \n] return [uplevel 1 $command] @@ -530,10 +553,67 @@ } unhookPuts } } + + proc testShim { args } { + # + # NOTE: Call the original (saved) [test] command, wrapping it in + # our standard test wrapper. + # + uplevel 1 [list runTest [concat ::savedTest $args]] + } + + proc tsource { fileName {prologue true} {epilogue true} } { + # + # NOTE: Run the test prologue in the context of the caller (which + # must be global)? + # + if {$prologue} then { + uplevel 1 runTestPrologue + } + + # + # NOTE: Save the original [test] command and setup our test shim in + # its place. + # + rename ::test ::savedTest + interp alias {} ::test {} testShim + + # + # NOTE: Source the specified test file in the context of the caller + # (which should be global). + # + set code [catch {uplevel 1 [list source $fileName]} result] + set error [expr {$code == 0 ? false : true}] + + # + # NOTE: Remove our test shim and restore the original (saved) [test] + # command. + # + interp alias {} ::test {} + rename ::savedTest ::test + + # + # NOTE: Run the test epilogue in the context of the caller (which + # must be global)? + # + if {$epilogue} then { + uplevel 1 runTestEpilogue + } + + # + # NOTE: If the test raised an error, re-raise it now; otherwise, + # just return the result. + # + if {$error} then { + error $result + } else { + return $result + } + } proc recordTestStatistics { varName index } { # # NOTE: Record counts of all object types that we track. # @@ -705,22 +785,60 @@ } } return $result } + + proc formatDecimal { value {places 4} } { + if {[isEagle]} then { + # + # HACK: This works; however, in order to do this kind of thing cleanly, + # we really need the Tcl [format] command. + # + set result [object invoke String Format [appendArgs "{0:0." \ + [string repeat # $places] "}"] [set object [object invoke \ + -create Double Parse $value]]] + + unset object; # dispose + } else { + # + # NOTE: See, nice and clean when done in Tcl? + # + set result [format [appendArgs %. $places f] $value] + } + + return $result + } + + proc clearTestPercent { channel } { + if {[isEagle]} then { + host title "" + } + } + + proc reportTestPercent { channel percent } { + set status [appendArgs "---- test suite running, about " $percent \ + "% complete..."] + + tputs $channel [appendArgs $status \n] + + if {[isEagle]} then { + host title $status + } + } proc runAllTests { channel path fileNames skipFileNames } { # # NOTE: Show the exact arguments we received since they may not # have been displayed by the caller (or anybody else). # - tputs $::test_channel [appendArgs "---- test run path: \"" $path \"\n] + tputs $channel [appendArgs "---- test run path: \"" $path \"\n] - tputs $::test_channel [appendArgs "---- test run file names: " \ + tputs $channel [appendArgs "---- test run file names: " \ [list [removePathFromFileNames $path $fileNames]] \n] - tputs $::test_channel [appendArgs "---- test run skip file names: " \ + tputs $channel [appendArgs "---- test run skip file names: " \ [list $skipFileNames] \n] # # NOTE: Keep going unless this becomes true (i.e. if one of the # test files signals us to stop). @@ -738,11 +856,24 @@ set failed [list] # # NOTE: Process each file name we have been given by the caller... # + set total [llength $fileNames]; set lastPercent -1 + foreach fileName $fileNames { + # + # NOTE: In terms of files, not tests, what percent done are we now? + # + set percent [formatDecimal \ + [expr {100.0 * ($count / double($total))}]] + + if {$percent != $lastPercent} then { + reportTestPercent $channel $percent + set lastPercent $percent + } + # # NOTE: Skipping over any file name that matches a pattern in the # list of file names to skip. # if {[inverseLsearchGlob false $skipFileNames \ @@ -829,12 +960,12 @@ # # NOTE: Most likely, this error was caused by malformed or # incorrect code in-between the tests themselves. We # need to report this. # - tputs $::test_channel [appendArgs "==== \"" $fileName \ - "\" ERROR \"" $error \"\n] + tputs $channel [appendArgs "==== \"" $fileName "\" ERROR \"" \ + $error \"\n] # # NOTE: Stop further processing after this loop iteration? # if {[isStopOnFailure]} then { @@ -848,10 +979,21 @@ # # NOTE: We evaluated another test file. # incr count + + # + # NOTE: In terms of files, not tests, what percent done are we now? + # + set percent [formatDecimal \ + [expr {100.0 * ($count / double($total))}]] + + if {$percent != $lastPercent} then { + reportTestPercent $channel $percent + set lastPercent $percent + } # # NOTE: Record failed test count after this file. # if {[isEagle]} then { @@ -886,10 +1028,27 @@ # NOTE: Determine if any resource leaks have occurred and # output diagnostics as necessary if they have. # reportTestStatistics $channel $fileName leaks } + } else { + # + # NOTE: This file does not actually count towards the total (i.e. + # it contains no actual tests). + # + incr total -1 + } + + # + # NOTE: In terms of files, not tests, what percent done are we now? + # + set percent [formatDecimal \ + [expr {100.0 * ($count / double($total))}]] + + if {$percent != $lastPercent} then { + reportTestPercent $channel $percent + set lastPercent $percent } # # NOTE: If the test file raised an error (i.e. to indicate a # test failure with the stop-on-failure flag enabled), @@ -896,22 +1055,44 @@ # break out of the test loop now. # if {$stop} then { break } + } else { + # + # NOTE: This file does not actually count towards the total (i.e. + # it is part of the test suite infrastructure). + # + incr total -1 + } + + # + # NOTE: In terms of files, not tests, what percent done are we now? + # + set percent [formatDecimal \ + [expr {100.0 * ($count / double($total))}]] + + if {$percent != $lastPercent} then { + reportTestPercent $channel $percent + set lastPercent $percent } } - tputs $::test_channel [appendArgs "---- sourced " \ - $count " test " [expr {$count > 1 ? "files" : "file"}] \n] + # + # NOTE: Reset the host title because we may have changed it in the for + # loop (above). + # + clearTestPercent $channel + + tputs $channel [appendArgs "---- sourced " $count " test " \ + [expr {$count > 1 ? "files" : "file"}] \n] # # NOTE: Show the files that had failing tests. # if {[llength $failed] > 0} then { - tputs $::test_channel [appendArgs "---- files with failing tests: " \ - $failed \n] + tputs $channel [appendArgs "---- files with failing tests: " $failed \n] } } proc configureTcltest { imports force } { if {[isEagle]} then { @@ -993,10 +1174,15 @@ set eagle_tests(skipNames) $test_flags(-skip); # skip these tests. } else { set eagle_tests(skipNames) [list]; # default to skipping no tests. } + # + # NOTE: What tests have been skipped, if any? + # + set eagle_tests(skippedNames) [list] + # # NOTE: What tests have failed, if any? # set eagle_tests(failedNames) [list] @@ -1166,10 +1352,35 @@ default { return unknown } } } + + proc getGarudaDll {} { + # + # NOTE: Get the Garuda DLL of the same platform (i.e. machine type) + # as the native Tcl shell. + # + if {[info exists ::base_path] && \ + [info exists ::eagle_platform(configuration)]} then { + # + # NOTE: Build the full path and file name of the Garuda DLL, using + # the Eagle base path. Currently, this will only work + # correctly if the test suite is being run from inside the + # source tree. + # + return [file join $::base_path bin \ + [machineToPlatform [getMachineForTclShell]] [appendArgs \ + $::eagle_platform(configuration) Dll] [appendArgs Garuda \ + [info sharedlibextension]]] + } else { + # + # NOTE: We are missing necessary global variables, return nothing. + # + return "" + } + } proc cleanupExcel {} { # # TODO: These may need to be changed in later Excel versions. # @@ -1208,27 +1419,36 @@ } # # NOTE: Setup the test path relative to the library path. # - if {![interp issafe] && ![info exists test_path]} then { + if {![interp issafe] && ![info exists ::test_path]} then { # # NOTE: Try the source release directory structure. # set ::test_path [file join [file normalize [file dirname [file dirname \ [info library]]]] Library Tests] if {![file exists $::test_path] || \ ![file isdirectory $::test_path]} then { # - # NOTE: Must be a binary release, no "Library" directory then. - # Also, binary releases have a lower-case "tests" directory - # name that originates from the "update.bat" tool. Must - # match casing with "update.bat". + # NOTE: Try for the test package directory. + # + set ::test_path [file join [file normalize [file dirname \ + [file dirname [info script]]]] Test1.0] + } + + if {![file exists $::test_path] || \ + ![file isdirectory $::test_path]} then { + # + # NOTE: This must be a binary release, no "Library" directory then. + # Also, binary releases have an upper-case "Tests" directory + # name that originates from the "update.bat" tool. This must + # match the casing used in "update.bat". # set ::test_path [file join [file normalize [file dirname [file dirname \ - [info library]]]] tests] + [info library]]]] Tests] } } # # NOTE: Fake having the tcltest package unless we are prevented. @@ -1267,27 +1487,36 @@ } # # NOTE: Setup the test path relative to the path of this file. # - if {![info exists test_path]} then { + if {![info exists ::test_path]} then { # # NOTE: Try the source release directory structure. # set ::test_path [file join [file normalize [file dirname \ [file dirname [file dirname [info script]]]]] Library Tests] if {![file exists $::test_path] || \ ![file isdirectory $::test_path]} then { # - # NOTE: Must be a binary release, no "Library" directory then. - # Also, binary releases have a lower-case "tests" directory - # name that originates from the "update.bat" tool. Must - # match casing with "update.bat". + # NOTE: Try for the test package directory. + # + set ::test_path [file join [file normalize [file dirname \ + [file dirname [info script]]]] Test1.0] + } + + if {![file exists $::test_path] || \ + ![file isdirectory $::test_path]} then { + # + # NOTE: This must be a binary release, no "Library" directory then. + # Also, binary releases have an upper-case "Tests" directory + # name that originates from the "update.bat" tool. This must + # match the casing used in "update.bat". # set ::test_path [file join [file normalize [file dirname \ - [file dirname [file dirname [info script]]]]] tests] + [file dirname [file dirname [info script]]]]] Tests] } } # # NOTE: Load and configure the tcltest package unless we are prevented. @@ -1304,11 +1533,12 @@ calculateRelativePerformance haveConstraint haveOrAddConstraint \ processTestArguments getTemporaryPath getTestLog getTestLogId getFiles \ getConstraints getTestFiles getTestRunId execTestShell runTestPrologue \ runTestEpilogue runTest runAllTests fixConstraints sourceIfValid \ isExitOnComplete getPassPercentage getSkipPercentage testExec tlog \ - tputs formatList configureTcltest] false false + tputs formatDecimal formatList configureTcltest tsource testShim] \ + false false ########################################################################### ############################## END Tcl ONLY ############################### ########################################################################### } ADDED Externals/Eagle/lib/Test1.0/constraints.eagle Index: Externals/Eagle/lib/Test1.0/constraints.eagle ================================================================== --- /dev/null +++ Externals/Eagle/lib/Test1.0/constraints.eagle @@ -0,0 +1,1591 @@ +############################################################################### +# +# constraints.eagle -- +# +# Extensible Adaptable Generalized Logic Engine (Eagle) +# Test Constraints File +# +# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. +# +# See the file "license.terms" for information on usage and redistribution of +# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# RCS: @(#) $Id: $ +# +############################################################################### + +# +# NOTE: Use our own namespace here because even though we do not directly +# support namespaces ourselves, we do not want to pollute the global +# namespace if this script actually ends up being evaluated in Tcl. +# +namespace eval ::Eagle { + proc checkForPlatform { channel } { + tputs $channel "---- checking for platform... " + + addConstraint $::tcl_platform(platform) + + if {![isEagle]} then { + # + # BUGFIX: We do not want to skip any Mono bugs in Tcl. + # Also, fake the culture. + # + set constraints [list monoToDo monoBug monoCrash culture.en_US] + + # + # NOTE: Add the necessary constraints for each version + # of Mono we know about. + # + foreach version [list 20 22 24 26 28 210 30] { + addConstraint [appendArgs monoToDo $version] + addConstraint [appendArgs monoBug $version] + addConstraint [appendArgs monoCrash $version] + } + + foreach constraint $constraints { + addConstraint $constraint; # running in Tcl. + } + } + + tputs $channel [appendArgs $::tcl_platform(platform) \n] + } + + proc checkForEagle { channel } { + tputs $channel "---- checking for Eagle... " + + if {[isEagle]} then { + # + # NOTE: We are running inside Eagle. + # + addConstraint eagle + + # + # NOTE: We do not want to skip bugs or crashing + # issues for Tcl since we are not running + # in Tcl. + # + addConstraint tclBug + addConstraint tclCrash + + # + # NOTE: Add the necessary constraints for each + # version of Tcl we know about. + # + foreach version [list 84 85 86] { + addConstraint [appendArgs tclBug $version] + addConstraint [appendArgs tclCrash $version] + } + + tputs $channel yes\n + } else { + # + # NOTE: We are running inside Tcl. + # + addConstraint tcl + + # + # NOTE: Each Tcl bug and crash constraint is set + # based on the exact Tcl version (i.e. not + # greater than or equal to). + # + if {[info exists ::tcl_version]} then { + # + # NOTE: For each Tcl version we know about, + # check it against the currently running + # Tcl version. If the two are not equal, + # add the test constraints that prevent + # skipping those tests that are buggy + # only for the particular version of Tcl. + # + foreach dotVersion [list 8.4 8.5 8.6] { + if {$::tcl_version ne $dotVersion} then { + set version [string map [list . ""] $dotVersion] + + addConstraint [appendArgs tclBug $version] + addConstraint [appendArgs tclCrash $version] + } + } + } + + # + # NOTE: We do not want to skip bugs or crashing + # issues for Eagle since we are not running + # in Eagle. + # + addConstraint eagleBug + addConstraint eagleCrash + + tputs $channel no\n + } + } + + proc checkForGaruda { channel } { + tputs $channel "---- checking for Garuda... " + + if {[haveGaruda packageId]} then { + # + # NOTE: We are running with or via Garuda. + # + addConstraint garuda + + tputs $channel [appendArgs "yes (" $packageId ")\n"] + } else { + tputs $channel no\n + } + } + + proc checkForShell { channel } { + tputs $channel "---- checking for shell... " + + set name [file rootname [file tail [info nameofexecutable]]] + + if {[isEagle]} then { + if {$name eq "EagleShell"} then { + # + # NOTE: We are running in Eagle via the EagleShell. + # + addConstraint shell + + tputs $channel "yes (Eagle)\n" + + # + # NOTE: We are done here, return now. + # + return + } + } else { + if {[string match tclsh* $name]} then { + # + # NOTE: We are running in Tcl via tclsh. + # + addConstraint shell + + tputs $channel "yes (Tcl)\n" + + # + # NOTE: We are done here, return now. + # + return + } + } + + tputs $channel no\n + } + + proc checkForDebug { channel } { + tputs $channel "---- checking for debug... " + + if {[info exists ::tcl_platform(debug)] && $::tcl_platform(debug)} then { + addConstraint debug + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForTk { channel } { + tputs $channel "---- checking for Tk... " + + # + # HACK: For now, disable testing Tk 8.4/8.5 when running in Eagle. + # + if {![isEagle] || [haveConstraint tclLibrary86]} then { + addConstraint tk + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForVersion { channel } { + tputs $channel "---- checking for language version... " + + if {[info exists ::tcl_version]} then { + # + # TODO: Cleanup the semantics for adding test + # constraints here. + # + if {$::tcl_version eq "8.4"} then { + # + # NOTE: Baseline reported language and feature + # version. + # + addConstraint tcl84 + addConstraint tcl84OrHigher + addConstraint tcl84Feature + + if {[isEagle]} then { + # + # NOTE: *EAGLE* We do want to include any + # tests that target "Tcl 8.5 or higher" + # features and/or "Tcl 8.6 or higher" + # features because they would not be in + # the test suite if we did not support + # that particular feature, regardless + # of the language version. + # + addConstraint tcl85Feature + addConstraint tcl86Feature + } + } elseif {$::tcl_version eq "8.5"} then { + # + # NOTE: Baseline reported language and feature + # version. Tcl 8.5 includes all the + # features from itself and Tcl 8.4. + # + addConstraint tcl85 + addConstraint tcl84OrHigher + addConstraint tcl85OrHigher + addConstraint tcl84Feature + addConstraint tcl85Feature + + if {[isEagle]} then { + # + # NOTE: *EAGLE* We do want to include any + # tests that target "Tcl 8.5 or higher" + # features and/or "Tcl 8.6 or higher" + # features because they would not be in + # the test suite if we did not support + # that particular feature, regardless + # of the language version. + # + addConstraint tcl86Feature + } + } elseif {$::tcl_version eq "8.6"} then { + # + # NOTE: Baseline reported language and feature + # version. Tcl 8.6 includes all the + # features from itself Tcl 8.4, and Tcl + # 8.5. + # + addConstraint tcl86 + addConstraint tcl84OrHigher + addConstraint tcl85OrHigher + addConstraint tcl86OrHigher + addConstraint tcl84Feature + addConstraint tcl85Feature + addConstraint tcl86Feature + } + + tputs $channel [appendArgs $::tcl_version \n] + } else { + tputs $channel no\n + } + } + + proc checkForCommand { channel name } { + tputs $channel [appendArgs "---- checking for command \"" $name \ + "\"... "] + + # + # NOTE: Is the command available? + # + if {[llength [info commands $name]] > 0} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint command.$name + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForFile { channel name {constraint ""} } { + tputs $channel [appendArgs "---- checking for file \"" $name \ + "\"... "] + + if {[file exists $name]} then { + # + # NOTE: Yes, it appears that it is available. + # + if {[string length $constraint] > 0} then { + addConstraint file_$constraint + } else { + addConstraint file_[file tail $name] + } + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForPathFile { channel name {constraint ""} } { + tputs $channel [appendArgs "---- checking for file \"" $name \ + "\" along PATH... "] + + if {[file exists $name]} then { + # + # NOTE: Yes, it appears that it is available [in the exact location they + # specified]. + # + if {[string length $constraint] > 0} then { + addConstraint file_$constraint + } else { + addConstraint file_[file tail $name] + } + + tputs $channel yes\n + + # + # NOTE: We are done here, return now. + # + return + } else { + # + # NOTE: Use the appropriate environment variable for the platform. + # + if {$::tcl_platform(platform) eq "windows"} then { + set pathName PATH + } else { + # + # HACK: For shared libraries, use the LD_LIBRARY_PATH. + # + if {[file extension $name] eq [info sharedlibextension]} then { + set pathName LD_LIBRARY_PATH + } else { + set pathName PATH + } + } + + # + # NOTE: Is the required environment variable available? + # + if {[info exists ::env($pathName)]} then { + # + # NOTE: Ok, grab it now. + # + set path $::env($pathName) + + # + # NOTE: Use the appropriate path separator for the platform. + # + if {[info exists ::tcl_platform(pathSeparator)]} then { + set separator $::tcl_platform(pathSeparator) + } elseif {$::tcl_platform(platform) eq "windows"} then { + set separator \; + } else { + set separator : + } + + # + # NOTE: Grab just the file name from the possibly fully qualified file + # name provided by the caller. + # + set tail [file tail $name] + + # + # NOTE: Check each directory in the PATH for the file. + # + foreach directory [split $path $separator] { + # + # NOTE: Check for the file in this directory contained in the PATH. + # This strips the directory portion off the file name specified + # by the caller, if any, before joining that file name to the + # current directory of the PATH being searched. + # + if {[file exists [file join $directory $tail]]} then { + # + # NOTE: Yes, it appears that it is available in the PATH. + # + if {[string length $constraint] > 0} then { + addConstraint file_$constraint + } else { + addConstraint file_[file tail $name] + } + + tputs $channel yes\n + + # + # NOTE: We are done here, return now. + # + return + } + } + } + } + + tputs $channel no\n + } + + proc checkForNativeCode { channel } { + tputs $channel "---- checking for native code... " + + if {[isEagle]} then { + if {[info exists ::eagle_platform(compileOptions)] && \ + [info exists ::tcl_platform(platform)] && \ + [lsearch -exact -nocase $::eagle_platform(compileOptions) \ + $::tcl_platform(platform)] != -1} then { + # + # NOTE: Yes, the binary matches the current platform, + # native code can be used. + # + addConstraint native + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } else { + # + # NOTE: Tcl is always native code and can always execute native code. + # + addConstraint native + + # + # HACK: Needed by test "benchmark-1.22". + # + addConstraint compile.NATIVE + + tputs $channel yes\n + } + } + + proc checkForTip127 { channel } { + tputs $channel "---- checking for TIP #127... " + + # + # NOTE: Is the interpreter TIP #127 ready? + # + if {[catch {lsearch -index 0 0 0}] == 0} then { + addConstraint tip127 + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForTip194 { channel } { + tputs $channel "---- checking for TIP #194... " + + # + # NOTE: Is the interpreter TIP #194 ready? + # + catch {apply} error + + if {$error ne {invalid command name "apply"}} then { + addConstraint tip194 + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForTip241 { channel } { + tputs $channel "---- checking for TIP #241... " + + # + # NOTE: Is the interpreter TIP #241 ready? + # + if {[catch {lsearch -nocase 0 0}] == 0} then { + addConstraint tip241 + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForTip285 { channel } { + tputs $channel "---- checking for TIP #285... " + + # + # NOTE: Is the interpreter TIP #285 ready? + # + catch {interp cancel} error + + if {$error eq "eval canceled"} then { + addConstraint tip285 + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForTiming { channel threshold } { + tputs $channel "---- checking for precision timing... " + + # + # NOTE: Are we allowed to do precision timing tests? + # + if {![info exists ::no(timing)]} then { + # + # NOTE: Attempt to block for exactly one second. + # + set start [expr {[clock clicks -milliseconds] & 0x7fffffff}] + after 1000; # wait for "exactly" one second. + set stop [expr {[clock clicks -milliseconds] & 0x7fffffff}] + + # + # NOTE: Calculate the difference between the actual and expected + # number of milliseconds. + # + set difference [expr {abs($stop - $start - 1000)}] + + # + # NOTE: Are we within the threshold specified by the caller? + # + if {$difference >= 0 && $difference <= $threshold} then { + addConstraint timing + + tputs $channel [appendArgs "yes (0 <= " $difference " <= " \ + $threshold " milliseconds)\n"] + } else { + tputs $channel [appendArgs "no (0 <= " $difference " > " \ + $threshold " milliseconds)\n"] + } + } else { + tputs $channel no\n + } + } + + proc checkForPerformance { channel } { + tputs $channel "---- checking for performance testing... " + + # + # NOTE: Are we allowed to do performance testing? + # + if {![info exists ::no(performance)]} then { + addConstraint performance + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForInteractive { channel } { + tputs $channel "---- checking for interactive user... " + + # + # NOTE: Is there an interactive user? + # + if {[info exists ::tcl_interactive] && $::tcl_interactive} then { + addConstraint interactive + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForUserInteraction { channel } { + tputs $channel "---- checking for user interaction... " + + # + # HACK: For now, do the exact same check as checkForInteractive; however, + # this is still useful as a separate constraint because it can be + # individually disabled in "prologue.eagle". + # + if {[info exists ::tcl_interactive] && $::tcl_interactive} then { + addConstraint userInteraction + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForNetwork { channel host timeout } { + tputs $channel [appendArgs \ + "---- checking for network connectivity to host \"" $host "\"... "] + + if {[isEagle]} then { + # + # BUGBUG: Tcl 8.4 does not like this expression (and Tcl tries to + # compile it even though it will only actually ever be + # evaluated in Eagle). + # + set expr {[llength [info commands uri]] > 0 && \ + [catch {uri ping $host $timeout} response] == 0 && \ + [lindex $response 0] in [list Success TimedOut] && \ + [string is integer -strict [lindex $response 1]] && \ + [lindex $response 1] <= $timeout} + + # + # NOTE: Does it look like we are able to contact the network host? + # + if {[expr $expr]} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint network_$host + + tputs $channel [appendArgs "yes (" $response ")\n"] + } else { + tputs $channel no\n + } + } else { + # + # HACK: Running in Tcl, just assume we have network access. + # + addConstraint network_$host + + tputs $channel yes\n + } + } + + if {[isEagle]} then { + ########################################################################### + ############################ BEGIN Eagle ONLY ############################# + ########################################################################### + + proc checkForSoftwareUpdateTrust { channel } { + tputs $channel "---- checking for software update trust... " + + if {[llength [info commands uri]] > 0 && \ + [catch {uri softwareupdates} result] == 0 && \ + $result eq "software update certificate is trusted"} then { + # + # NOTE: Yes, it appears that we trust our software updates. + # Since this setting is off by default, the user (or + # a script evaluated by the user) must have manually + # turned it on. + # + addConstraint softwareUpdate + + tputs $channel trusted\n + } else { + tputs $channel untrusted\n + } + } + + proc checkForAdministrator { channel } { + tputs $channel "---- checking for administrator... " + + if {[isAdministrator]} then { + addConstraint administrator; # running as full admin. + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForHost { channel } { + tputs $channel "---- checking for host... " + + if {[set code [catch {host isopen} result]] == 0 && $result} then { + addConstraint hostIsOpen + + tputs $channel open\n + } elseif {$code == 0} then { + tputs $channel closed\n + } else { + tlog $result; tputs $channel error\n] + } + } + + proc checkForPrimaryThread { channel } { + tputs $channel "---- checking for primary thread... " + + set threadId [object invoke Interpreter.GetActive ThreadId] + + if {[info tid] == $threadId} then { + addConstraint primaryThread + + tputs $channel [appendArgs "yes (" $threadId ")\n"] + } else { + tputs $channel [appendArgs "no (" $threadId ")\n"] + } + } + + proc checkForRuntime { channel } { + tputs $channel "---- checking for runtime... " + + # + # NOTE: Are we running inside Mono (regardless of operating system)? + # + if {[isMono]} then { + # + # NOTE: Yes, it appears that we are running inside Mono. + # + addConstraint mono; # running on Mono. + + tputs $channel [appendArgs [expr {[info exists \ + ::eagle_platform(runtime)] ? \ + $::eagle_platform(runtime) : "Mono"}] \n] + } else { + # + # NOTE: No, it appears that we are not running inside Mono. + # + addConstraint dotNet; # running on .NET. + + # + # NOTE: We do not want to skip Mono bugs on .NET. + # + addConstraint monoToDo; # running on .NET. + addConstraint monoBug; # running on .NET. + addConstraint monoCrash; # running on .NET. + + tputs $channel [appendArgs [expr {[info exists \ + ::eagle_platform(runtime)] ? \ + $::eagle_platform(runtime) : "Microsoft.NET"}] \n] + } + } + + proc checkForImageRuntimeVersion { channel } { + tputs $channel "---- checking for image runtime version... " + + if {[info exists ::eagle_platform(imageRuntimeVersion)] && \ + [string length $::eagle_platform(imageRuntimeVersion)] > 0} then { + # + # NOTE: Get the major and minor portions of the version only. + # + set dotVersion [join [lrange [split \ + $::eagle_platform(imageRuntimeVersion) .] 0 1] .] + + # + # NOTE: Now create a version string for use in the constraint name + # (remove the periods). + # + set version [string map [list v "" . ""] $dotVersion] + + # + # NOTE: Keep track of the specific image runtime version for usage in + # test constraints. + # + addConstraint imageRuntime$version + + tputs $channel [appendArgs $::eagle_platform(imageRuntimeVersion) \ + " " ( $dotVersion ) \n] + } else { + tputs $channel no\n + } + } + + proc checkForRuntimeVersion { channel } { + tputs $channel "---- checking for runtime version... " + + if {[info exists ::eagle_platform(runtimeVersion)] && \ + [string length $::eagle_platform(runtimeVersion)] > 0} then { + # + # NOTE: Get the major and minor portions of the version only. + # + set dotVersion [join [lrange [split \ + $::eagle_platform(runtimeVersion) .] 0 1] .] + + # + # NOTE: Now create a version string for use in the constraint name + # (remove the periods). + # + set version [string map [list . ""] $dotVersion] + + if {[isMono]} then { + if {[string length $version] > 0} then { + # + # NOTE: We are running on Mono. Keep track of the specific + # version for usage in test constraints. + # + addConstraint mono$version + } + + if {[string length $dotVersion] > 0 && \ + [regexp -- {^(\d+)\.(\d+)$} $dotVersion dummy \ + majorVersion minorVersion]} then { + set monoVersions [list] + + # + # NOTE: Check for any Mono version 2.x or higher. + # + if {$majorVersion >= 2} then { + # + # NOTE: Check for any Mono version higher than 2.0. + # + if {$majorVersion > 2 || $minorVersion > 0} then { + lappend monoVersions 20 + } + + # + # NOTE: Check for any Mono version higher than 2.2. + # + if {$majorVersion > 2 || $minorVersion > 2} then { + lappend monoVersions 22 + } + + # + # NOTE: Check for any Mono version higher than 2.4. + # + if {$majorVersion > 2 || $minorVersion > 4} then { + lappend monoVersions 24 + } + + # + # NOTE: Check for any Mono version higher than 2.6. + # + if {$majorVersion > 2 || $minorVersion > 6} then { + lappend monoVersions 26 + } + + # + # NOTE: Check for any Mono version higher than 2.8. + # + if {$majorVersion > 2 || $minorVersion > 8} then { + lappend monoVersions 28 + } + + # + # NOTE: Check for any Mono version higher than 2.10. + # + if {$majorVersion > 2 || $minorVersion > 10} then { + lappend monoVersions 210 + } + } + + # + # NOTE: Check for any Mono version 3.x or higher. + # + if {$majorVersion >= 3} then { + # + # NOTE: Check for any Mono version higher than 3.0. + # + if {$majorVersion > 3 || $minorVersion > 0} then { + lappend monoVersions 30 + } + } + + # + # NOTE: Add the necessary constraints for each version of Mono we + # should NOT skip bugs for. + # + foreach monoVersion $monoVersions { + addConstraint [appendArgs monoToDo $monoVersion] + addConstraint [appendArgs monoBug $monoVersion] + addConstraint [appendArgs monoCrash $monoVersion] + } + } + } else { + if {[string length $version] > 0} then { + # + # NOTE: We are running on the .NET Framework. Keep track of the + # specific version for usage in test constraints. + # + addConstraint dotNet$version + } + + # + # NOTE: We do not want to skip any Mono bugs on .NET. Add the + # necessary constraints for each version of Mono we know + # about. + # + foreach monoVersion [list 20 22 24 26 28 210 30] { + addConstraint [appendArgs monoToDo $monoVersion] + addConstraint [appendArgs monoBug $monoVersion] + addConstraint [appendArgs monoCrash $monoVersion] + } + } + + tputs $channel [appendArgs $::eagle_platform(runtimeVersion) \ + " " ( $dotVersion ) \n] + } else { + tputs $channel no\n + } + } + + proc checkForMachine { channel bits machine } { + tputs $channel [appendArgs "---- checking for machine \"" $bits \ + "-bit " $machine "\"... "] + + # + # NOTE: What are the machine architecture and the + # number of bits for this operating system? + # + if {[info exists ::tcl_platform(machine)] && \ + [info exists ::tcl_platform(osBits)]} then { + # + # NOTE: Does the machine and number of bits match + # what the caller specified? + # + if {$::tcl_platform(machine) eq $machine && \ + $::tcl_platform(osBits) eq $bits} then { + # + # NOTE: Yes, it matches. + # + addConstraint $machine.${bits}bit + + set result yes + } else { + set result no + } + + tputs $channel [appendArgs $result ", " $::tcl_platform(osBits) -bit \ + " " $::tcl_platform(machine) \n] + } else { + tputs $channel "no, unknown\n" + } + } + + proc checkForGarudaDll { channel } { + # + # NOTE: Check for the Garuda DLL of the same platform (i.e. machine + # type) as the native Tcl shell. + # + return [checkForFile $channel [getGarudaDll]] + } + + proc checkForCulture { channel } { + tputs $channel "---- checking for culture... " + + # + # NOTE: Grab the current culture. + # + set culture [info culture] + + if {[string length $culture] > 0} then { + # + # NOTE: The culture information is present, use it and show it. + # + addConstraint culture.[string map [list - _] $culture] + + tputs $channel [appendArgs $culture \n] + } else { + tputs $channel [appendArgs unknown \n] + } + } + + proc checkForReferenceCountTracking { channel } { + tputs $channel "---- checking for object reference count tracking... " + + if {[info exists ::eagle_platform(compileOptions)] && \ + ([lsearch -exact -nocase $::eagle_platform(compileOptions) \ + NOTIFY] != -1 || \ + [lsearch -exact -nocase $::eagle_platform(compileOptions) \ + NOTIFY_OBJECT] != -1)} then { + # + # NOTE: Yes, support for object reference count tracking is present. + # + addConstraint refCount + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForCompileOption { channel option } { + tputs $channel [appendArgs "---- checking for compile option \"" \ + $option "\"... "] + + if {[info exists ::eagle_platform(compileOptions)] && \ + [lsearch -exact -nocase $::eagle_platform(compileOptions) \ + $option] != -1} then { + # + # NOTE: Yes, support for the compile option is present. + # + addConstraint compile.$option + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForRuntimeOption { channel option } { + tputs $channel [appendArgs "---- checking for runtime option \"" \ + $option "\"... "] + + if {[info exists ::eagle_platform(runtimeOptions)] && \ + [lsearch -exact -nocase $::eagle_platform(runtimeOptions) \ + $option] != -1} then { + # + # NOTE: Yes, support for the runtime option is present. + # + addConstraint runtime.$option + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForDynamicLoading { channel } { + tputs $channel "---- checking for dynamic loading... " + + # + # NOTE: As far as we know, dynamic loading always works on Windows. + # On some Unix systems, dlopen does not work (e.g. because + # Mono is statically linked, etc). + # + if {$::tcl_platform(platform) eq "windows" || \ + ([llength [info commands library]] > 0 && \ + [catch {library test}] == 0)} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint dynamic + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForWindowsForms { channel } { + tputs $channel "---- checking for Windows Forms... " + + # + # HACK: When running on Windows, we do not need to do any other + # special checks here; however, on Unix (and Mac OS X?), + # we should check for the DISPLAY environment variable as + # some basic indication that the X server is available. + # This appears to be very necessary on Mono because it + # crashes after repeated failed attempts to create a + # Windows Form when the X server is unavailable (e.g. on + # OpenBSD). + # + if {$::tcl_platform(platform) eq "windows" || \ + [info exists ::env(DISPLAY)]} then { + # + # NOTE: Is the Windows Forms assembly available? + # + if {[catch {object resolve System.Windows.Forms} assembly] == 0} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint winForms + + tputs $channel yes\n + + # + # NOTE: We are done here, return now. + # + return + } + } + + tputs $channel no\n + } + + proc checkForStaThread { channel } { + tputs $channel "---- checking for STA thread... " + + if {[catch {object invoke System.Threading.Thread.CurrentThread \ + GetApartmentState} apartmentState] == 0 && \ + $apartmentState eq "STA"} then { + # + # NOTE: Yes, we are running in an STA thread. + # + addConstraint staThread + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForWindowsPresentationFoundation { channel } { + tputs $channel "---- checking for Windows Presentation Foundation... " + + # + # NOTE: Is the Windows Presentation Foundation available? + # + if {[catch {object resolve PresentationFramework} assembly] == 0} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint wpf + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForDatabase { channel string } { + tputs $channel "---- checking for database... " + + # + # HACK: Disable database connectivity testing on Mono because + # it fails to timeout (unless special test suite hacks + # for Mono have been disabled by the user). + # + if {[info exists ::no(mono)] || ![isMono]} then { + # + # NOTE: Can we access the local database? + # + if {[catch {sql open $string} connection] == 0} then { + # + # NOTE: Yes, it appears that we can connect to the local database. + # + addConstraint sql + + # + # NOTE: Cleanup the database connection we just opened. + # + sql close $connection + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } else { + tputs $channel disabled\n + } + } + + proc checkForAssembly { channel name } { + tputs $channel [appendArgs "---- checking for assembly \"" $name \ + "\"... "] + + # + # NOTE: Can the assembly be loaded? + # + if {[catch {object resolve $name} assembly] == 0} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint $name + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForObjectMember { channel object member {constraint ""} } { + tputs $channel [appendArgs "---- checking for object member \"" \ + $object . $member "\"... "] + + if {[catch {object members -flags +NonPublic -pattern $member $object} \ + members] == 0 && [llength $members] > 0} then { + # + # NOTE: Yes, it appears that it is available. + # + if {[string length $constraint] > 0} then { + addConstraint member_$constraint + } else { + addConstraint $object.[string trim $member *?] + } + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForTclInstalls { channel } { + tputs $channel "---- checking for Tcl installs... " + + # + # NOTE: Check for dynamically loadable Tcl libraries (for this + # architecture only). + # + if {[catch {tcl select -architecture} tcl] == 0} then { + # + # NOTE: Did we find one? Attempt to grab the index + # of the version field from the list. + # + set index [lsearch -exact $tcl version] + + if {$index != -1} then { + # + # NOTE: The very next list index contains the value + # (i.e. like a Tcl 8.5+ dict). + # + set dotVersion [lindex $tcl [incr index]] + + # + # NOTE: Do we know the version? + # + if {[string length $dotVersion] > 0 && \ + [regexp -- {^\d+\.\d+$} $dotVersion]} then { + # + # NOTE: Yes, some version of Tcl is available. + # + addConstraint tclLibrary + + # + # NOTE: Is the version 8.x or higher? + # + if {$dotVersion >= 8.6} then { + addConstraint tclLibrary86 + } elseif {$dotVersion >= 8.5} then { + addConstraint tclLibrary85 + } elseif {$dotVersion >= 8.4} then { + addConstraint tclLibrary84 + } + + tputs $channel [appendArgs $dotVersion \n] + + # + # NOTE: We are done here, return now. + # + return + } + } + } + + tputs $channel no\n + } + + proc checkForTclReady { channel } { + tputs $channel "---- checking for Tcl readiness... " + + if {[catch {tcl ready} result] == 0 && $result} then { + # + # NOTE: Yes, native Tcl is loaded and ready. + # + addConstraint tclReady + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForTclShell { channel } { + # + # HACK: We do not care about the machine type returned from this + # procedure, we only care if it returns "error" because that + # would indicate an error was caught during [exec] (i.e. the + # native Tcl shell could not be executed). + # + if {[catch {getMachineForTclShell} result] == 0 && \ + $result ne "error"} then { + # + # NOTE: Yes, a native Tcl shell appears to be available. + # + addConstraint tclShell + + tputs $channel [appendArgs "---- checking for Tcl shell... yes (" \ + $result ")\n"] + } else { + tputs $channel "---- checking for Tcl shell... no\n" + } + } + + proc checkForPowerShell { channel } { + tputs $channel "---- checking for PowerShell... " + + # + # NOTE: Can the PowerShell assembly be loaded? + # + if {[catch {object resolve System.Management.Automation} \ + assembly] == 0} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint powerShell + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForWix { channel } { + tputs $channel "---- checking for WiX... " + + # + # NOTE: Platform must be Windows for this constraint to + # even be checked (i.e. we require the registry). + # + if {$::tcl_platform(platform) eq "windows"} then { + # + # NOTE: Indicate that we have not found it yet. + # + set directory "" + + # + # NOTE: Have we not found the directory yet? + # + # Yes, this is somewhat redundant because we just set + # the directory to an empty string (above); however, + # maintaining a uniform pattern is more important. + # + if {[string length $directory] == 0} then { + # + # NOTE: Check for the WIX environment variable. + # + if {[info exists ::env(WIX)]} then { + set directory [file normalize [string trimright $::env(WIX)]] + + if {[string length $directory] > 0} then { + # + # NOTE: We need the directory containing the binaries. + # + set directory [file join $directory bin] + + # + # NOTE: Does the directory actually exist? + # + if {[file isdirectory $directory]} then { + # + # NOTE: The file name of the primary WiX assembly. + # + set fileName [file join $directory wix.dll] + + # + # NOTE: We do not know the file version yet. + # + set version "" + + # + # NOTE: Attempt to query the version of the file. + # + if {[catch {file version $fileName} version] == 0 && \ + [string length $version] > 0} then { + # + # NOTE: Indicate where we found the file. + # + set where environment + } else { + # + # NOTE: The file does not exist or is not properly + # versioned. + # + set directory "" + } + } else { + # + # NOTE: The directory does not exist. + # + set directory "" + } + } + } + } + + # + # NOTE: Have we not found the directory yet? + # + if {[string length $directory] == 0} then { + # + # NOTE: Registry hive where WiX install information + # is stored. + # + set key {HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML} + + # + # NOTE: The versions of WiX that we support. + # + set versions [list 3.5 3.0] + + # + # NOTE: Check each version, stopping when one is found. + # + foreach version $versions { + # + # NOTE: Attempt to fetch the WiX install directory + # value from the registry, removing the + # trailing backslash, if any. + # + set directory [file normalize [string trimright [object invoke \ + Microsoft.Win32.Registry GetValue \ + [appendArgs $key \\ $version] InstallRoot \ + null] \\]] + + # + # NOTE: Does the directory name look valid and + # does it actually exist? + # + if {[string length $directory] > 0} then { + # + # NOTE: Does the directory actually exist? + # + if {[file isdirectory $directory]} then { + # + # NOTE: The file name of the primary WiX assembly. + # + set fileName [file join $directory wix.dll] + + # + # NOTE: We do not know the file version yet. + # + set version "" + + # + # NOTE: Attempt to query the version of the file. + # + if {[catch {file version $fileName} version] == 0 && \ + [string length $version] > 0} then { + # + # NOTE: Indicate where we found the file. + # + set where registry + + # + # NOTE: We found it, bail out now. + # + break + } else { + # + # NOTE: The file does not exist or is not properly + # versioned. + # + set directory "" + } + } else { + # + # NOTE: The directory does not exist. + # + set directory "" + } + } + } + } + + # + # NOTE: Did we find the directory? + # + if {[string length $directory] > 0 && \ + [file isdirectory $directory]} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint wix + + # + # NOTE: Save the directory for later usage by + # the test itself. + # + set ::test_wix $directory + + # + # NOTE: Show where we found it. + # + tputs $channel [appendArgs "yes (" $version ", via " $where ", \"" \ + $directory "\")\n"] + + # + # NOTE: We are done here, return now. + # + return + } + } + + tputs $channel no\n + } + + proc checkForManagedDebugger { channel } { + tputs $channel "---- checking for managed debugger... " + + # + # NOTE: Is the managed debugger attached? + # + if {[object invoke System.Diagnostics.Debugger IsAttached]} then { + # + # NOTE: Yes, it appears that it is attached. + # + addConstraint managedDebugger + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } + + proc checkForScriptDebugger { channel } { + tputs $channel "---- checking for script debugger... " + + # + # NOTE: Is the script debugger available? + # + if {[catch {object invoke -flags +NonPublic Interpreter.GetActive \ + Debugger} debugger] == 0} then { + # + # NOTE: We do not own this, do not dispose it. + # + if {[string length $debugger] > 0} then { + object flags $debugger +NoDispose + } + + if {[regexp -- {^Debugger#\d+$} $debugger]} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint scriptDebugger + + tputs $channel yes\n + + # + # NOTE: We are done here, return now. + # + return + } + } + + tputs $channel no\n + } + + proc checkForScriptDebuggerInterpreter { channel } { + tputs $channel "---- checking for script debugger interpreter... " + + # + # NOTE: Is the script debugger interpreter available? + # + if {[catch {object invoke -flags +NonPublic Interpreter.GetActive \ + Debugger} debugger] == 0} then { + # + # NOTE: We do not own this, do not dispose it. + # + if {[string length $debugger] > 0} then { + object flags $debugger +NoDispose + } + + if {[regexp -- {^Debugger#\d+$} $debugger] && \ + [catch {object invoke $debugger Interpreter} interp] == 0} then { + # + # NOTE: We do not own this, do not dispose it. + # + if {[string length $interp] > 0} then { + object flags $interp +NoDispose + } + + if {[regexp -- {^Interpreter#\d+$} $interp]} then { + # + # NOTE: Yes, it appears that it is available. + # + addConstraint scriptDebuggerInterpreter + + tputs $channel yes\n + + # + # NOTE: We are done here, return now. + # + return + } + } + } + + tputs $channel no\n + } + + ########################################################################### + ############################# END Eagle ONLY ############################## + ########################################################################### + } else { + ########################################################################### + ############################# BEGIN Tcl ONLY ############################## + ########################################################################### + + # + # NOTE: We need several of our test constraint related commands in the + # global namespace. + # + exportAndImportPackageCommands [namespace current] [list checkForPlatform \ + checkForEagle checkForGaruda checkForShell checkForDebug checkForTk \ + checkForVersion checkForCommand checkForFile checkForNativeCode \ + checkForTip127 checkForTip194 checkForTip241 checkForTip285 \ + checkForPerformance checkForTiming checkForInteractive \ + checkForUserInteraction checkForNetwork] false false + + ########################################################################### + ############################## END Tcl ONLY ############################### + ########################################################################### + } + + # + # NOTE: Provide the Eagle test constraints package to the interpreter. + # + package provide EagleTestConstraints \ + [expr {[isEagle] ? [info engine PatchLevel] : 1.0}] +} + ADDED Externals/Eagle/lib/Test1.0/epilogue.eagle Index: Externals/Eagle/lib/Test1.0/epilogue.eagle ================================================================== --- /dev/null +++ Externals/Eagle/lib/Test1.0/epilogue.eagle @@ -0,0 +1,302 @@ +############################################################################### +# +# epilogue.eagle -- +# +# Extensible Adaptable Generalized Logic Engine (Eagle) +# Test Epilogue File +# +# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. +# +# See the file "license.terms" for information on usage and redistribution of +# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# RCS: @(#) $Id: $ +# +############################################################################### + +if {![info exists no([file tail [info script]])]} then { + if {[info level] > 0} then { + error "cannot run, current level is not global" + } + + if {[isEagle]} then { + # + # NOTE: Show the current state of the memory. + # + tputs $test_channel [appendArgs "---- ending memory: " \ + [formatListAsDict [debug memory]] \n] + + # + # NOTE: Show the current state of the native stack. + # + catch {debug stack true} stack + + tputs $test_channel [appendArgs "---- ending stack: " \ + [formatListAsDict $stack] \n] + + unset stack + } + + # + # NOTE: Show when the tests actually ended (now). + # + tputs $test_channel [appendArgs "---- tests ended at " \ + [clock format [clock seconds]] \n] + + if {[isEagle]} then { + # + # NOTE: Check for and display any duplicate test names that we found. In + # theory, this checking may produce false positives if a test file + # (or the entire test suite) is run multiple times without resetting + # the test statistics and/or restarting Eagle; however, duplicate + # test names must be avoided and this is considered a good trade-off. + # + foreach {name count} $eagle_tests(counts) { + if {$count > 1} then { + tputs $test_channel [appendArgs \ + "==== test name \"" $name "\" DUPLICATED (" $count ")\n"] + } elseif {$count <= 0} then { + tputs $test_channel [appendArgs \ + "==== test name \"" $name "\" BAD COUNT (" $count ")\n"] + } + } + + unset -nocomplain name count + + tputs $test_channel \n; # NOTE: Blank line. + + if {$eagle_tests(passed) > 0} then { + host result Ok [appendArgs "PASSED: " $eagle_tests(passed) \n] + tlog [appendArgs "PASSED: " $eagle_tests(passed) \n] + } + + if {$eagle_tests(failed) > 0} then { + host result Error [appendArgs "FAILED: " $eagle_tests(failed) \n] + tlog [appendArgs "FAILED: " $eagle_tests(failed) \n] + + if {[llength $eagle_tests(failedNames)] > 0} then { + host result Error [appendArgs "FAILED: " $eagle_tests(failedNames) \n] + tlog [appendArgs "FAILED: " $eagle_tests(failedNames) \n] + } + } + + if {$eagle_tests(skipped) > 0} then { + host result Break [appendArgs "SKIPPED: " $eagle_tests(skipped) \n] + tlog [appendArgs "SKIPPED: " $eagle_tests(skipped) \n] + + if {[llength $eagle_tests(skippedNames)] > 0} then { + host result Break [appendArgs "SKIPPED: " $eagle_tests(skippedNames) \n] + tlog [appendArgs "SKIPPED: " $eagle_tests(skippedNames) \n] + } + } + + if {$eagle_tests(total) > 0} then { + host result Return [appendArgs "TOTAL: " $eagle_tests(total) \n] + tlog [appendArgs "TOTAL: " $eagle_tests(total) \n] + + if {$eagle_tests(skipped) > 0} then { + set percent [getSkipPercentage] + host result Break [appendArgs "SKIP PERCENTAGE: " \ + [formatDecimal $percent] %\n] + + tlog [appendArgs "SKIP PERCENTAGE: " [formatDecimal $percent] %\n] + } + + set percent [getPassPercentage] + host result Return [appendArgs "PASS PERCENTAGE: " \ + [formatDecimal $percent] %\n] + + tlog [appendArgs "PASS PERCENTAGE: " [formatDecimal $percent] %\n] + } else { + # + # NOTE: No tests. + # + set percent 0 + } + + # + # NOTE: Has the test pass threshold been set? If so, is it set to + # the default value? + # + if {![info exists test_threshold] || $test_threshold == 100} then { + # + # NOTE: The test pass threshold is set to the default value (100%). + # Check to make sure that all tests pass and then set the + # exit code to success; otherwise, we set it to failure. + # + set passedOrSkipped [expr {$eagle_tests(passed) + \ + $eagle_tests(skipped)}] + + if {$passedOrSkipped == $eagle_tests(total)} then { + set exitCode Success + + host result Ok "OVERALL RESULT: SUCCESS\n" + tlog "OVERALL RESULT: SUCCESS\n" + } else { + set exitCode Failure + + host result Error "OVERALL RESULT: FAILURE\n" + tlog "OVERALL RESULT: FAILURE\n" + } + + unset passedOrSkipped + } else { + # + # NOTE: They specified a non-default test pass threshold. Check to + # make sure that we meet or exceed the requirement and then + # set the exit code to success; otherwise, set it to failure. + # + if {$percent >= $test_threshold} then { + set exitCode Success + + host result Ok [appendArgs "OVERALL RESULT: SUCCESS (" \ + $percent "% >= " $test_threshold %)\n] + + tlog [appendArgs "OVERALL RESULT: SUCCESS (" \ + $percent "% >= " $test_threshold %)\n] + } else { + set exitCode Failure + + host result Error [appendArgs \ + "OVERALL RESULT: FAILURE (" $percent "% < " $test_threshold %)\n] + + tlog [appendArgs \ + "OVERALL RESULT: FAILURE (" $percent "% < " $test_threshold %)\n] + } + } + + unset percent + + tputs $test_channel \n; # NOTE: Blank line. + } else { + tputs $test_channel \n; # NOTE: Blank line. + + if {$::tcltest::numTests(Passed) > 0} then { + tputs $test_channel \ + [appendArgs "PASSED: " $::tcltest::numTests(Passed) \n] + } + + if {$::tcltest::numTests(Failed) > 0} then { + tputs $test_channel \ + [appendArgs "FAILED: " $::tcltest::numTests(Failed) \n] + + if {[llength $::tcltest::failFiles] > 0} then { + tputs $test_channel \ + [appendArgs "FAILED: " $::tcltest::failFiles \n] + } + } + + if {$::tcltest::numTests(Skipped) > 0} then { + tputs $test_channel \ + [appendArgs "SKIPPED: " $::tcltest::numTests(Skipped) \n] + } + + if {$::tcltest::numTests(Total) > 0} then { + tputs $test_channel \ + [appendArgs "TOTAL: " $::tcltest::numTests(Total) \n] + + if {$::tcltest::numTests(Skipped) > 0} then { + set percent [getSkipPercentage] + tputs $test_channel [appendArgs "SKIP PERCENTAGE: " \ + [formatDecimal $percent] %\n] + } + + set percent [getPassPercentage] + tputs $test_channel [appendArgs "PASS PERCENTAGE: " \ + [formatDecimal $percent] %\n] + } else { + # + # NOTE: No tests. + # + set percent 0 + } + + # + # NOTE: Has the test pass threshold been set? If so, is it set to + # the default value? + # + if {![info exists test_threshold] || $test_threshold == 100} then { + # + # NOTE: The test pass threshold is set to the default value (100%). + # Check to make sure that all tests pass and then set the + # exit code to success; otherwise, we set it to failure. + # + set passedOrSkipped [expr {$::tcltest::numTests(Passed) + \ + $::tcltest::numTests(Skipped)}] + + if {$passedOrSkipped == $::tcltest::numTests(Total)} then { + set exitCode 0; # Success. + + tputs $test_channel "OVERALL RESULT: SUCCESS\n" + } else { + set exitCode 1; # Failure. + + tputs $test_channel "OVERALL RESULT: FAILURE\n" + } + + unset passedOrSkipped + } else { + # + # NOTE: They specified a non-default test pass threshold. Check to + # make sure that we meet or exceed the requirement and then + # set the exit code to success; otherwise, set it to failure. + # + if {$percent >= $test_threshold} then { + set exitCode 0; # Success. + + tputs $test_channel [appendArgs "OVERALL RESULT: SUCCESS (" \ + $percent "% >= " $test_threshold %)\n] + } else { + set exitCode 1; # Failure. + + tputs $test_channel [appendArgs "OVERALL RESULT: FAILURE (" \ + $percent "% < " $test_threshold %)\n] + } + } + + unset percent + + tputs $test_channel \n; # NOTE: Blank line. + } + + # + # NOTE: Check for and process any custom test epilogue script that may + # be set in the environment. + # + sourceIfValid epilogue [getEnvironmentVariable testEpilogue] + + # + # NOTE: Evaluate the specified post-test script now, if any. + # + if {[info exists test_flags(-postTest)] && \ + [string length $test_flags(-postTest)] > 0} then { + # + # TODO: Perhaps use [uplevel] here instead of [eval]. For now, it does not + # matter since we enforce this file being evaluated at the top-level. + # + eval $test_flags(-postTest) + } + + # + # NOTE: Do we need to exit now? + # + if {[isExitOnComplete]} then { + # + # NOTE: Exit now. In Eagle, this will not exit the entire process. + # Zero (0) will be the exit code if all the selected tests have + # succeeded or the test success threshold has been met or + # exceeded; otherwise, one (1) will be the exit code. + # + exit $exitCode + } else { + # + # NOTE: For Eagle, even when not exiting, we still set the ExitCode + # property of the interpreter. + # + if {[isEagle]} then { + object invoke -alias Interpreter.GetActive ExitCode $exitCode + } + + unset exitCode + } +} ADDED Externals/Eagle/lib/Test1.0/pkgIndex.eagle Index: Externals/Eagle/lib/Test1.0/pkgIndex.eagle ================================================================== --- /dev/null +++ Externals/Eagle/lib/Test1.0/pkgIndex.eagle @@ -0,0 +1,21 @@ +############################################################################### +# +# pkgIndex.eagle -- +# +# Extensible Adaptable Generalized Logic Engine (Eagle) +# Package Index File +# +# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. +# +# See the file "license.terms" for information on usage and redistribution of +# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# RCS: @(#) $Id: $ +# +############################################################################### + +if {![package vsatisfies [package provide Tcl] 8.4]} {return} +if {![package vsatisfies [package provide Eagle] 1.0]} {return} + +package ifneeded EagleTestConstraints 1.0 [list source [file join $dir \ + constraints.eagle]] ADDED Externals/Eagle/lib/Test1.0/pkgIndex.tcl Index: Externals/Eagle/lib/Test1.0/pkgIndex.tcl ================================================================== --- /dev/null +++ Externals/Eagle/lib/Test1.0/pkgIndex.tcl @@ -0,0 +1,21 @@ +############################################################################### +# +# pkgIndex.tcl -- +# +# Extensible Adaptable Generalized Logic Engine (Eagle) +# Package Index File +# +# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. +# +# See the file "license.terms" for information on usage and redistribution of +# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# RCS: @(#) $Id: $ +# +############################################################################### + +if {![package vsatisfies [package provide Tcl] 8.4]} {return} +if {[string length [package provide Eagle]] > 0} then {return} + +package ifneeded EagleTestConstraints 1.0 [list source [file join $dir \ + constraints.eagle]] ADDED Externals/Eagle/lib/Test1.0/prologue.eagle Index: Externals/Eagle/lib/Test1.0/prologue.eagle ================================================================== --- /dev/null +++ Externals/Eagle/lib/Test1.0/prologue.eagle @@ -0,0 +1,1551 @@ +############################################################################### +# +# prologue.eagle -- +# +# Extensible Adaptable Generalized Logic Engine (Eagle) +# Test Prologue File +# +# Copyright (c) 2007-2010 by Joe Mistachkin. All rights reserved. +# +# See the file "license.terms" for information on usage and redistribution of +# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# RCS: @(#) $Id: $ +# +############################################################################### + +if {![info exists no([file tail [info script]])]} then { + if {[info level] > 0} then { + error "cannot run, current level is not global" + } + + # + # NOTE: Set the location of the test suite, if necessary. + # + if {![info exists test_path]} then { + set test_path [file normalize [file dirname [info script]]] + } + + # + # NOTE: Set the location of the base Eagle directory, if + # necessary. + # + if {![info exists base_path]} then { + # + # NOTE: Start out going up one level and check for a "lib" + # sub-directory. If not found, go up another level + # because we will always be two levels down from the + # base directory when running inside the source tree. + # + set base_path [file normalize [file dirname $test_path]] + + # + # HACK: We must verify that the "init.eagle" file can eventually + # be found under the "lib" directory since Visual Studio + # insists on creating a superfluous (and empty) "lib\Eagle1.0" + # sub-directory inside of the "Library" project directory + # simply due to the links contained in the project file that + # actually point to the "lib\Eagle1.0" sub-directory under the + # solution directory. + # + # WARNING: The Eagle package name and version are hard-coded here. + # + if {![file exists [file join $base_path lib]] || \ + ![file isdirectory [file join $base_path lib]] || \ + ![file exists [file join $base_path lib Eagle1.0]] || \ + ![file isdirectory [file join $base_path lib Eagle1.0]] || \ + ![file exists [file join $base_path lib Eagle1.0 init.eagle]] || \ + ![file isfile [file join $base_path lib Eagle1.0 init.eagle]]} then { + # + # NOTE: We do not bother to check if the "lib" sub-directory + # actually exists as a child of this one. This is the + # previous (legacy) behavior (i.e. where we always went + # up two levels to the base directory). + # + set base_path [file dirname $base_path] + } + } + + # + # NOTE: Set the executable file name for the process, if + # necessary. + # + if {![info exists bin_file]} then { + set bin_file [info nameofexecutable] + } + + # + # NOTE: Set the location of the directory containing the + # executable file for the process, if necessary. + # + if {![info exists bin_path]} then { + set bin_path [file normalize [file dirname $bin_file]] + } + + # + # NOTE: Set the location of the [non-script] library directory + # (i.e. the directory where the plugins are located), if + # necessary. + # + if {![info exists lib_path]} then { + # + # NOTE: This should go one directory up from the directory + # containing the executable file for the process (e.g. + # the shell) and then into the "lib" directory just + # beneath that. + # + set lib_path [file normalize [file join [file dirname $bin_path] lib]] + } + + # + # NOTE: Set the web host to test against, if necessary. + # + if {![info exists test_host]} then { + set test_host eagle.to + } + + # + # NOTE: Set the port to use for server sockets, if necessary. + # + if {![info exists test_port]} then { + set test_port 12346; # IANA, 12346-12752 Unassigned + } + + # + # NOTE: Set the network timeout, if necessary. + # + if {![info exists test_timeout]} then { + set test_timeout 2000; # in milliseconds. + } + + # + # NOTE: Set the channel to use for test output, if necessary. + # + if {![info exists test_channel]} then { + set test_channel stdout + } + + # + # NOTE: Set the primary package path, if necessary. + # + if {![info exists test_package_path]} then { + set test_package_path [file join $base_path lib] + } + + # + # NOTE: Make sure our primary package path is part of the auto path. + # + if {[lsearch -exact $auto_path $test_package_path] == -1} then { + lappend auto_path $test_package_path + } + + # + # NOTE: Make sure our test package path is part of the auto path. + # + if {[lsearch -exact $auto_path $test_path] == -1} then { + lappend auto_path $test_path + } + + ############################################################################# + + # + # NOTE: Check for and load the Eagle library package, if necessary. + # + if {[catch {package present EagleLibrary}]} then { + package require EagleLibrary + } + + # + # NOTE: Check for and load the Eagle test package, if necessary. + # + if {[catch {package present EagleTest}]} then { + package require EagleTest + } + + # + # NOTE: Check for and load the Eagle test constraints package, if + # necessary. + # + if {[catch {package present EagleTestConstraints}]} then { + package require EagleTestConstraints + } + + ############################################################################# + + # + # NOTE: If command line arguments were supplied, process them now. + # + set test_flags(-configuration) ""; # build configuration, default to empty. + set test_flags(-suffix) ""; # build suffix, default to empty. + set test_flags(-file) [list *.eagle]; # default to running all test files. + set test_flags(-notFile) [list l.*.eagle]; # COMPAT: Tcl. + set test_flags(-match) [list *]; # default to running all tests. + set test_flags(-skip) [list]; # default to skipping no tests. + set test_flags(-constraints) [list]; # default to no manual constraints. + set test_flags(-logFile) ""; # default to using standard log file naming. + set test_flags(-threshold) ""; # default to requiring all tests to pass. + set test_flags(-stopOnFailure) ""; # default to continue on failure. + set test_flags(-exitOnComplete) ""; # default to not exit after complete. + set test_flags(-preTest) ""; # default to not evaluating anything. + set test_flags(-postTest) ""; # default to not evaluating anything. + + # + # NOTE: Check for and process any command line arguments. + # + if {[info exists argv]} then { + eval processTestArguments test_flags $argv + + if {[info exists test_flags(-logFile)] && \ + [string length $test_flags(-logFile)] > 0} then { + # + # NOTE: Set the log file name to the one provided by the command line. + # + set test_log $test_flags(-logFile) + } + + if {[info exists test_flags(-threshold)] && \ + [string is integer -strict $test_flags(-threshold)]} then { + # + # NOTE: Set the test pass threshold to the one provided by the command + # line. + # + set test_threshold $test_flags(-threshold) + } + + if {[info exists test_flags(-stopOnFailure)] && \ + [string is boolean -strict $test_flags(-stopOnFailure)]} then { + # + # NOTE: Set the test stop-on-failure flag to the one provided by the + # command line. + # + set test_stop_on_failure $test_flags(-stopOnFailure) + } + + if {[info exists test_flags(-exitOnComplete)] && \ + [string is boolean -strict $test_flags(-exitOnComplete)]} then { + # + # NOTE: Set the test exit-on-complete flag to the one provided by the + # command line. + # + set test_exit_on_complete $test_flags(-exitOnComplete) + } + } + + # + # NOTE: Set the default test configuration (i.e. Debug or Release), if + # necessary. + # + if {![info exists test_configuration]} then { + set test_configuration [getPlatformInfo configuration Release] + } + + # + # NOTE: Set the Tcl shell executable to use for those specialized + # tests that may require it, if necessary. + # + if {![info exists test_tclsh]} then { + if {[isEagle] || ![string match tclsh* $bin_file]} then { + set test_tclsh tclsh + } else { + set test_tclsh $bin_file + } + } + + # + # NOTE: Has logging been disabled? + # + if {![info exists no(log)]} then { + # + # NOTE: Set the log to use for test output, if necessary. + # + if {![info exists test_log]} then { + set test_log [file join [getTemporaryPath] [file tail [info \ + nameofexecutable]][getTestLogId].test.[pid].log] + } + } + + # + # NOTE: Evaluate the specified pre-test script now, if any. + # + if {[info exists test_flags(-preTest)] && \ + [string length $test_flags(-preTest)] > 0} then { + # + # TODO: Perhaps use [uplevel] here instead of [eval]. For now, it does not + # matter since we enforce this file being evaluated at the top-level. + # + eval $test_flags(-preTest) + } + + # + # NOTE: Check for and process any custom test prologue script that may be set + # in the environment. This must be done after the Eagle test package + # has been made available and after the log file has been setup. + # + sourceIfValid prologue [getEnvironmentVariable testPrologue] + + # + # NOTE: Show the name of the executable and the command line arguments, if + # any. This must be done after the log file has been setup; otherwise, + # this information will not be visible in the log file. + # + tputs $test_channel [appendArgs "---- testRunId: " \ + [getTestRunId] \n] + + tputs $test_channel [appendArgs "---- processId: " \ + [pid] \n] + + tputs $test_channel [appendArgs "---- test channel: " \ + $test_channel \n] + + tputs $test_channel [appendArgs "---- test configuration: " \ + [expr {[info exists test_configuration] ? \ + $test_configuration : ""}] \n] + + if {[isEagle]} then { + tputs $test_channel [appendArgs "---- original command line: " \ + [info cmdline] \n] + + tputs $test_channel [appendArgs "---- threadId: " \ + [info tid] \n] + + tputs $test_channel [appendArgs "---- processors: " \ + [info processors] \n] + + catch {object invoke Console.InputEncoding WebName} encoding + + tputs $test_channel [appendArgs "---- input encoding: " \ + $encoding \n] + + catch {object invoke Console.OutputEncoding WebName} encoding + + tputs $test_channel [appendArgs "---- output encoding: " \ + $encoding \n] + + unset encoding + + tputs $test_channel [appendArgs "---- starting memory: " \ + [formatListAsDict [debug memory]] \n] + + catch {debug stack true} stack + + tputs $test_channel [appendArgs "---- starting stack: " \ + [formatListAsDict $stack] \n] + + unset stack + catch {file drive} drive + + tputs $test_channel [appendArgs "---- system drive: " \ + [formatListAsDict $drive] \n] + + unset drive + } + + tputs $test_channel [appendArgs "---- executable: \"" \ + $bin_file \"\n] + + tputs $test_channel [appendArgs "---- command line: " \ + [expr {[info exists argv] && [string length $argv] > 0 ? \ + $argv : ""}] \n] + + tputs $test_channel [appendArgs "---- logging to: " \ + [expr {[info exists test_log] && [string length $test_log] > 0 ? \ + [appendArgs \" $test_log \"] : ""}] \n] + + tputs $test_channel [appendArgs "---- pass threshold: " \ + [expr {[info exists test_threshold] && \ + [string is integer -strict $test_threshold] ? \ + [appendArgs $test_threshold %] : ""}] \n] + + tputs $test_channel [appendArgs "---- stop on failure: " \ + [expr {[info exists test_stop_on_failure] && \ + [string is boolean -strict $test_stop_on_failure] ? \ + $test_stop_on_failure : ""}] \n] + + tputs $test_channel [appendArgs "---- exit on complete: " \ + [expr {[info exists test_exit_on_complete] && \ + [string is boolean -strict $test_exit_on_complete] ? \ + $test_exit_on_complete : ""}] \n] + + # + # NOTE: Show the information about which tests and files are being run and/or + # skipped (COMPAT: Tcl). + # + if {[llength $test_flags(-file)] > 0} then { + tputs $test_channel [appendArgs "---- running test files that match: " \ + $test_flags(-file) \n] + } + + if {[llength $test_flags(-notFile)] > 0} then { + tputs $test_channel [appendArgs "---- skipping test files that match: " \ + $test_flags(-notFile) \n] + } + + if {[llength $test_flags(-match)] > 0} then { + tputs $test_channel [appendArgs "---- running tests that match: " \ + $test_flags(-match) \n] + } + + if {[llength $test_flags(-skip)] > 0} then { + tputs $test_channel [appendArgs "---- skipping tests that match: " \ + $test_flags(-skip) \n] + } + + tputs $test_channel [appendArgs "---- path: \"" \ + [expr {[info exists path] && [string length $path] > 0 ? \ + $path : ""}] \"\n] + + tputs $test_channel [appendArgs "---- base path: \"" \ + $base_path \"\n] + + tputs $test_channel [appendArgs "---- binary path: \"" \ + $bin_path \"\n] + + tputs $test_channel [appendArgs "---- library path: \"" \ + $lib_path \"\n] + + tputs $test_channel [appendArgs "---- tests located in: \"" \ + $test_path \"\n] + + tputs $test_channel [appendArgs "---- tests running in: \"" \ + [pwd] \"\n] + + tputs $test_channel [appendArgs "---- temporary files stored in: \"" \ + [getTemporaryPath] \"\n] + + tputs $test_channel [appendArgs "---- native Tcl shell: \"" \ + $test_tclsh \"\n] + + # + # NOTE: Initialize the Eagle test constraints. + # + if {[isEagle]} then { + initializeTests + + # + # NOTE: If the "no(mono)" variable is set (to anything) then any + # special test suite hacks for Mono will be disabled. This + # does not control or change any hacks for Mono that may + # be present in the library itself. + # + # if {![info exists no(mono)] && [isMono]} then { + # set no(mono) true + # } + + # + # NOTE: Has administrator detection support been disabled? We do + # this check [nearly] first as it may [eventually] be used + # to help determine if other constraints should be skipped. + # + if {![info exists no(administrator)]} then { + checkForAdministrator $test_channel + } + + # + # NOTE: Has host detection support been disabled? + # + if {![info exists no(host)]} then { + checkForHost $test_channel + } + + # + # NOTE: Has primary thread detection support been disabled? We do + # this check [nearly] first as it may [eventually] be used + # to help determine if other constraints should be skipped. + # + if {![info exists no(primaryThread)]} then { + checkForPrimaryThread $test_channel + } + + # + # NOTE: Has runtime detection support been disabled? We do this + # checking [nearly] first as it may skip other constraints. + # + if {![info exists no(runtime)]} then { + checkForRuntime $test_channel + } + + # + # NOTE: Check the runtime version (i.e. what version of the runtime + # are we currently running on?). + # + if {![info exists no(runtimeVersion)]} then { + checkForRuntimeVersion $test_channel + } + + # + # NOTE: Check the image runtime version (i.e. what version of the + # runtime was this assembly compiled against?). + # + if {![info exists no(imageRuntimeVersion)]} then { + checkForImageRuntimeVersion $test_channel + } + + # + # NOTE: Has machine detection support been disabled? + # + if {![info exists no(machine)]} then { + checkForMachine $test_channel 32 intel; # (i.e. x86) + checkForMachine $test_channel 64 amd64; # (i.e. x64) + } + + # + # NOTE: Has culture detection support been disabled? + # + if {![info exists no(culture)]} then { + checkForCulture $test_channel + } + + # + # NOTE: Has software update trust detection support been disabled? + # + if {![info exists no(softwareUpdate)]} then { + checkForSoftwareUpdateTrust $test_channel + } + + # + # NOTE: Has database testing support been disabled? + # + if {![info exists no(sql)]} then { + # + # NOTE: Set the server name, if necessary. + # + if {![info exists server]} then { + set server . + } + + # + # NOTE: Set the database name, if necessary. + # + if {![info exists database]} then { + set database master + } + + # + # NOTE: Set the connection timeout, if necessary. + # + if {![info exists timeout]} then { + set timeout [expr {$test_timeout / 1000}]; # milliseconds to seconds. + } + + # + # NOTE: Set the test user name, if necessary. + # + if {![info exists user]} then { + set user [getEnvironmentVariable user] + } + + # + # NOTE: Set the test password, if necessary. + # + if {![info exists password]} then { + set password [getEnvironmentVariable password] + } + + # + # NOTE: Set the database connection string, if necessary. + # + if {![info exists test_database]} then { + # + # NOTE: Mono does not have support for trusted connections; + # therefore, we must create a slightly different + # connection string. + # + set test_database [subst \ + {Data Source=${server};Initial Catalog=${database};Connect\ + Timeout=${timeout};[expr {[isMono] ? [subst \ + {User Id=${user};Password=${password};}] : {Integrated\ + Security=SSPI;}}]}] + } + + # + # NOTE: Can we access the local database? + # + checkForDatabase $test_channel $test_database + unset password user timeout database server + } + + # + # NOTE: Has object handle reference count tracking support been disabled + # (at compile-time)? + # + if {![info exists no(refCount)]} then { + # + # NOTE: For tests "excel-*", "object-2.*", "object-7.1", "object-8.*", + # and "object-98.*". + # + checkForReferenceCountTracking $test_channel + } + + # + # NOTE: Has compile/runtime option testing support been disabled? + # + if {![info exists no(compileOptions)]} then { + # + # NOTE: Has callback queue support been enabled (at compile-time)? + # + if {![info exists no(compileCallbackQueue)]} then { + # + # NOTE: For test "commands-1.4". + # + checkForCompileOption $test_channel CALLBACK_QUEUE + } + + # + # NOTE: Has console support been enabled (at compile-time)? + # + if {![info exists no(compileConsole)]} then { + # + # NOTE: For test "host-1.2". + # + checkForCompileOption $test_channel CONSOLE + } + + # + # NOTE: Has database support been enabled (at compile-time)? + # + if {![info exists no(compileData)]} then { + # + # NOTE: For tests "sql-1.1" and "upvar-99.1". + # + checkForCompileOption $test_channel DATA + } + + # + # NOTE: Has script debugger support been enabled (at compile-time)? + # + if {![info exists no(compileDebugger)]} then { + # + # NOTE: For tests "debug-1.1", "debug-2.1", "debug-3.1" and + # "debug-4.1". + # + checkForCompileOption $test_channel DEBUGGER + } + + # + # NOTE: Has isolated interpreter support been enabled (at compile-time)? + # + if {![info exists no(compileIsolatedInterpreters)]} then { + # + # NOTE: For test "xaml-1.2". + # + checkForCompileOption $test_channel ISOLATED_INTERPRETERS + } + + # + # NOTE: Has isolated plugin support been enabled (at compile-time)? + # + if {![info exists no(compileIsolatedPlugins)]} then { + # + # NOTE: For test "load-1.1.1". + # + checkForCompileOption $test_channel ISOLATED_PLUGINS + } + + # + # NOTE: Has PowerShell approved-verbs support been enabled (at + # compile-time)? + # + if {![info exists no(compileApprovedVerbs)]} then { + # + # NOTE: For test "object-4.8". + # + checkForCompileOption $test_channel APPROVED_VERBS + } + + # + # NOTE: Has Mono support been enabled (at compile-time)? + # + if {![info exists no(compileMono)]} then { + # + # NOTE: For test "object-4.13". + # + checkForCompileOption $test_channel MONO + } + + # + # NOTE: Has Windows support been enabled (at compile-time)? + # + if {![info exists no(compileWindows)]} then { + # + # NOTE: For test "garuda-1.0". + # + checkForCompileOption $test_channel WINDOWS + } + + # + # NOTE: Has native code support been enabled (at compile-time)? + # + if {![info exists no(compileNative)]} then { + # + # NOTE: For tests "debug-3.2", "expr-3.2", and "host-1.1". + # + checkForCompileOption $test_channel NATIVE + } + + # + # NOTE: Has native package support been enabled (at compile-time)? + # + if {![info exists no(compileNativePackage)]} then { + # + # NOTE: For test "garuda-1.0". + # + checkForCompileOption $test_channel NATIVE_PACKAGE + } + + # + # NOTE: Has network support been enabled (at compile-time)? + # + if {![info exists no(compileNetwork)]} then { + # + # NOTE: For tests "commands-1.4", "socket-1.*", "socket-2.1", and + # "socket-3.1". + # + checkForCompileOption $test_channel NETWORK + } + + # + # NOTE: Has native Tcl support been enabled (at compile-time)? + # + if {![info exists no(compileTcl)]} then { + # + # NOTE: For tests "commands-1.1.*", "excel-2.2", "tclCancel-1.1", + # "tclEncoding-1.*", "tclErrorInfo-1.*", "tclLoad-1.*", + # "tclResetCancel-1.1", "tclResetCancel-2.1", + # "tclResetCancel-2.2", "tclResetCancel-3.1", + # "tclResetCancel-4.1", "tclSet-1.1", and "tclSubst-1.1". + # + checkForCompileOption $test_channel TCL + } + + # + # NOTE: Has xml support been enabled (at compile-time)? + # + if {![info exists no(compileXml)]} then { + # + # NOTE: For tests "commands-1.4", "object-7.3" and "xml-1.1.*". + # + checkForCompileOption $test_channel XML + } + + # + # NOTE: Has dedicated test support been enabled (at compile-time)? + # + if {![info exists no(compileTest)]} then { + # + # NOTE: For tests "basic-1.20", "basic-1.21", "function-1.1", + # "object-2.1", "object-3.1", "object-4.1", "object-7.1", + # "object-7.2", "object-7.4", "object-14.4", "object-14.5", + # "object-14.6", "remotingServer-1.*", and "debug-5.*". + # + checkForCompileOption $test_channel TEST + } + + # + # NOTE: Has threading support been enabled (at compile-time)? + # + if {![info exists no(compileThreading)]} then { + # + # NOTE: For tests "object-10.2" and "object-10.3". + # + checkForCompileOption $test_channel THREADING + } + + # + # NOTE: Has Tcl threading support been enabled (at compile-time)? + # + if {![info exists no(compileTclThreaded)]} then { + # + # NOTE: For tests "tclLoad-1.5" and "tclLoad-1.6". + # + checkForCompileOption $test_channel TCL_THREADED + } + + # + # NOTE: Has Tcl isolated interpreter thread support been enabled (at + # compile-time)? + # + if {![info exists no(compileTclThreads)]} then { + # + # NOTE: For tests "tclLoad-1.5" and "tclLoad-1.6". + # + checkForCompileOption $test_channel TCL_THREADS + } + } + + # + # NOTE: Has dynamic loading testing support been disabled? + # + if {![info exists no(dynamic)]} then { + # + # NOTE: For tests "commands-1.1.*", "library-3.*", and "tcl*-*.*". + # + checkForDynamicLoading $test_channel + } + + # + # NOTE: Has Tcl testing support been disabled? + # + if {![info exists no(tcl)]} then { + if {![info exists no(tclInstalls)]} then { + # + # NOTE: For tests "commands-1.1.*", "library-3.*", and "tcl*-*.*". + # + checkForTclInstalls $test_channel + } + + if {![info exists no(tclReady)]} then { + checkForTclReady $test_channel + } + + if {![info exists no(tclShell)]} then { + # + # NOTE: For test "garuda-1.0". + # + checkForTclShell $test_channel + } + } + + # + # NOTE: Has custom test method support been disabled? + # + if {![info exists no(test)]} then { + # + # NOTE: Has remoting testing support been disabled? + # + if {![info exists no(testRemoting)]} then { + # + # NOTE: For tests "remotingServer-1.*". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestRemoting* + } + + # + # NOTE: Has asynchronous testing support been disabled? + # + if {![info exists no(testAsynchronous)]} then { + # + # NOTE: For tests "basic-1.20" and "basic-1.21". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestEvaluateAsync* + } + + # + # NOTE: Has custom function testing support been disabled? + # + if {![info exists no(testFunction)]} then { + # + # NOTE: For test "function-1.1". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestAddFunction* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestRemoveFunction* + + # + # NOTE: For tests "function-5.*". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestAddNamedFunction* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestRemoveNamedFunction* + } + + # + # NOTE: Has write-box testing support been disabled? + # + if {![info exists no(testWriteBox)]} then { + # + # NOTE: For tests "debug-5.*". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestWriteBox* + } + + # + # NOTE: Has shell testing support been disabled? + # + if {![info exists no(testShell)]} then { + # + # NOTE: For test "debug-1.3". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestShellMainCore* + } + + # + # NOTE: Has IDisposable testing support been disabled? + # + if {![info exists no(testDisposable)]} then { + # + # NOTE: For test "object-2.8". + # + checkForObjectMember $test_channel Eagle._Tests.Default+Disposable \ + *ToString* Eagle._Tests.Default.Disposable.ToString + } + + # + # NOTE: Has core marshaller testing support been disabled? + # + if {![info exists no(testMarshaller)]} then { + # + # NOTE: For test "basic-1.29". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestExecuteStaticDelegates* + + # + # NOTE: For tests "basic-1.30" and "basic-1.31". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestExecuteDelegateCommands* + + # + # NOTE: For test "object-2.1". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestComplexMethod* + + # + # NOTE: For test "object-2.3". + # + checkForObjectMember $test_channel Eagle._Components.Private.ArrayOps \ + *ToHexadecimalString* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestMulti2Array* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestMulti3Array* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestNestedArray* + + # + # NOTE: For test "object-3.1". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *get_Item* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *set_Item* + + # + # NOTE: For test "object-3.6.*". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestStringIListReturnValue* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestStringIListIListIListReturnValue* + + # + # NOTE: For test "object-4.1". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestExpr* + + # + # NOTE: For test "object-7.1". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestByRefValueTypeMethod* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestNullableValueTypeMethod* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestByRefNullableValueTypeMethod* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestIntArrayReturnValue* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestStringArrayReturnValue* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestStringListReturnValue* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestStringListArrayReturnValue* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestByRefStringListArray* + + # + # NOTE: For tests "object-7.2" and "object-7.4". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestNullArray* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestOutArray* + + # + # NOTE: For test "object-7.5". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestEnum* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestByRefEnum* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestNullableEnum* + + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TestByRefNullableEnum* + + # + # NOTE: For tests "object-14.4" and "object-14.5". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *StaticObjectProperty* + + # + # NOTE: For test "object-14.6". + # + checkForObjectMember $test_channel Eagle._Tests.Default \ + *TypeProperty* + } + } + + # + # NOTE: Has Excel testing support been disabled? + # + if {![info exists no(excel)]} then { + # + # NOTE: For tests "excel-*.*". + # + checkForAssembly $test_channel Microsoft.Office.Interop.Excel + } + + # + # NOTE: Has speech testing support been disabled? + # + if {![info exists no(speech)]} then { + # + # NOTE: Set the audio volume, if necessary. + # + if {![info exists test_volume]} then { + set test_volume 0; # in percent, 0 is silent. + } + + # + # NOTE: For test "object-4.5". + # + checkForAssembly $test_channel System.Speech + } + + # + # NOTE: Has WinForms testing support been disabled? + # + if {![info exists no(winForms)]} then { + # + # NOTE: For tests "object-13.1.*", "object-13.2.*", and + # "winForms-*.*". + # + checkForWindowsForms $test_channel + } + + # + # NOTE: Are we running in an STA thread? + # + if {![info exists no(staThread)]} then { + # + # NOTE: For test "xaml-1.*". + # + checkForStaThread $test_channel + } + + # + # NOTE: Has WPF testing support been disabled? + # + if {![info exists no(wpf)]} then { + # + # NOTE: For test "xaml-1.*". + # + checkForWindowsPresentationFoundation $test_channel + } + + # + # NOTE: Has PowerShell testing support been disabled? + # + if {![info exists no(powerShell)]} then { + # + # NOTE: For tests "object-4.7", "object-4.8", and "object-4.9". + # + checkForPowerShell $test_channel + } + + # + # NOTE: Has WiX testing support been disabled? + # + if {![info exists no(wix)]} then { + # + # NOTE: For test "object-4.10". + # + checkForWix $test_channel + } + + # + # NOTE: Has managed debugger testing support been disabled? + # + if {![info exists no(managedDebugger)]} then { + checkForManagedDebugger $test_channel + } + + # + # NOTE: Has script debugger testing support been disabled? + # + if {![info exists no(scriptDebugger)]} then { + # + # NOTE: For tests "debug-1.1", "debug-2.1", "debug-3.1", and + # "debug-4.1". + # + checkForScriptDebugger $test_channel + } + + # + # NOTE: Has script debugger interpreter testing support been + # disabled? + # + if {![info exists no(scriptDebuggerInterpreter)]} then { + # + # NOTE: For test "debug-2.1". + # + checkForScriptDebuggerInterpreter $test_channel + } + + # + # NOTE: Are we running under the Mono debugger? If so, several + # tests will have to be disabled because they do not appear + # to work there. + # + if {![info exists no(monoDebugger)]} then { + tputs $test_channel "---- checking for Mono debugger... " + + if {[haveConstraint mono] && [haveConstraint managedDebugger]} then { + # + # NOTE: Add a special test constraint to simplify the Mono debugger + # test constraint checking for the tests that need it. + # + addConstraint monoDebugger + + tputs $test_channel yes\n + } else { + tputs $test_channel no\n + } + } + + # + # NOTE: Has Garuda testing support been disabled? + # + if {![info exists no(garudaDll)]} then { + # + # NOTE: For test "garuda-1.0". + # + checkForGarudaDll $test_channel + } + } else { + # + # HACK: Reset the test counts for tcltest. + # + set ::tcltest::numTests(Total) 0 + set ::tcltest::numTests(Skipped) 0 + set ::tcltest::numTests(Passed) 0 + set ::tcltest::numTests(Failed) 0 + + # + # HACK: Reset the list of failed files. + # + set ::tcltest::failFiles [list] + } + + # + # NOTE: For test "package-1.0". + # + if {![info exists no(pkgAll.tcl)]} then { + checkForFile $test_channel [file join $base_path Package Tests all.tcl] \ + pkgAll.tcl + } + + # + # NOTE: For test "subst-1.*". + # + if {![info exists no(bad_subst.txt)]} then { + checkForFile $test_channel [file join $test_path bad_subst.txt] + } + + # + # NOTE: For test "fileIO-1.*". + # + if {![info exists no(file.dat)]} then { + checkForFile $test_channel [file join $test_path file.dat] + } + + # + # NOTE: For test "garbage-1.1". + # + if {![info exists no(garbage.txt)]} then { + checkForFile $test_channel [file join $test_path garbage.txt] + } + + # + # NOTE: For test "xaml-1.*". + # + if {![info exists no(test.png)]} then { + checkForFile $test_channel [file join $test_path test.png] + } + + # + # NOTE: For test "socket-1.2". + # + if {![info exists no(client.tcl)]} then { + checkForFile $test_channel [file join $test_path client.tcl] + } + + # + # NOTE: For test "tclLoad-1.2". + # + if {![info exists no(tcl_unload.tcl)]} then { + checkForFile $test_channel [file join $test_path tcl_unload.tcl] + } + + # + # NOTE: For test "read.eagle". + # + if {![info exists no(read.eagle)]} then { + checkForFile $test_channel [file join $test_path read.eagle] + } + + # + # NOTE: For test "read2.eagle". + # + if {![info exists no(read2.eagle)]} then { + checkForFile $test_channel [file join $test_path read2.eagle] + } + + # + # NOTE: For test "read3.eagle". + # + if {![info exists no(read3.eagle)]} then { + checkForFile $test_channel [file join $test_path read3.eagle] + } + + # + # NOTE: For test "read4.eagle". + # + if {![info exists no(read4.eagle)]} then { + checkForFile $test_channel [file join $test_path read4.eagle] + } + + # + # NOTE: For test "source.eagle". + # + if {![info exists no(source.eagle)]} then { + checkForFile $test_channel [file join $test_path source.eagle] + } + + # + # NOTE: For test "unbalanced_brace.eagle". + # + if {![info exists no(unbalanced_brace.eagle)]} then { + checkForFile $test_channel [file join $test_path unbalanced_brace.eagle] + } + + # + # NOTE: For test "unbalanced_brace2.eagle". + # + if {![info exists no(unbalanced_brace2.eagle)]} then { + checkForFile $test_channel [file join $test_path unbalanced_brace2.eagle] + } + + # + # NOTE: For test "excel-2.*". + # + if {![info exists no(test.xls)]} then { + checkForFile $test_channel [file join $test_path test.xls] + } + + # + # NOTE: For test "load-1.1.*". + # + if {![info exists no(Plugin.dll)]} then { + checkForFile $test_channel [file join $lib_path Plugin1.0 Plugin.dll] + } + + # + # NOTE: For test "object-6.1". + # + if {![info exists no(Sample.exe)]} then { + checkForFile $test_channel [file join $bin_path Sample.exe] + } + + # + # NOTE: For test "object-4.8". + # + if {![info exists no(EagleCmdlets.dll)]} then { + checkForFile $test_channel [file join $bin_path EagleCmdlets.dll] + } + + # + # NOTE: For test "object-4.10". + # + if {![info exists no(EagleExtensions.dll)]} then { + checkForFile $test_channel [file join $bin_path EagleExtensions.dll] + } + + # + # NOTE: For test "object-4.10". + # + if {![info exists no(test.wxs)]} then { + checkForFile $test_channel [file join $base_path Installer Tests test.wxs] + } + + # + # NOTE: For test "sql-1.2". + # + if {![info exists no(sqlite3.dll)]} then { + checkForFile $test_channel [file join $bin_path sqlite3.dll] + } + + if {![info exists no(System.Data.SQLite.dll)]} then { + checkForFile $test_channel [file join $bin_path System.Data.SQLite.dll] + } + + if {![info exists no(test.sqlite3)]} then { + checkForFile $test_channel [file join $test_path test.sqlite3] + } + + # + # NOTE: Check the core test constraints unless they have been + # explicitly disabled. + # + if {![info exists no(platform)]} then { + checkForPlatform $test_channel + } + + if {![info exists no(version)]} then { + checkForVersion $test_channel + } + + if {![info exists no(eagle)]} then { + checkForEagle $test_channel + } + + if {![info exists no(garuda)]} then { + checkForGaruda $test_channel + } + + if {![info exists no(shell)]} then { + checkForShell $test_channel + } + + if {![info exists no(debug)]} then { + checkForDebug $test_channel + } + + # + # NOTE: Has Tk testing support been disabled? + # + if {![info exists no(tk)]} then { + checkForTk $test_channel + } + + # + # NOTE: Has native code detection support been disabled? + # + if {![info exists no(native)]} then { + checkForNativeCode $test_channel + } + + # + # NOTE: Check for various extra commands that may be present. + # + if {![info exists no(callbackCommand)]} then { + checkForCommand $test_channel callback + } + + if {![info exists no(libraryCommand)]} then { + checkForCommand $test_channel library + } + + if {![info exists no(socketCommand)]} then { + checkForCommand $test_channel socket + } + + if {![info exists no(sqlCommand)]} then { + checkForCommand $test_channel sql + } + + if {![info exists no(tclCommand)]} then { + checkForCommand $test_channel tcl + } + + if {![info exists no(xmlCommand)]} then { + checkForCommand $test_channel xml + } + + # + # NOTE: Check for various features that were added through + # the TIP process. + # + if {![info exists no(tip127)]} then { + checkForTip127 $test_channel + } + + if {![info exists no(tip194)]} then { + checkForTip194 $test_channel + } + + if {![info exists no(tip241)]} then { + checkForTip241 $test_channel + } + + if {![info exists no(tip285)]} then { + checkForTip285 $test_channel + } + + # + # NOTE: Has performance testing been disabled? + # + if {![info exists no(performance)]} then { + checkForPerformance $test_channel + } + + # + # NOTE: Have precision timing tests been disabled? + # + if {![info exists no(timing)]} then { + checkForTiming $test_channel 50; # 1/20th second. + } + + # + # NOTE: Has interactive testing been disabled? + # + if {![info exists no(interactive)]} then { + checkForInteractive $test_channel + } + + if {![info exists no(userInteraction)]} then { + checkForUserInteraction $test_channel + } + + # + # NOTE: Check for network connectivity to our test host (i.e. + # the Eagle distribution site). + # + if {![info exists no(network)]} then { + checkForNetwork $test_channel $test_host $test_timeout + } + + # + # NOTE: For Eagle, dump the platform information, including + # the compile options. + # + if {[isEagle]} then { + # + # NOTE: Figure out the approximate relative performance + # of this machine. + # + if {[haveConstraint performance]} then { + tputs $test_channel [appendArgs \ + "---- checking for baseline BogoCops (commands-per-second)... "] + + if {![info exists test_base_cops]} then { + # + # NOTE: The expected performance numbers for all the + # performance tests will be calibrated based on + # this number (which is based on the measured + # performance of the actual machine that was + # used to determine those expected performance + # numbers). + # + set test_base_cops 36000.0 + } + + tputs $test_channel [appendArgs $test_base_cops \n] + tputs $test_channel [appendArgs \ + "---- checking for current BogoCops (commands-per-second)... "] + + if {![info exists test_cops]} then { + set test_cops [calculateBogoCops] + } + + tputs $test_channel [appendArgs $test_cops \n] + } + + ########################################################################### + + set timeStamp [getPlatformInfo timeStamp ""] + + if {[string length $timeStamp] > 0} then { + ######################################################################### + # MONO: Bug, see: https://bugzilla.novell.com/show_bug.cgi?id=479061 + ######################################################################### + + if {[isMono]} then { + # + # HACK: We need something to go into the log file. + # + set timeStamp [lindex $timeStamp 0] + } else { + set timeStamp [clock format [clock scan $timeStamp] -iso] + } + } else { + set timeStamp + } + + tputs $test_channel [appendArgs "---- build: " \ + [getPlatformInfo engine ] " " \ + [getPlatformInfo patchLevel ] " " \ + [getPlatformInfo tag ] " " \ + [getPlatformInfo text ] " " \ + [getPlatformInfo configuration ] " " \ + [getPlatformInfo suffix ] " " \ + $timeStamp \n] + + tputs $test_channel [appendArgs "---- os: " \ + [getPlatformInfo os ] \n] + + tputs $test_channel [appendArgs "---- globalAssemblyCache: " \ + [getPlatformInfo globalAssemblyCache ] \n] + + tputs $test_channel [appendArgs "---- moduleVersionId: " \ + [getPlatformInfo moduleVersionId ] \n] + + tputs $test_channel [appendArgs "---- compileOptions: " \ + [formatList [getPlatformInfo compileOptions ]] \n] + + tputs $test_channel [appendArgs "---- strongName: " \ + [getPlatformInfo strongName ] \n] + + tputs $test_channel [appendArgs "---- certificate: " \ + [getPlatformInfo certificate ] \n] + + unset timeStamp + } + + # + # NOTE: Show the current test file name, if any. + # + tputs $test_channel [appendArgs "---- test file: " \ + [expr {[info exists test_file] && [string length $test_file] > 0 ? \ + $test_file : ""}] \n] + + # + # NOTE: Show the active test constraints. + # + tputs $test_channel [appendArgs "---- constraints: " \ + [formatList [lsort [getConstraints]]] \n] + + # + # NOTE: Show when the tests actually began (now). + # + tputs $test_channel [appendArgs "---- tests began at " \ + [clock format [clock seconds]] \n] +} Index: Membership/Properties/AssemblyInfo.cs ================================================================== --- Membership/Properties/AssemblyInfo.cs +++ Membership/Properties/AssemblyInfo.cs @@ -4,17 +4,19 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("SQLiteProvider")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Fresnel Computing")] [assembly: AssemblyProduct("SQLiteProvider")] [assembly: AssemblyCopyright("Copyright © Fresnel Computing 2006")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] Index: Membership/SQLiteProvider.2008.csproj ================================================================== --- Membership/SQLiteProvider.2008.csproj +++ Membership/SQLiteProvider.2008.csproj @@ -24,11 +24,10 @@ 2008 $(BinaryOutputPath) - $(BinaryOutputPath)System.Data.SQLite.xml true full false Index: Membership/SQLiteProvider.2010.csproj ================================================================== --- Membership/SQLiteProvider.2010.csproj +++ Membership/SQLiteProvider.2010.csproj @@ -23,11 +23,10 @@ 2010 $(BinaryOutputPath) - $(BinaryOutputPath)System.Data.SQLite.xml true full false Index: SQLite.Designer/AssemblyInfo.cs ================================================================== --- SQLite.Designer/AssemblyInfo.cs +++ SQLite.Designer/AssemblyInfo.cs @@ -5,18 +5,21 @@ using System.Resources; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SQLite.Designer")] -[assembly: AssemblyDescription("ADO.NET Data Designer for SQLite")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("http://system.data.sqlite.org")] -[assembly: AssemblyProduct("SQLite Designer")] +[assembly: AssemblyTitle("System.Data.SQLite Designer")] +[assembly: AssemblyDescription("ADO.NET Data Provider for SQLite")] +[assembly: AssemblyCompany("http://system.data.sqlite.org/")] +[assembly: AssemblyProduct("System.Data.SQLite")] [assembly: AssemblyCopyright("Public Domain")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif // Setting ComVisible to false makes the types in this assembly not visible // to COM componenets. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -31,7 +34,7 @@ // Build Number // Revision // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.38.1")] -[assembly: AssemblyFileVersion("1.0.38.1")] +[assembly: AssemblyVersion("1.0.74.0")] +[assembly: AssemblyFileVersion("1.0.74.0")] Index: SQLite.Designer/Design/ForeignKey.cs ================================================================== --- SQLite.Designer/Design/ForeignKey.cs +++ SQLite.Designer/Design/ForeignKey.cs @@ -284,19 +284,25 @@ internal class ForeignKey : IHaveConnection, ICloneable { internal Table _table; internal ForeignKeyFromItem _from; internal ForeignKeyToItem _to; - internal string _name; + internal string _name; + internal string _onUpdate; + internal string _onDelete; + internal string _match; private bool _dirty; private ForeignKey(ForeignKey source) { _table = source._table; _from = new ForeignKeyFromItem(this, source._from.Column); _to = new ForeignKeyToItem(this, source._to.Catalog, source._to.Table, source._to.Column); - _name = source._name; + _name = source._name; + _onUpdate = source._onUpdate; + _onDelete = source._onDelete; + _match = source._match; _dirty = source._dirty; } internal void MakeDirty() { @@ -318,12 +324,15 @@ { _table = table; if (row != null) { _from = new ForeignKeyFromItem(this, row["FKEY_FROM_COLUMN"].ToString()); - _to = new ForeignKeyToItem(this, row["FKEY_TO_CATALOG"].ToString(), row["FKEY_TO_TABLE"].ToString(), row["FKEY_TO_COLUMN"].ToString()); - _name = row["CONSTRAINT_NAME"].ToString(); + _to = new ForeignKeyToItem(this, row["FKEY_TO_CATALOG"].ToString(), row["FKEY_TO_TABLE"].ToString(), row["FKEY_TO_COLUMN"].ToString()); + _name = row["CONSTRAINT_NAME"].ToString(); + _onUpdate = row["FKEY_ON_UPDATE"].ToString(); + _onDelete = row["FKEY_ON_DELETE"].ToString(); + _match = row["FKEY_MATCH"].ToString(); } else { _from = new ForeignKeyFromItem(this, ""); _to = new ForeignKeyToItem(this, _table.Catalog, "", ""); @@ -387,10 +396,34 @@ [Category("To")] [Description("The table and column to which the specified from column is related.")] public ForeignKeyToItem To { get { return _to; } + } + + [DisplayName("On Update")] + [Category("Action")] + [Description("The action to take when modifying the parent key values of an existing row.")] + public string OnUpdate + { + get { return _onUpdate; } + } + + [DisplayName("On Delete")] + [Category("Action")] + [Description("The action to take when deleting a row from the parent table.")] + public string OnDelete + { + get { return _onDelete; } + } + + [DisplayName("Match")] + [Category("Match")] + [Description("Used with composite foreign key definitions to modify the way NULL values that occur in child keys are handled. Not currently supported.")] + public string Match + { + get { return _match; } } #region ICloneable Members public object Clone() Index: SQLite.Designer/Design/Table.cs ================================================================== --- SQLite.Designer/Design/Table.cs +++ SQLite.Designer/Design/Table.cs @@ -515,11 +515,20 @@ foreach (ForeignKey key in keys) { builder.AppendFormat("{0}[{1}]", separator, key.To.Column); separator = ", "; } - builder.Append(")"); + builder.Append(")"); + + if (!String.IsNullOrEmpty(keys[0].Match)) + builder.AppendFormat(" MATCH {0}", keys[0].Match); + + if (!String.IsNullOrEmpty(keys[0].OnUpdate)) + builder.AppendFormat(" ON UPDATE {0}", keys[0].OnUpdate); + + if (!String.IsNullOrEmpty(keys[0].OnDelete)) + builder.AppendFormat(" ON DELETE {0}", keys[0].OnDelete); } [Browsable(false)] public override ViewTableBase DesignTable { Index: SQLite.Interop/SQLite.Interop.2008.vcproj ================================================================== --- SQLite.Interop/SQLite.Interop.2008.vcproj +++ SQLite.Interop/SQLite.Interop.2008.vcproj @@ -51,11 +51,11 @@ Name="VCMIDLTool" /> true Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) false Default MultiThreadedDebugDLL Level4 ProgramDatabase @@ -163,11 +163,11 @@ Disabled - WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) + WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) false Default MultiThreadedDebugDLL Level4 ProgramDatabase @@ -204,11 +204,11 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) false Default MultiThreadedDebugDLL Level4 ProgramDatabase @@ -238,11 +238,11 @@ Disabled - WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) + WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) false Default MultiThreadedDebugDLL Level4 ProgramDatabase @@ -274,11 +274,11 @@ Full true Speed - WIN32;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_RELEASE_DEFINES);%(PreprocessorDefinitions) false Default true MultiThreadedDLL Level4 @@ -317,11 +317,11 @@ Full true Speed - WIN32;x64;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);%(PreprocessorDefinitions) + WIN32;x64;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_RELEASE_DEFINES);%(PreprocessorDefinitions) false Default true MultiThreadedDLL Level4 @@ -360,11 +360,11 @@ Full true Speed - WIN32;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_RELEASE_DEFINES);%(PreprocessorDefinitions) false Default true MultiThreadedDLL Level4 @@ -397,11 +397,11 @@ Full true Speed - WIN32;x64;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);%(PreprocessorDefinitions) + WIN32;x64;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_RELEASE_DEFINES);%(PreprocessorDefinitions) false Default true MultiThreadedDLL Level4 @@ -458,15 +458,15 @@ - $(IntDir)System.Data.SQLite.%(Filename).resources + System.Data.SQLite.%(Filename).resources Designer true true true true Index: SQLite.Interop/SQLite.Interop.CE.2008.vcproj ================================================================== --- SQLite.Interop/SQLite.Interop.CE.2008.vcproj +++ SQLite.Interop/SQLite.Interop.CE.2008.vcproj @@ -47,11 +47,11 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ADDED SQLite.Interop/SQLite.Interop.Static.2010.vcxproj Index: SQLite.Interop/SQLite.Interop.Static.2010.vcxproj ================================================================== --- /dev/null +++ SQLite.Interop/SQLite.Interop.Static.2010.vcxproj @@ -0,0 +1,472 @@ + + + + + + DebugNativeOnly + x64 + + + Debug + Win32 + + + DebugNativeOnly + Win32 + + + Debug + x64 + + + ReleaseNativeOnly + x64 + + + Release + Win32 + + + ReleaseNativeOnly + Win32 + + + Release + x64 + + + + SQLite.Interop.Static.2010 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8} + SQLite.Interop + Win32Proj + + + + + + false + + + $(INTEROP_MIXED_NAME) + DynamicLibrary + Unicode + + + $(INTEROP_MIXED_NAME) + DynamicLibrary + Unicode + + + $(INTEROP_NATIVE_NAME) + DynamicLibrary + Unicode + + + $(INTEROP_NATIVE_NAME) + DynamicLibrary + Unicode + + + $(INTEROP_MIXED_NAME) + DynamicLibrary + Unicode + true + + + $(INTEROP_MIXED_NAME) + DynamicLibrary + Unicode + true + + + $(INTEROP_NATIVE_NAME) + DynamicLibrary + Unicode + true + + + $(INTEROP_NATIVE_NAME) + DynamicLibrary + Unicode + true + + + + + <_ProjectFileVersion>10.0.30319.1 + $(ProjectDir)..\bin\$(ConfigurationYear)\$(Platform)\$(Configuration)Static\ + ..\obj\$(ConfigurationYear)\$(Platform)\$(Configuration)Static\ + false + $(INTEROP_KEY_FILE) + $(INTEROP_KEY_FILE) + $(INTEROP_KEY_FILE) + $(INTEROP_KEY_FILE) + true + true + true + true + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) + false + Default + MultiThreadedDebug + Level4 + ProgramDatabase + Default + $(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings) + + + _DEBUG;_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions) + + + $(INTEROP_ASSEMBLY_RESOURCES) %(AdditionalOptions) + $(ProjectDir)..\bin\$(ConfigurationYear)\$(Configuration)Module\bin\System.Data.SQLite.netmodule;%(AdditionalDependencies) + $(INTEROP_MANIFEST_VERSION) + true + true + true + true + Windows + true + true + UseLinkTimeCodeGeneration + MachineX86 + true + $(INTEROP_KEY_FILE) + true + + + true + $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 + true + + + "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" + + + + + Disabled + WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) + false + Default + MultiThreadedDebug + Level4 + ProgramDatabase + Default + $(SQLITE_DISABLE_WARNINGS);$(SQLITE_DISABLE_X64_WARNINGS);%(DisableSpecificWarnings) + + + _DEBUG;_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions) + + + $(INTEROP_ASSEMBLY_RESOURCES) %(AdditionalOptions) + $(ProjectDir)..\bin\$(ConfigurationYear)\$(Configuration)Module\bin\System.Data.SQLite.netmodule;%(AdditionalDependencies) + $(INTEROP_MANIFEST_VERSION) + true + true + true + true + Windows + true + true + UseLinkTimeCodeGeneration + MachineX64 + true + $(INTEROP_KEY_FILE) + true + + + true + $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 + true + + + "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) + false + Default + MultiThreadedDebug + Level4 + ProgramDatabase + Default + $(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings) + + + _DEBUG;_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions) + + + $(INTEROP_MANIFEST_VERSION) + true + true + true + Windows + true + true + MachineX86 + + + true + $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 + true + + + XCOPY "$(TargetPath)" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y + + + + + Disabled + WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions) + false + Default + MultiThreadedDebug + Level4 + ProgramDatabase + Default + $(SQLITE_DISABLE_WARNINGS);$(SQLITE_DISABLE_X64_WARNINGS);%(DisableSpecificWarnings) + + + _DEBUG;_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions) + + + $(INTEROP_MANIFEST_VERSION) + true + true + true + Windows + true + true + MachineX64 + + + true + $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 + true + + + XCOPY "$(TargetPath)" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y + + + + + Full + true + Speed + WIN32;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_RELEASE_DEFINES);%(PreprocessorDefinitions) + false + Default + true + MultiThreaded + Level4 + ProgramDatabase + Default + $(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings) + + + NDEBUG;_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions) + + + $(INTEROP_ASSEMBLY_RESOURCES) %(AdditionalOptions) + $(ProjectDir)..\bin\$(ConfigurationYear)\$(Configuration)Module\bin\System.Data.SQLite.netmodule;%(AdditionalDependencies) + $(INTEROP_MANIFEST_VERSION) + true + true + true + Windows + true + true + UseLinkTimeCodeGeneration + MachineX86 + true + $(INTEROP_KEY_FILE) + true + + + true + $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 + true + + + "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" + + + + + Full + true + Speed + WIN32;x64;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_RELEASE_DEFINES);%(PreprocessorDefinitions) + false + Default + true + MultiThreaded + Level4 + ProgramDatabase + Default + $(SQLITE_DISABLE_WARNINGS);$(SQLITE_DISABLE_X64_WARNINGS);%(DisableSpecificWarnings) + + + NDEBUG;_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions) + + + $(INTEROP_ASSEMBLY_RESOURCES) %(AdditionalOptions) + $(ProjectDir)..\bin\$(ConfigurationYear)\$(Configuration)Module\bin\System.Data.SQLite.netmodule;%(AdditionalDependencies) + $(INTEROP_MANIFEST_VERSION) + true + true + true + Windows + true + true + UseLinkTimeCodeGeneration + MachineX64 + true + $(INTEROP_KEY_FILE) + true + + + true + $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 + true + + + "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" + + + + + Full + true + Speed + WIN32;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_RELEASE_DEFINES);%(PreprocessorDefinitions) + false + Default + true + MultiThreaded + Level4 + ProgramDatabase + Default + $(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings) + + + NDEBUG;_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions) + + + $(INTEROP_MANIFEST_VERSION) + true + true + true + Windows + true + true + MachineX86 + + + true + $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 + true + + + XCOPY "$(TargetPath)" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y + + + + + Full + true + Speed + WIN32;x64;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_RELEASE_DEFINES);%(PreprocessorDefinitions) + false + Default + true + MultiThreaded + Level4 + ProgramDatabase + Default + $(SQLITE_DISABLE_WARNINGS);$(SQLITE_DISABLE_X64_WARNINGS);%(DisableSpecificWarnings) + + + NDEBUG;_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions) + + + $(INTEROP_MANIFEST_VERSION) + true + true + true + Windows + true + true + MachineX64 + + + true + $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 + true + + + XCOPY "$(TargetPath)" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y + + + + + true + + + true + + + true + + + + true + + + + + + + + + + + + + + + + + System.Data.SQLite.%(Filename).resources + Designer + true + true + true + true + + + + ADDED SQLite.Interop/SQLite.Interop.Static.2010.vcxproj.filters Index: SQLite.Interop/SQLite.Interop.Static.2010.vcxproj.filters ================================================================== --- /dev/null +++ SQLite.Interop/SQLite.Interop.Static.2010.vcxproj.filters @@ -0,0 +1,72 @@ + + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {d69d5c95-1d03-4325-ad06-fce223ab4e42} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Property Files + + + Property Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Index: SQLite.Interop/props/SQLite.Interop.props ================================================================== --- SQLite.Interop/props/SQLite.Interop.props +++ SQLite.Interop/props/SQLite.Interop.props @@ -8,13 +8,13 @@ * --> 2010 - 074 - 1.0.74.0 - 1,0,74,0 + 075 + 1.0.75.0 + 1,0,75,0 /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 $(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk SQLite.Interop System.Data.SQLite Index: SQLite.Interop/props/SQLite.Interop.vsprops ================================================================== --- SQLite.Interop/props/SQLite.Interop.vsprops +++ SQLite.Interop/props/SQLite.Interop.vsprops @@ -17,21 +17,21 @@ Value="2008" PerformEnvironmentSet="true" /> - 3.7.7.1 - 3,7,7,1 - NDEBUG;SQLITE_THREADSAFE=1;SQLITE_HAS_CODEC=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_LOAD_EXTENSION=1;SQLITE_ENABLE_RTREE=1;SQLITE_SOUNDEX=1 - SQLITE_OMIT_WAL - + 3.7.8 + 3,7,8 + SQLITE_THREADSAFE=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_ENABLE_STAT2=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_LOAD_EXTENSION=1;SQLITE_ENABLE_RTREE=1;SQLITE_SOUNDEX=1 + SQLITE_HAS_CODEC=1 + SQLITE_OMIT_WAL=1 + SQLITE_DEBUG=1;SQLITE_MEMDEBUG=1 + SQLITE_WIN32_MALLOC=1 4018;4055;4057;4090;4100;4127;4132;4146;4152;4210;4244;4245;4389;4701;4706;4996 4267;4306 <_ProjectFileVersion>10.0.30319.1 @@ -31,18 +33,26 @@ $(SQLITE_COMMON_DEFINES) true + + $(SQLITE_EXTRA_DEFINES) + true + $(SQLITE_WINCE_DEFINES) true $(SQLITE_DEBUG_DEFINES) true + + $(SQLITE_RELEASE_DEFINES) + true + $(SQLITE_DISABLE_WARNINGS) true Index: SQLite.Interop/props/sqlite3.vsprops ================================================================== --- SQLite.Interop/props/sqlite3.vsprops +++ SQLite.Interop/props/sqlite3.vsprops @@ -12,31 +12,41 @@ Version="8.00" Name="sqlite3" > + + 1 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_WIN32_MALLOC)+defined(SQLITE_MEMDEBUG)>1 # error "At most one of the following compile-time configuration options\ - is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG" + is allows: SQLITE_SYSTEM_MALLOC, SQLITE_WIN32_MALLOC, SQLITE_MEMDEBUG" #endif -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)==0 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_WIN32_MALLOC)+defined(SQLITE_MEMDEBUG)==0 # define SQLITE_SYSTEM_MALLOC 1 #endif /* ** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the @@ -648,13 +654,13 @@ ** ** See also: [sqlite3_libversion()], ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.7.1" -#define SQLITE_VERSION_NUMBER 3007007 -#define SQLITE_SOURCE_ID "2011-06-28 17:39:05 af0d91adf497f5f36ec3813f04235a6e195a605f" +#define SQLITE_VERSION "3.7.8" +#define SQLITE_VERSION_NUMBER 3007008 +#define SQLITE_SOURCE_ID "2011-09-19 14:49:19 3e0da808d2f5b4d12046e05980ca04578f581177" /* ** CAPI3REF: Run-Time Library Version Numbers ** KEYWORDS: sqlite3_version, sqlite3_sourceid ** @@ -1282,20 +1288,52 @@ ** when [PRAGMA synchronous | PRAGMA synchronous=OFF] is set, but most ** VFSes do not need this signal and should silently ignore this opcode. ** Applications should not call [sqlite3_file_control()] with this ** opcode as doing so may disrupt the operation of the specialized VFSes ** that do require it. +** +** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic +** retry counts and intervals for certain disk I/O operations for the +** windows [VFS] in order to work to provide robustness against +** anti-virus programs. By default, the windows VFS will retry file read, +** file write, and file delete opertions up to 10 times, with a delay +** of 25 milliseconds before the first retry and with the delay increasing +** by an additional 25 milliseconds with each subsequent retry. This +** opcode allows those to values (10 retries and 25 milliseconds of delay) +** to be adjusted. The values are changed for all database connections +** within the same process. The argument is a pointer to an array of two +** integers where the first integer i the new retry count and the second +** integer is the delay. If either integer is negative, then the setting +** is not changed but instead the prior value of that setting is written +** into the array entry, allowing the current retry settings to be +** interrogated. The zDbName parameter is ignored. +** +** ^The [SQLITE_FCNTL_PERSIST_WAL] opcode is used to set or query the +** persistent [WAL | Write AHead Log] setting. By default, the auxiliary +** write ahead log and shared memory files used for transaction control +** are automatically deleted when the latest connection to the database +** closes. Setting persistent WAL mode causes those files to persist after +** close. Persisting the files is useful when other processes that do not +** have write permission on the directory containing the database file want +** to read the database file, as the WAL and shared memory files must exist +** in order for the database to be readable. The fourth parameter to +** [sqlite3_file_control()] for this opcode should be a pointer to an integer. +** That integer is 0 to disable persistent WAL mode or 1 to enable persistent +** WAL mode. If the integer is -1, then it is overwritten with the current +** WAL persistence setting. +** */ #define SQLITE_FCNTL_LOCKSTATE 1 #define SQLITE_GET_LOCKPROXYFILE 2 #define SQLITE_SET_LOCKPROXYFILE 3 #define SQLITE_LAST_ERRNO 4 #define SQLITE_FCNTL_SIZE_HINT 5 #define SQLITE_FCNTL_CHUNK_SIZE 6 #define SQLITE_FCNTL_FILE_POINTER 7 #define SQLITE_FCNTL_SYNC_OMITTED 8 - +#define SQLITE_FCNTL_WIN32_AV_RETRY 9 +#define SQLITE_FCNTL_PERSIST_WAL 10 /* ** CAPI3REF: Mutex Handle ** ** The mutex module within SQLite defines [sqlite3_mutex] to be an @@ -1719,20 +1757,14 @@ ** also used during testing of SQLite in order to specify an alternative ** memory allocator that simulates memory out-of-memory conditions in ** order to verify that SQLite recovers gracefully from such ** conditions. ** -** The xMalloc and xFree methods must work like the -** malloc() and free() functions from the standard C library. -** The xRealloc method must work like realloc() from the standard C library -** with the exception that if the second argument to xRealloc is zero, -** xRealloc must be a no-op - it must not perform any allocation or -** deallocation. ^SQLite guarantees that the second argument to +** The xMalloc, xRealloc, and xFree methods must work like the +** malloc(), realloc() and free() functions from the standard C library. +** ^SQLite guarantees that the second argument to ** xRealloc is always a value returned by a prior call to xRoundup. -** And so in cases where xRoundup always returns a positive number, -** xRealloc can perform exactly as the standard library realloc() and -** still be in compliance with this specification. ** ** xSize should return the allocated size of a memory allocation ** previously obtained from xMalloc or xRealloc. The allocated size ** is always at least as big as the requested size but may be larger. ** @@ -8144,10 +8176,11 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ +/* #include */ /* ** A single VDBE is an opaque structure named "Vdbe". Only routines ** in the source file sqliteVdbe.c are allowed to see the insides ** of this structure. @@ -8187,10 +8220,11 @@ Mem *pMem; /* Used when p4type is P4_MEM */ VTable *pVtab; /* Used when p4type is P4_VTAB */ KeyInfo *pKeyInfo; /* Used when p4type is P4_KEYINFO */ int *ai; /* Used when p4type is P4_INTARRAY */ SubProgram *pProgram; /* Used when p4type is P4_SUBPROGRAM */ + int (*xAdvance)(BtCursor *, int *); } p4; #ifdef SQLITE_DEBUG char *zComment; /* Comment to improve readability */ #endif #ifdef VDBE_PROFILE @@ -8242,10 +8276,11 @@ #define P4_REAL (-12) /* P4 is a 64-bit floating point value */ #define P4_INT64 (-13) /* P4 is a 64-bit signed integer */ #define P4_INT32 (-14) /* P4 is a 32-bit signed integer */ #define P4_INTARRAY (-15) /* P4 is a vector of 32-bit integers */ #define P4_SUBPROGRAM (-18) /* P4 is a pointer to a SubProgram structure */ +#define P4_ADVANCE (-19) /* P4 is a pointer to BtreeNext() or BtreePrev() */ /* When adding a P4 argument using P4_KEYINFO, a copy of the KeyInfo structure ** is made. That copy is freed when the Vdbe is finalized. But if the ** argument is P4_KEYINFO_HANDOFF, the passed in pointer is used. It still ** gets freed when the Vdbe is finalized so it still should be obtained @@ -8339,106 +8374,109 @@ #define OP_Jump 25 #define OP_And 69 /* same as TK_AND */ #define OP_Or 68 /* same as TK_OR */ #define OP_Not 19 /* same as TK_NOT */ #define OP_BitNot 93 /* same as TK_BITNOT */ -#define OP_If 26 -#define OP_IfNot 27 +#define OP_Once 26 +#define OP_If 27 +#define OP_IfNot 28 #define OP_IsNull 73 /* same as TK_ISNULL */ #define OP_NotNull 74 /* same as TK_NOTNULL */ -#define OP_Column 28 -#define OP_Affinity 29 -#define OP_MakeRecord 30 -#define OP_Count 31 -#define OP_Savepoint 32 -#define OP_AutoCommit 33 -#define OP_Transaction 34 -#define OP_ReadCookie 35 -#define OP_SetCookie 36 -#define OP_VerifyCookie 37 -#define OP_OpenRead 38 -#define OP_OpenWrite 39 -#define OP_OpenAutoindex 40 -#define OP_OpenEphemeral 41 -#define OP_OpenPseudo 42 -#define OP_Close 43 -#define OP_SeekLt 44 -#define OP_SeekLe 45 -#define OP_SeekGe 46 -#define OP_SeekGt 47 -#define OP_Seek 48 -#define OP_NotFound 49 -#define OP_Found 50 -#define OP_IsUnique 51 -#define OP_NotExists 52 -#define OP_Sequence 53 -#define OP_NewRowid 54 -#define OP_Insert 55 -#define OP_InsertInt 56 -#define OP_Delete 57 -#define OP_ResetCount 58 -#define OP_RowKey 59 -#define OP_RowData 60 -#define OP_Rowid 61 -#define OP_NullRow 62 -#define OP_Last 63 -#define OP_Sort 64 -#define OP_Rewind 65 -#define OP_Prev 66 -#define OP_Next 67 -#define OP_IdxInsert 70 -#define OP_IdxDelete 71 -#define OP_IdxRowid 72 -#define OP_IdxLT 81 -#define OP_IdxGE 92 -#define OP_Destroy 95 -#define OP_Clear 96 -#define OP_CreateIndex 97 -#define OP_CreateTable 98 -#define OP_ParseSchema 99 -#define OP_LoadAnalysis 100 -#define OP_DropTable 101 -#define OP_DropIndex 102 -#define OP_DropTrigger 103 -#define OP_IntegrityCk 104 -#define OP_RowSetAdd 105 -#define OP_RowSetRead 106 -#define OP_RowSetTest 107 -#define OP_Program 108 -#define OP_Param 109 -#define OP_FkCounter 110 -#define OP_FkIfZero 111 -#define OP_MemMax 112 -#define OP_IfPos 113 -#define OP_IfNeg 114 -#define OP_IfZero 115 -#define OP_AggStep 116 -#define OP_AggFinal 117 -#define OP_Checkpoint 118 -#define OP_JournalMode 119 -#define OP_Vacuum 120 -#define OP_IncrVacuum 121 -#define OP_Expire 122 -#define OP_TableLock 123 -#define OP_VBegin 124 -#define OP_VCreate 125 -#define OP_VDestroy 126 -#define OP_VOpen 127 -#define OP_VFilter 128 -#define OP_VColumn 129 -#define OP_VNext 131 -#define OP_VRename 132 -#define OP_VUpdate 133 -#define OP_Pagecount 134 -#define OP_MaxPgcnt 135 -#define OP_Trace 136 -#define OP_Noop 137 -#define OP_Explain 138 - -/* The following opcode values are never used */ -#define OP_NotUsed_139 139 -#define OP_NotUsed_140 140 +#define OP_Column 29 +#define OP_Affinity 30 +#define OP_MakeRecord 31 +#define OP_Count 32 +#define OP_Savepoint 33 +#define OP_AutoCommit 34 +#define OP_Transaction 35 +#define OP_ReadCookie 36 +#define OP_SetCookie 37 +#define OP_VerifyCookie 38 +#define OP_OpenRead 39 +#define OP_OpenWrite 40 +#define OP_OpenAutoindex 41 +#define OP_OpenEphemeral 42 +#define OP_SorterOpen 43 +#define OP_OpenPseudo 44 +#define OP_Close 45 +#define OP_SeekLt 46 +#define OP_SeekLe 47 +#define OP_SeekGe 48 +#define OP_SeekGt 49 +#define OP_Seek 50 +#define OP_NotFound 51 +#define OP_Found 52 +#define OP_IsUnique 53 +#define OP_NotExists 54 +#define OP_Sequence 55 +#define OP_NewRowid 56 +#define OP_Insert 57 +#define OP_InsertInt 58 +#define OP_Delete 59 +#define OP_ResetCount 60 +#define OP_SorterCompare 61 +#define OP_SorterData 62 +#define OP_RowKey 63 +#define OP_RowData 64 +#define OP_Rowid 65 +#define OP_NullRow 66 +#define OP_Last 67 +#define OP_SorterSort 70 +#define OP_Sort 71 +#define OP_Rewind 72 +#define OP_SorterNext 81 +#define OP_Prev 92 +#define OP_Next 95 +#define OP_SorterInsert 96 +#define OP_IdxInsert 97 +#define OP_IdxDelete 98 +#define OP_IdxRowid 99 +#define OP_IdxLT 100 +#define OP_IdxGE 101 +#define OP_Destroy 102 +#define OP_Clear 103 +#define OP_CreateIndex 104 +#define OP_CreateTable 105 +#define OP_ParseSchema 106 +#define OP_LoadAnalysis 107 +#define OP_DropTable 108 +#define OP_DropIndex 109 +#define OP_DropTrigger 110 +#define OP_IntegrityCk 111 +#define OP_RowSetAdd 112 +#define OP_RowSetRead 113 +#define OP_RowSetTest 114 +#define OP_Program 115 +#define OP_Param 116 +#define OP_FkCounter 117 +#define OP_FkIfZero 118 +#define OP_MemMax 119 +#define OP_IfPos 120 +#define OP_IfNeg 121 +#define OP_IfZero 122 +#define OP_AggStep 123 +#define OP_AggFinal 124 +#define OP_Checkpoint 125 +#define OP_JournalMode 126 +#define OP_Vacuum 127 +#define OP_IncrVacuum 128 +#define OP_Expire 129 +#define OP_TableLock 131 +#define OP_VBegin 132 +#define OP_VCreate 133 +#define OP_VDestroy 134 +#define OP_VOpen 135 +#define OP_VFilter 136 +#define OP_VColumn 137 +#define OP_VNext 138 +#define OP_VRename 139 +#define OP_VUpdate 140 +#define OP_Pagecount 146 +#define OP_MaxPgcnt 147 +#define OP_Trace 148 +#define OP_Noop 149 +#define OP_Explain 150 /* Properties such as "out2" or "jump" that are specified in ** comments following the "case" for each opcode in the vdbe.c ** are encoded into bitvectors as follows: @@ -8452,26 +8490,26 @@ #define OPFLG_OUT3 0x0040 /* out3: P3 is an output */ #define OPFLG_INITIALIZER {\ /* 0 */ 0x00, 0x01, 0x05, 0x04, 0x04, 0x10, 0x00, 0x02,\ /* 8 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x24, 0x24,\ /* 16 */ 0x00, 0x00, 0x00, 0x24, 0x04, 0x05, 0x04, 0x00,\ -/* 24 */ 0x00, 0x01, 0x05, 0x05, 0x00, 0x00, 0x00, 0x02,\ -/* 32 */ 0x00, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00, 0x00,\ -/* 40 */ 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11,\ -/* 48 */ 0x08, 0x11, 0x11, 0x11, 0x11, 0x02, 0x02, 0x00,\ -/* 56 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01,\ -/* 64 */ 0x01, 0x01, 0x01, 0x01, 0x4c, 0x4c, 0x08, 0x00,\ -/* 72 */ 0x02, 0x05, 0x05, 0x15, 0x15, 0x15, 0x15, 0x15,\ +/* 24 */ 0x00, 0x01, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00,\ +/* 32 */ 0x02, 0x00, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00,\ +/* 40 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11,\ +/* 48 */ 0x11, 0x11, 0x08, 0x11, 0x11, 0x11, 0x11, 0x02,\ +/* 56 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ +/* 64 */ 0x00, 0x02, 0x00, 0x01, 0x4c, 0x4c, 0x01, 0x01,\ +/* 72 */ 0x01, 0x05, 0x05, 0x15, 0x15, 0x15, 0x15, 0x15,\ /* 80 */ 0x15, 0x01, 0x4c, 0x4c, 0x4c, 0x4c, 0x4c, 0x4c,\ -/* 88 */ 0x4c, 0x4c, 0x4c, 0x4c, 0x01, 0x24, 0x02, 0x02,\ -/* 96 */ 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\ -/* 104 */ 0x00, 0x0c, 0x45, 0x15, 0x01, 0x02, 0x00, 0x01,\ -/* 112 */ 0x08, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x02,\ -/* 120 */ 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ -/* 128 */ 0x01, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x02,\ -/* 136 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04,\ -/* 144 */ 0x04, 0x04,} +/* 88 */ 0x4c, 0x4c, 0x4c, 0x4c, 0x01, 0x24, 0x02, 0x01,\ +/* 96 */ 0x08, 0x08, 0x00, 0x02, 0x01, 0x01, 0x02, 0x00,\ +/* 104 */ 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ +/* 112 */ 0x0c, 0x45, 0x15, 0x01, 0x02, 0x00, 0x01, 0x08,\ +/* 120 */ 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00,\ +/* 128 */ 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\ +/* 136 */ 0x01, 0x00, 0x01, 0x00, 0x00, 0x04, 0x04, 0x04,\ +/* 144 */ 0x04, 0x04, 0x02, 0x02, 0x00, 0x00, 0x00,} /************** End of opcodes.h *********************************************/ /************** Continuing where we left off in vdbe.h ***********************/ /* @@ -8485,16 +8523,16 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp3(Vdbe*,int,int,int,int); SQLITE_PRIVATE int sqlite3VdbeAddOp4(Vdbe*,int,int,int,int,const char *zP4,int); SQLITE_PRIVATE int sqlite3VdbeAddOp4Int(Vdbe*,int,int,int,int,int); SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp); SQLITE_PRIVATE void sqlite3VdbeAddParseSchemaOp(Vdbe*,int,char*); -SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe*, int addr, int P1); -SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe*, int addr, int P2); -SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe*, int addr, int P3); +SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe*, u32 addr, int P1); +SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe*, u32 addr, int P2); +SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe*, u32 addr, int P3); SQLITE_PRIVATE void sqlite3VdbeChangeP5(Vdbe*, u8 P5); SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe*, int addr); -SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe*, int addr, int N); +SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe*, int addr); SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe*, int addr, const char *zP4, int N); SQLITE_PRIVATE void sqlite3VdbeUsesBtree(Vdbe*, int); SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe*, int); SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe*); SQLITE_PRIVATE void sqlite3VdbeRunOnlyOnce(Vdbe*); @@ -8522,13 +8560,13 @@ SQLITE_PRIVATE void sqlite3VdbeSetVarmask(Vdbe*, int); #ifndef SQLITE_OMIT_TRACE SQLITE_PRIVATE char *sqlite3VdbeExpandSql(Vdbe*, const char*); #endif -SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeRecordUnpack(KeyInfo*,int,const void*,char*,int); -SQLITE_PRIVATE void sqlite3VdbeDeleteUnpackedRecord(UnpackedRecord*); +SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(KeyInfo*,int,const void*,UnpackedRecord*); SQLITE_PRIVATE int sqlite3VdbeRecordCompare(int,const void*,UnpackedRecord*); +SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeAllocUnpackedRecord(KeyInfo *, char *, int, char **); #ifndef SQLITE_OMIT_TRIGGER SQLITE_PRIVATE void sqlite3VdbeLinkSubProgram(Vdbe *, SubProgram *); #endif @@ -9558,10 +9596,11 @@ #define SQLITE_IndexSearch 0x08 /* Disable indexes for searching */ #define SQLITE_IndexCover 0x10 /* Disable index covering table */ #define SQLITE_GroupByOrder 0x20 /* Disable GROUPBY cover of ORDERBY */ #define SQLITE_FactorOutConst 0x40 /* Disable factoring out constants */ #define SQLITE_IdxRealAsInt 0x80 /* Store REAL as INT in indices */ +#define SQLITE_DistinctOpt 0x80 /* DISTINCT using indexes */ #define SQLITE_OptMask 0xff /* Mask of all disablable opts */ /* ** Possible values for the sqlite.magic field. ** The numbers are obtained at random and have no special meaning, other @@ -10137,10 +10176,11 @@ u8 directMode; /* Direct rendering mode means take data directly ** from source tables rather than from accumulators */ u8 useSortingIdx; /* In direct mode, reference the sorting index rather ** than the source table */ int sortingIdx; /* Cursor number of the sorting index */ + int sortingIdxPTab; /* Cursor number of pseudo-table */ ExprList *pGroupBy; /* The group by clause */ int nSortingColumn; /* Number of columns in the sorting index */ struct AggInfo_col { /* For each column used in source tables */ Table *pTab; /* Source table */ int iTable; /* Cursor number of the source table */ @@ -10446,13 +10486,15 @@ char *zDatabase; /* Name of database holding this table */ char *zName; /* Name of the table */ char *zAlias; /* The "B" part of a "A AS B" phrase. zName is the "A" */ Table *pTab; /* An SQL table corresponding to zName */ Select *pSelect; /* A SELECT statement used in place of a table name */ - u8 isPopulated; /* Temporary table associated with SELECT is populated */ + int addrFillSub; /* Address of subroutine to manifest a subquery */ + int regReturn; /* Register holding return address of addrFillSub */ u8 jointype; /* Type of join between this able and the previous */ u8 notIndexed; /* True if there is a NOT INDEXED clause */ + u8 isCorrelated; /* True if sub-query is correlated */ #ifndef SQLITE_OMIT_EXPLAIN u8 iSelectId; /* If pSelect!=0, the id of the sub-select in EQP */ #endif int iCursor; /* The VDBE cursor number used to access this table */ Expr *pOn; /* The ON clause of a join */ @@ -10568,10 +10610,11 @@ struct WhereInfo { Parse *pParse; /* Parsing and code generating context */ u16 wctrlFlags; /* Flags originally passed to sqlite3WhereBegin() */ u8 okOnePass; /* Ok to use one-pass algorithm for UPDATE or DELETE */ u8 untestedTerms; /* Not all WHERE terms resolved by outer loop */ + u8 eDistinct; SrcList *pTabList; /* List of tables in the join */ int iTop; /* The very beginning of the WHERE loop */ int iContinue; /* Jump here to continue with next record */ int iBreak; /* Jump here to break out of the loop */ int nLevel; /* Number of nested loop */ @@ -10579,10 +10622,13 @@ double savedNQueryLoop; /* pParse->nQueryLoop outside the WHERE loop */ double nRowOut; /* Estimated number of output rows */ WhereLevel a[1]; /* Information about each nest loop in WHERE */ }; +#define WHERE_DISTINCT_UNIQUE 1 +#define WHERE_DISTINCT_ORDERED 2 + /* ** A NameContext defines a context in which to resolve table and column ** names. The context consists of a list of tables (the pSrcList) field and ** a list of named expression (pEList). The named expression list may ** be NULL. The pSrc corresponds to the FROM clause of a SELECT or @@ -10664,10 +10710,11 @@ #define SF_Resolved 0x0002 /* Identifiers have been resolved */ #define SF_Aggregate 0x0004 /* Contains aggregate functions */ #define SF_UsesEphemeral 0x0008 /* Uses the OpenEphemeral opcode */ #define SF_Expanded 0x0010 /* sqlite3SelectExpand() called on this */ #define SF_HasTypeInfo 0x0020 /* FROM subqueries have Table metadata */ +#define SF_UseSorter 0x0040 /* Sort using a sorter */ /* ** The results of a select can be distributed in several ways. The ** "SRT" prefix means "SELECT Result Type". @@ -11340,11 +11387,11 @@ #if defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) && !defined(SQLITE_OMIT_SUBQUERY) SQLITE_PRIVATE Expr *sqlite3LimitWhere(Parse *, SrcList *, Expr *, ExprList *, Expr *, Expr *, char *); #endif SQLITE_PRIVATE void sqlite3DeleteFrom(Parse*, SrcList*, Expr*); SQLITE_PRIVATE void sqlite3Update(Parse*, SrcList*, ExprList*, Expr*, int); -SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(Parse*, SrcList*, Expr*, ExprList**, u16); +SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(Parse*, SrcList*, Expr*, ExprList**,ExprList*,u16); SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo*); SQLITE_PRIVATE int sqlite3ExprCodeGetColumn(Parse*, Table*, int, int, int); SQLITE_PRIVATE void sqlite3ExprCodeGetColumnOfTable(Vdbe*, Table*, int, int, int); SQLITE_PRIVATE void sqlite3ExprCodeMove(Parse*, int, int, int); SQLITE_PRIVATE void sqlite3ExprCodeCopy(Parse*, int, int, int); @@ -11990,11 +12037,11 @@ SQLITE_DEFAULT_MEMSTATUS, /* bMemstat */ 1, /* bCoreMutex */ SQLITE_THREADSAFE==1, /* bFullMutex */ SQLITE_USE_URI, /* bOpenUri */ 0x7ffffffe, /* mxStrlen */ - 100, /* szLookaside */ + 128, /* szLookaside */ 500, /* nLookaside */ {0,0,0,0,0,0,0,0}, /* m */ {0,0,0,0,0,0,0,0,0}, /* mutex */ {0,0,0,0,0,0,0,0,0,0,0}, /* pcache */ (void*)0, /* pHeap */ @@ -12213,10 +12260,13 @@ "INT64_TYPE", #endif #ifdef SQLITE_LOCK_TRACE "LOCK_TRACE", #endif +#ifdef SQLITE_MAX_SCHEMA_RETRY + "MAX_SCHEMA_RETRY=" CTIMEOPT_VAL(SQLITE_MAX_SCHEMA_RETRY), +#endif #ifdef SQLITE_MEMDEBUG "MEMDEBUG", #endif #ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT "MIXED_ENDIAN_64BIT_FLOAT", @@ -12325,10 +12375,13 @@ #ifdef SQLITE_OMIT_LOOKASIDE "OMIT_LOOKASIDE", #endif #ifdef SQLITE_OMIT_MEMORYDB "OMIT_MEMORYDB", +#endif +#ifdef SQLITE_OMIT_MERGE_SORT + "OMIT_MERGE_SORT", #endif #ifdef SQLITE_OMIT_OR_OPTIMIZATION "OMIT_OR_OPTIMIZATION", #endif #ifdef SQLITE_OMIT_PAGER_PRAGMAS @@ -12391,10 +12444,13 @@ #ifdef SQLITE_OMIT_WSD "OMIT_WSD", #endif #ifdef SQLITE_OMIT_XFER_OPT "OMIT_XFER_OPT", +#endif +#ifdef SQLITE_PAGECACHE_BLOCKALLOC + "PAGECACHE_BLOCKALLOC", #endif #ifdef SQLITE_PERFORMANCE_TRACE "PERFORMANCE_TRACE", #endif #ifdef SQLITE_PROXY_DEBUG @@ -12512,10 +12568,13 @@ /* ** Boolean values */ typedef unsigned char Bool; +/* Opaque type used by code in vdbesort.c */ +typedef struct VdbeSorter VdbeSorter; + /* ** A cursor is a pointer into a single BTree within a database file. ** The cursor can seek to a BTree entry with a particular key, or ** loop over all entries of the Btree. You can also insert new BTree ** entries or retrieve the key or data from the entry that the cursor @@ -12538,15 +12597,17 @@ Bool nullRow; /* True if pointing to a row with no data */ Bool deferredMoveto; /* A call to sqlite3BtreeMoveto() is needed */ Bool isTable; /* True if a table requiring integer keys */ Bool isIndex; /* True if an index containing keys only - no data */ Bool isOrdered; /* True if the underlying table is BTREE_UNORDERED */ + Bool isSorter; /* True if a new-style sorter */ sqlite3_vtab_cursor *pVtabCursor; /* The cursor for a virtual table */ const sqlite3_module *pModule; /* Module for cursor pVtabCursor */ i64 seqCount; /* Sequence counter */ i64 movetoTarget; /* Argument to the deferred sqlite3BtreeMoveto() */ i64 lastRowid; /* Last rowid from a Next or NextIdx operation */ + VdbeSorter *pSorter; /* Sorter object for OP_SorterOpen cursors */ /* Result of last sqlite3BtreeMoveto() done by an OP_NotExists or ** OP_IsUnique opcode on this cursor. */ int seekResult; @@ -12862,17 +12923,38 @@ SQLITE_PRIVATE int sqlite3VdbeMemRealify(Mem*); SQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem*); SQLITE_PRIVATE int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*); SQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p); SQLITE_PRIVATE void sqlite3VdbeMemReleaseExternal(Mem *p); +#define MemReleaseExt(X) \ + if((X)->flags&(MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame)) \ + sqlite3VdbeMemReleaseExternal(X); SQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem*, FuncDef*); SQLITE_PRIVATE const char *sqlite3OpcodeName(int); SQLITE_PRIVATE int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve); SQLITE_PRIVATE int sqlite3VdbeCloseStatement(Vdbe *, int); SQLITE_PRIVATE void sqlite3VdbeFrameDelete(VdbeFrame*); SQLITE_PRIVATE int sqlite3VdbeFrameRestore(VdbeFrame *); SQLITE_PRIVATE void sqlite3VdbeMemStoreType(Mem *pMem); + +#ifdef SQLITE_OMIT_MERGE_SORT +# define sqlite3VdbeSorterInit(Y,Z) SQLITE_OK +# define sqlite3VdbeSorterWrite(X,Y,Z) SQLITE_OK +# define sqlite3VdbeSorterClose(Y,Z) +# define sqlite3VdbeSorterRowkey(Y,Z) SQLITE_OK +# define sqlite3VdbeSorterRewind(X,Y,Z) SQLITE_OK +# define sqlite3VdbeSorterNext(X,Y,Z) SQLITE_OK +# define sqlite3VdbeSorterCompare(X,Y,Z) SQLITE_OK +#else +SQLITE_PRIVATE int sqlite3VdbeSorterInit(sqlite3 *, VdbeCursor *); +SQLITE_PRIVATE void sqlite3VdbeSorterClose(sqlite3 *, VdbeCursor *); +SQLITE_PRIVATE int sqlite3VdbeSorterRowkey(VdbeCursor *, Mem *); +SQLITE_PRIVATE int sqlite3VdbeSorterNext(sqlite3 *, VdbeCursor *, int *); +SQLITE_PRIVATE int sqlite3VdbeSorterRewind(sqlite3 *, VdbeCursor *, int *); +SQLITE_PRIVATE int sqlite3VdbeSorterWrite(sqlite3 *, VdbeCursor *, Mem *); +SQLITE_PRIVATE int sqlite3VdbeSorterCompare(VdbeCursor *, Mem *, int *); +#endif #if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE>0 SQLITE_PRIVATE void sqlite3VdbeEnter(Vdbe*); SQLITE_PRIVATE void sqlite3VdbeLeave(Vdbe*); #else @@ -13163,10 +13245,12 @@ ** Astronomical Algorithms, 2nd Edition, 1998 ** ISBM 0-943396-61-1 ** Willmann-Bell, Inc ** Richmond, Virginia (USA) */ +/* #include */ +/* #include */ #include #ifndef SQLITE_OMIT_DATETIME_FUNCS @@ -13544,11 +13628,13 @@ static int osLocaltime(time_t *t, struct tm *pTm){ int rc; #if (!defined(HAVE_LOCALTIME_R) || !HAVE_LOCALTIME_R) \ && (!defined(HAVE_LOCALTIME_S) || !HAVE_LOCALTIME_S) struct tm *pX; +#if SQLITE_THREADSAFE>0 sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); +#endif sqlite3_mutex_enter(mutex); pX = localtime(t); #ifndef SQLITE_OMIT_BUILTIN_TEST if( sqlite3GlobalConfig.bLocaltimeFault ) pX = 0; #endif @@ -14378,11 +14464,11 @@ DO_OS_MALLOC_TEST(0); /* 0x87f3f is a mask of SQLITE_OPEN_ flags that are valid to be passed ** down into the VFS layer. Some SQLITE_OPEN_ flags (for example, ** SQLITE_OPEN_FULLMUTEX or SQLITE_OPEN_SHAREDCACHE) are blocked before ** reaching the VFS. */ - rc = pVfs->xOpen(pVfs, zPath, pFile, flags & 0x87f3f, pFlagsOut); + rc = pVfs->xOpen(pVfs, zPath, pFile, flags & 0x87f7f, pFlagsOut); assert( rc==SQLITE_OK || pFile->pMethods==0 ); return rc; } SQLITE_PRIVATE int sqlite3OsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){ return pVfs->xDelete(pVfs, zPath, dirSync); @@ -14450,11 +14536,11 @@ int flags, int *pOutFlags ){ int rc = SQLITE_NOMEM; sqlite3_file *pFile; - pFile = (sqlite3_file *)sqlite3Malloc(pVfs->szOsFile); + pFile = (sqlite3_file *)sqlite3MallocZero(pVfs->szOsFile); if( pFile ){ rc = sqlite3OsOpen(pVfs, zFile, pFile, flags, pOutFlags); if( rc!=SQLITE_OK ){ sqlite3_free(pFile); }else{ @@ -14914,10 +15000,11 @@ extern void backtrace_symbols_fd(void*const*,int,int); #else # define backtrace(A,B) 1 # define backtrace_symbols_fd(A,B,C) #endif +/* #include */ /* ** Each memory allocation looks like this: ** ** ------------------------------------------------------------------------ @@ -15839,11 +15926,11 @@ ** Free an outstanding memory allocation. ** ** This function assumes that the necessary mutexes, if any, are ** already held by the caller. Hence "Unsafe". */ -void memsys3FreeUnsafe(void *pOld){ +static void memsys3FreeUnsafe(void *pOld){ Mem3Block *p = (Mem3Block*)pOld; int i; u32 size, x; assert( sqlite3_mutex_held(mem3.mutex) ); assert( p>mem3.aPool && p<&mem3.aPool[mem3.nPool] ); @@ -15914,21 +16001,21 @@ } /* ** Free memory. */ -void memsys3Free(void *pPrior){ +static void memsys3Free(void *pPrior){ assert( pPrior ); memsys3Enter(); memsys3FreeUnsafe(pPrior); memsys3Leave(); } /* ** Change the size of an existing memory allocation */ -void *memsys3Realloc(void *pPrior, int nBytes){ +static void *memsys3Realloc(void *pPrior, int nBytes){ int nOld; void *p; if( pPrior==0 ){ return sqlite3_malloc(nBytes); } @@ -18017,10 +18104,11 @@ ** ************************************************************************* ** ** Memory allocation functions used throughout sqlite. */ +/* #include */ /* ** Attempt to release up to n bytes of non-essential memory currently ** held by SQLite. An example of non-essential memory is memory used to ** cache database pages that are not currently in use. @@ -19994,10 +20082,11 @@ ** BOM or Byte Order Mark: ** 0xff 0xfe little-endian utf-16 follows ** 0xfe 0xff big-endian utf-16 follows ** */ +/* #include */ #ifndef SQLITE_AMALGAMATION /* ** The following constant value is used by the SQLITE_BIGENDIAN and ** SQLITE_LITTLEENDIAN macros. @@ -20536,10 +20625,11 @@ ** ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** */ +/* #include */ #ifdef SQLITE_HAVE_ISNAN # include #endif /* @@ -21668,26 +21758,32 @@ return -x; } #ifdef SQLITE_ENABLE_8_3_NAMES /* -** If SQLITE_ENABLE_8_3_NAME is set at compile-time and if the database +** If SQLITE_ENABLE_8_3_NAMES is set at compile-time and if the database ** filename in zBaseFilename is a URI with the "8_3_names=1" parameter and ** if filename in z[] has a suffix (a.k.a. "extension") that is longer than ** three characters, then shorten the suffix on z[] to be the last three ** characters of the original suffix. +** +** If SQLITE_ENABLE_8_3_NAMES is set to 2 at compile-time, then always +** do the suffix shortening regardless of URI parameter. ** ** Examples: ** ** test.db-journal => test.nal ** test.db-wal => test.wal ** test.db-shm => test.shm */ SQLITE_PRIVATE void sqlite3FileSuffix3(const char *zBaseFilename, char *z){ +#if SQLITE_ENABLE_8_3_NAMES<2 const char *zOk; zOk = sqlite3_uri_parameter(zBaseFilename, "8_3_names"); - if( zOk && sqlite3GetBoolean(zOk) ){ + if( zOk && sqlite3GetBoolean(zOk) ) +#endif + { int i, sz; sz = sqlite3Strlen30(z); for(i=sz-1; i>0 && z[i]!='/' && z[i]!='.'; i--){} if( z[i]=='.' && ALWAYS(sz>i+4) ) memcpy(&z[i+1], &z[sz-3], 4); } @@ -21708,10 +21804,11 @@ ** ************************************************************************* ** This is the implementation of generic hash-tables ** used in SQLite. */ +/* #include */ /* Turn bulk memory into a hash table object by initializing the ** fields of the Hash structure. ** ** "pNew" is a pointer to the hash table that is to be initialized. @@ -22002,66 +22099,66 @@ /* 21 */ "MustBeInt", /* 22 */ "RealAffinity", /* 23 */ "Permutation", /* 24 */ "Compare", /* 25 */ "Jump", - /* 26 */ "If", - /* 27 */ "IfNot", - /* 28 */ "Column", - /* 29 */ "Affinity", - /* 30 */ "MakeRecord", - /* 31 */ "Count", - /* 32 */ "Savepoint", - /* 33 */ "AutoCommit", - /* 34 */ "Transaction", - /* 35 */ "ReadCookie", - /* 36 */ "SetCookie", - /* 37 */ "VerifyCookie", - /* 38 */ "OpenRead", - /* 39 */ "OpenWrite", - /* 40 */ "OpenAutoindex", - /* 41 */ "OpenEphemeral", - /* 42 */ "OpenPseudo", - /* 43 */ "Close", - /* 44 */ "SeekLt", - /* 45 */ "SeekLe", - /* 46 */ "SeekGe", - /* 47 */ "SeekGt", - /* 48 */ "Seek", - /* 49 */ "NotFound", - /* 50 */ "Found", - /* 51 */ "IsUnique", - /* 52 */ "NotExists", - /* 53 */ "Sequence", - /* 54 */ "NewRowid", - /* 55 */ "Insert", - /* 56 */ "InsertInt", - /* 57 */ "Delete", - /* 58 */ "ResetCount", - /* 59 */ "RowKey", - /* 60 */ "RowData", - /* 61 */ "Rowid", - /* 62 */ "NullRow", - /* 63 */ "Last", - /* 64 */ "Sort", - /* 65 */ "Rewind", - /* 66 */ "Prev", - /* 67 */ "Next", + /* 26 */ "Once", + /* 27 */ "If", + /* 28 */ "IfNot", + /* 29 */ "Column", + /* 30 */ "Affinity", + /* 31 */ "MakeRecord", + /* 32 */ "Count", + /* 33 */ "Savepoint", + /* 34 */ "AutoCommit", + /* 35 */ "Transaction", + /* 36 */ "ReadCookie", + /* 37 */ "SetCookie", + /* 38 */ "VerifyCookie", + /* 39 */ "OpenRead", + /* 40 */ "OpenWrite", + /* 41 */ "OpenAutoindex", + /* 42 */ "OpenEphemeral", + /* 43 */ "SorterOpen", + /* 44 */ "OpenPseudo", + /* 45 */ "Close", + /* 46 */ "SeekLt", + /* 47 */ "SeekLe", + /* 48 */ "SeekGe", + /* 49 */ "SeekGt", + /* 50 */ "Seek", + /* 51 */ "NotFound", + /* 52 */ "Found", + /* 53 */ "IsUnique", + /* 54 */ "NotExists", + /* 55 */ "Sequence", + /* 56 */ "NewRowid", + /* 57 */ "Insert", + /* 58 */ "InsertInt", + /* 59 */ "Delete", + /* 60 */ "ResetCount", + /* 61 */ "SorterCompare", + /* 62 */ "SorterData", + /* 63 */ "RowKey", + /* 64 */ "RowData", + /* 65 */ "Rowid", + /* 66 */ "NullRow", + /* 67 */ "Last", /* 68 */ "Or", /* 69 */ "And", - /* 70 */ "IdxInsert", - /* 71 */ "IdxDelete", - /* 72 */ "IdxRowid", + /* 70 */ "SorterSort", + /* 71 */ "Sort", + /* 72 */ "Rewind", /* 73 */ "IsNull", /* 74 */ "NotNull", /* 75 */ "Ne", /* 76 */ "Eq", /* 77 */ "Gt", /* 78 */ "Le", /* 79 */ "Lt", /* 80 */ "Ge", - /* 81 */ "IdxLT", + /* 81 */ "SorterNext", /* 82 */ "BitAnd", /* 83 */ "BitOr", /* 84 */ "ShiftLeft", /* 85 */ "ShiftRight", /* 86 */ "Add", @@ -22068,64 +22165,69 @@ /* 87 */ "Subtract", /* 88 */ "Multiply", /* 89 */ "Divide", /* 90 */ "Remainder", /* 91 */ "Concat", - /* 92 */ "IdxGE", + /* 92 */ "Prev", /* 93 */ "BitNot", /* 94 */ "String8", - /* 95 */ "Destroy", - /* 96 */ "Clear", - /* 97 */ "CreateIndex", - /* 98 */ "CreateTable", - /* 99 */ "ParseSchema", - /* 100 */ "LoadAnalysis", - /* 101 */ "DropTable", - /* 102 */ "DropIndex", - /* 103 */ "DropTrigger", - /* 104 */ "IntegrityCk", - /* 105 */ "RowSetAdd", - /* 106 */ "RowSetRead", - /* 107 */ "RowSetTest", - /* 108 */ "Program", - /* 109 */ "Param", - /* 110 */ "FkCounter", - /* 111 */ "FkIfZero", - /* 112 */ "MemMax", - /* 113 */ "IfPos", - /* 114 */ "IfNeg", - /* 115 */ "IfZero", - /* 116 */ "AggStep", - /* 117 */ "AggFinal", - /* 118 */ "Checkpoint", - /* 119 */ "JournalMode", - /* 120 */ "Vacuum", - /* 121 */ "IncrVacuum", - /* 122 */ "Expire", - /* 123 */ "TableLock", - /* 124 */ "VBegin", - /* 125 */ "VCreate", - /* 126 */ "VDestroy", - /* 127 */ "VOpen", - /* 128 */ "VFilter", - /* 129 */ "VColumn", + /* 95 */ "Next", + /* 96 */ "SorterInsert", + /* 97 */ "IdxInsert", + /* 98 */ "IdxDelete", + /* 99 */ "IdxRowid", + /* 100 */ "IdxLT", + /* 101 */ "IdxGE", + /* 102 */ "Destroy", + /* 103 */ "Clear", + /* 104 */ "CreateIndex", + /* 105 */ "CreateTable", + /* 106 */ "ParseSchema", + /* 107 */ "LoadAnalysis", + /* 108 */ "DropTable", + /* 109 */ "DropIndex", + /* 110 */ "DropTrigger", + /* 111 */ "IntegrityCk", + /* 112 */ "RowSetAdd", + /* 113 */ "RowSetRead", + /* 114 */ "RowSetTest", + /* 115 */ "Program", + /* 116 */ "Param", + /* 117 */ "FkCounter", + /* 118 */ "FkIfZero", + /* 119 */ "MemMax", + /* 120 */ "IfPos", + /* 121 */ "IfNeg", + /* 122 */ "IfZero", + /* 123 */ "AggStep", + /* 124 */ "AggFinal", + /* 125 */ "Checkpoint", + /* 126 */ "JournalMode", + /* 127 */ "Vacuum", + /* 128 */ "IncrVacuum", + /* 129 */ "Expire", /* 130 */ "Real", - /* 131 */ "VNext", - /* 132 */ "VRename", - /* 133 */ "VUpdate", - /* 134 */ "Pagecount", - /* 135 */ "MaxPgcnt", - /* 136 */ "Trace", - /* 137 */ "Noop", - /* 138 */ "Explain", - /* 139 */ "NotUsed_139", - /* 140 */ "NotUsed_140", + /* 131 */ "TableLock", + /* 132 */ "VBegin", + /* 133 */ "VCreate", + /* 134 */ "VDestroy", + /* 135 */ "VOpen", + /* 136 */ "VFilter", + /* 137 */ "VColumn", + /* 138 */ "VNext", + /* 139 */ "VRename", + /* 140 */ "VUpdate", /* 141 */ "ToText", /* 142 */ "ToBlob", /* 143 */ "ToNumeric", /* 144 */ "ToInt", /* 145 */ "ToReal", + /* 146 */ "Pagecount", + /* 147 */ "MaxPgcnt", + /* 148 */ "Trace", + /* 149 */ "Noop", + /* 150 */ "Explain", }; return azName[i]; } #endif @@ -22216,15 +22318,18 @@ */ #ifdef MEMORY_DEBUG # error "The MEMORY_DEBUG macro is obsolete. Use SQLITE_DEBUG instead." #endif -#ifdef SQLITE_DEBUG -SQLITE_PRIVATE int sqlite3OSTrace = 0; -#define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X +#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) +# ifndef SQLITE_DEBUG_OS_TRACE +# define SQLITE_DEBUG_OS_TRACE 0 +# endif + int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE; +# define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X #else -#define OSTRACE(X) +# define OSTRACE(X) #endif /* ** Macros for performance tracing. Normally turned off. Only works ** on i486 hardware. @@ -24377,10 +24482,11 @@ */ #include #include #include #include +/* #include */ #include #include #ifndef SQLITE_OMIT_WAL #include #endif @@ -24412,10 +24518,11 @@ /* ** If we are to be thread-safe, include the pthreads header and define ** the SQLITE_UNIX_THREADS macro. */ #if SQLITE_THREADSAFE +/* # include */ # define SQLITE_UNIX_THREADS 1 #endif /* ** Default permissions when creating a new file @@ -24467,11 +24574,10 @@ typedef struct unixFile unixFile; struct unixFile { sqlite3_io_methods const *pMethod; /* Always the first entry */ unixInodeInfo *pInode; /* Info about locks on this inode */ int h; /* The file descriptor */ - int dirfd; /* File descriptor for the directory */ unsigned char eFileLock; /* The type of lock held on this fd */ unsigned char ctrlFlags; /* Behavioral bits. UNIXFILE_* flags */ int lastErrno; /* The unix errno from last I/O error */ void *lockingContext; /* Locking style specific state */ UnixUnusedFd *pUnused; /* Pre-allocated UnixUnusedFd */ @@ -24509,12 +24615,18 @@ }; /* ** Allowed values for the unixFile.ctrlFlags bitmask: */ -#define UNIXFILE_EXCL 0x01 /* Connections from one process only */ -#define UNIXFILE_RDONLY 0x02 /* Connection is read only */ +#define UNIXFILE_EXCL 0x01 /* Connections from one process only */ +#define UNIXFILE_RDONLY 0x02 /* Connection is read only */ +#define UNIXFILE_PERSIST_WAL 0x04 /* Persistent WAL mode */ +#ifndef SQLITE_DISABLE_DIRSYNC +# define UNIXFILE_DIRSYNC 0x08 /* Directory sync needed */ +#else +# define UNIXFILE_DIRSYNC 0x00 +#endif /* ** Include code that is common to all os_*.c files */ /************** Include os_common.h in the middle of os_unix.c ***************/ @@ -24548,15 +24660,18 @@ */ #ifdef MEMORY_DEBUG # error "The MEMORY_DEBUG macro is obsolete. Use SQLITE_DEBUG instead." #endif -#ifdef SQLITE_DEBUG -SQLITE_PRIVATE int sqlite3OSTrace = 0; -#define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X +#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) +# ifndef SQLITE_DEBUG_OS_TRACE +# define SQLITE_DEBUG_OS_TRACE 0 +# endif + int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE; +# define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X #else -#define OSTRACE(X) +# define OSTRACE(X) #endif /* ** Macros for performance tracing. Normally turned off. Only works ** on i486 hardware. @@ -24761,10 +24876,13 @@ */ static int posixOpen(const char *zFile, int flags, int mode){ return open(zFile, flags, mode); } +/* Forward reference */ +static int openDirectory(const char*, int*); + /* ** Many system calls are accessed through pointer-to-functions so that ** they may be overridden at runtime to facilitate fault injection during ** testing and sandboxing. The following array holds the names and pointers ** to all overrideable system calls. @@ -24857,10 +24975,16 @@ #else { "fallocate", (sqlite3_syscall_ptr)0, 0 }, #endif #define osFallocate ((int(*)(int,off_t,off_t))aSyscall[15].pCurrent) + { "unlink", (sqlite3_syscall_ptr)unlink, 0 }, +#define osUnlink ((int(*)(const char*))aSyscall[16].pCurrent) + + { "openDirectory", (sqlite3_syscall_ptr)openDirectory, 0 }, +#define osOpenDirectory ((int(*)(const char*,int*))aSyscall[17].pCurrent) + }; /* End of the overrideable system calls */ /* ** This is the xSetSystemCall() method of sqlite3_vfs for all of the ** "unix" VFSes. Return SQLITE_OK opon successfully updating the @@ -25141,11 +25265,13 @@ case EINVAL: case ENOTCONN: case ENODEV: case ENXIO: case ENOENT: +#ifdef ESTALE /* ESTALE is not defined on Interix systems */ case ESTALE: +#endif case ENOSYS: /* these should force the client to close the file and reconnect */ default: return sqliteIOErr; @@ -26211,22 +26337,18 @@ ** even on VxWorks. A mutex will be acquired on VxWorks by the ** vxworksReleaseFileId() routine. */ static int closeUnixFile(sqlite3_file *id){ unixFile *pFile = (unixFile*)id; - if( pFile->dirfd>=0 ){ - robust_close(pFile, pFile->dirfd, __LINE__); - pFile->dirfd=-1; - } if( pFile->h>=0 ){ robust_close(pFile, pFile->h, __LINE__); pFile->h = -1; } #if OS_VXWORKS if( pFile->pId ){ if( pFile->isDelete ){ - unlink(pFile->pId->zCanonicalName); + osUnlink(pFile->pId->zCanonicalName); } vxworksReleaseFileId(pFile->pId); pFile->pId = 0; } #endif @@ -26471,11 +26593,11 @@ return SQLITE_OK; } /* To fully unlock the database, delete the lock file */ assert( eFileLock==NO_LOCK ); - if( unlink(zLockFile) ){ + if( osUnlink(zLockFile) ){ int rc = 0; int tErrno = errno; if( ENOENT != tErrno ){ rc = SQLITE_IOERR_UNLOCK; } @@ -26977,15 +27099,16 @@ */ static int afpCheckReservedLock(sqlite3_file *id, int *pResOut){ int rc = SQLITE_OK; int reserved = 0; unixFile *pFile = (unixFile*)id; + afpLockingContext *context; SimulateIOError( return SQLITE_IOERR_CHECKRESERVEDLOCK; ); assert( pFile ); - afpLockingContext *context = (afpLockingContext *) pFile->lockingContext; + context = (afpLockingContext *) pFile->lockingContext; if( context->reserved ){ *pResOut = 1; return SQLITE_OK; } unixEnterMutex(); /* Because pFile->pInode is shared across threads */ @@ -27121,11 +27244,11 @@ /* If control gets to this point, then actually go ahead and make ** operating system calls for the specified lock. */ if( eFileLock==SHARED_LOCK ){ - int lrc1, lrc2, lrc1Errno; + int lrc1, lrc2, lrc1Errno = 0; long lk, mask; assert( pInode->nShared==0 ); assert( pInode->eFileLock==0 ); @@ -27495,21 +27618,23 @@ #if defined(USE_PREAD) do{ got = osPwrite(id->h, pBuf, cnt, offset); }while( got<0 && errno==EINTR ); #elif defined(USE_PREAD64) do{ got = osPwrite64(id->h, pBuf, cnt, offset);}while( got<0 && errno==EINTR); #else - newOffset = lseek(id->h, offset, SEEK_SET); - SimulateIOError( newOffset-- ); - if( newOffset!=offset ){ - if( newOffset == -1 ){ - ((unixFile*)id)->lastErrno = errno; - }else{ - ((unixFile*)id)->lastErrno = 0; - } - return -1; - } - do{ got = osWrite(id->h, pBuf, cnt); }while( got<0 && errno==EINTR ); + do{ + newOffset = lseek(id->h, offset, SEEK_SET); + SimulateIOError( newOffset-- ); + if( newOffset!=offset ){ + if( newOffset == -1 ){ + ((unixFile*)id)->lastErrno = errno; + }else{ + ((unixFile*)id)->lastErrno = 0; + } + return -1; + } + got = osWrite(id->h, pBuf, cnt); + }while( got<0 && errno==EINTR ); #endif TIMER_END; if( got<0 ){ ((unixFile*)id)->lastErrno = errno; } @@ -27595,15 +27720,15 @@ SQLITE_API int sqlite3_fullsync_count = 0; #endif /* ** We do not trust systems to provide a working fdatasync(). Some do. -** Others do no. To be safe, we will stick with the (slower) fsync(). -** If you know that your system does support fdatasync() correctly, +** Others do no. To be safe, we will stick with the (slightly slower) +** fsync(). If you know that your system does support fdatasync() correctly, ** then simply compile with -Dfdatasync=fdatasync */ -#if !defined(fdatasync) && !defined(__linux__) +#if !defined(fdatasync) # define fdatasync fsync #endif /* ** Define HAVE_FULLFSYNC to 0 or 1 depending on whether or not @@ -27706,10 +27831,54 @@ if( OS_VXWORKS && rc!= -1 ){ rc = 0; } return rc; } + +/* +** Open a file descriptor to the directory containing file zFilename. +** If successful, *pFd is set to the opened file descriptor and +** SQLITE_OK is returned. If an error occurs, either SQLITE_NOMEM +** or SQLITE_CANTOPEN is returned and *pFd is set to an undefined +** value. +** +** The directory file descriptor is used for only one thing - to +** fsync() a directory to make sure file creation and deletion events +** are flushed to disk. Such fsyncs are not needed on newer +** journaling filesystems, but are required on older filesystems. +** +** This routine can be overridden using the xSetSysCall interface. +** The ability to override this routine was added in support of the +** chromium sandbox. Opening a directory is a security risk (we are +** told) so making it overrideable allows the chromium sandbox to +** replace this routine with a harmless no-op. To make this routine +** a no-op, replace it with a stub that returns SQLITE_OK but leaves +** *pFd set to a negative number. +** +** If SQLITE_OK is returned, the caller is responsible for closing +** the file descriptor *pFd using close(). +*/ +static int openDirectory(const char *zFilename, int *pFd){ + int ii; + int fd = -1; + char zDirname[MAX_PATHNAME+1]; + + sqlite3_snprintf(MAX_PATHNAME, zDirname, "%s", zFilename); + for(ii=(int)strlen(zDirname); ii>1 && zDirname[ii]!='/'; ii--); + if( ii>0 ){ + zDirname[ii] = '\0'; + fd = robust_open(zDirname, O_RDONLY|O_BINARY, 0); + if( fd>=0 ){ +#ifdef FD_CLOEXEC + osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC); +#endif + OSTRACE(("OPENDIR %-3d %s\n", fd, zDirname)); + } + } + *pFd = fd; + return (fd>=0?SQLITE_OK:unixLogError(SQLITE_CANTOPEN_BKPT, "open", zDirname)); +} /* ** Make sure all writes to a particular file are committed to disk. ** ** If dataOnly==0 then both the file itself and its metadata (file @@ -27747,32 +27916,27 @@ SimulateIOError( rc=1 ); if( rc ){ pFile->lastErrno = errno; return unixLogError(SQLITE_IOERR_FSYNC, "full_fsync", pFile->zPath); } - if( pFile->dirfd>=0 ){ - OSTRACE(("DIRSYNC %-3d (have_fullfsync=%d fullsync=%d)\n", pFile->dirfd, + + /* Also fsync the directory containing the file if the DIRSYNC flag + ** is set. This is a one-time occurrance. Many systems (examples: AIX) + ** are unable to fsync a directory, so ignore errors on the fsync. + */ + if( pFile->ctrlFlags & UNIXFILE_DIRSYNC ){ + int dirfd; + OSTRACE(("DIRSYNC %s (have_fullfsync=%d fullsync=%d)\n", pFile->zPath, HAVE_FULLFSYNC, isFullsync)); -#ifndef SQLITE_DISABLE_DIRSYNC - /* The directory sync is only attempted if full_fsync is - ** turned off or unavailable. If a full_fsync occurred above, - ** then the directory sync is superfluous. - */ - if( (!HAVE_FULLFSYNC || !isFullsync) && full_fsync(pFile->dirfd,0,0) ){ - /* - ** We have received multiple reports of fsync() returning - ** errors when applied to directories on certain file systems. - ** A failed directory sync is not a big deal. So it seems - ** better to ignore the error. Ticket #1657 - */ - /* pFile->lastErrno = errno; */ - /* return SQLITE_IOERR; */ - } -#endif - /* Only need to sync once, so close the directory when we are done */ - robust_close(pFile, pFile->dirfd, __LINE__); - pFile->dirfd = -1; + rc = osOpenDirectory(pFile->zPath, &dirfd); + if( rc==SQLITE_OK && dirfd>=0 ){ + full_fsync(dirfd, 0, 0); + robust_close(pFile, dirfd, __LINE__); + }else if( rc==SQLITE_CANTOPEN ){ + rc = SQLITE_OK; + } + pFile->ctrlFlags &= ~UNIXFILE_DIRSYNC; } return rc; } /* @@ -27850,18 +28014,16 @@ static int proxyFileControl(sqlite3_file*,int,void*); #endif /* ** This function is called to handle the SQLITE_FCNTL_SIZE_HINT -** file-control operation. -** -** If the user has configured a chunk-size for this file, it could be -** that the file needs to be extended at this point. Otherwise, the -** SQLITE_FCNTL_SIZE_HINT operation is a no-op for Unix. +** file-control operation. Enlarge the database to nBytes in size +** (rounded up to the next chunk-size). If the database is already +** nBytes or larger, this routine is a no-op. */ static int fcntlSizeHint(unixFile *pFile, i64 nByte){ - if( pFile->szChunk ){ + if( pFile->szChunk>0 ){ i64 nSize; /* Required file size */ struct stat buf; /* Used to hold return values of fstat() */ if( osFstat(pFile->h, &buf) ) return SQLITE_IOERR_FSTAT; @@ -27906,25 +28068,41 @@ /* ** Information and control of an open file handle. */ static int unixFileControl(sqlite3_file *id, int op, void *pArg){ + unixFile *pFile = (unixFile*)id; switch( op ){ case SQLITE_FCNTL_LOCKSTATE: { - *(int*)pArg = ((unixFile*)id)->eFileLock; + *(int*)pArg = pFile->eFileLock; return SQLITE_OK; } case SQLITE_LAST_ERRNO: { - *(int*)pArg = ((unixFile*)id)->lastErrno; + *(int*)pArg = pFile->lastErrno; return SQLITE_OK; } case SQLITE_FCNTL_CHUNK_SIZE: { - ((unixFile*)id)->szChunk = *(int *)pArg; + pFile->szChunk = *(int *)pArg; return SQLITE_OK; } case SQLITE_FCNTL_SIZE_HINT: { - return fcntlSizeHint((unixFile *)id, *(i64 *)pArg); + int rc; + SimulateIOErrorBenign(1); + rc = fcntlSizeHint(pFile, *(i64 *)pArg); + SimulateIOErrorBenign(0); + return rc; + } + case SQLITE_FCNTL_PERSIST_WAL: { + int bPersist = *(int*)pArg; + if( bPersist<0 ){ + *(int*)pArg = (pFile->ctrlFlags & UNIXFILE_PERSIST_WAL)!=0; + }else if( bPersist==0 ){ + pFile->ctrlFlags &= ~UNIXFILE_PERSIST_WAL; + }else{ + pFile->ctrlFlags |= UNIXFILE_PERSIST_WAL; + } + return SQLITE_OK; } #ifndef NDEBUG /* The pager calls this method to signal that it has done ** a rollback and that the database is therefore unchanged and ** it hence it is OK for the transaction change counter to be @@ -28036,15 +28214,13 @@ */ struct unixShm { unixShmNode *pShmNode; /* The underlying unixShmNode object */ unixShm *pNext; /* Next unixShm with the same unixShmNode */ u8 hasMutex; /* True if holding the unixShmNode mutex */ + u8 id; /* Id of this connection within its unixShmNode */ u16 sharedMask; /* Mask of shared locks held */ u16 exclMask; /* Mask of exclusive locks held */ -#ifdef SQLITE_DEBUG - u8 id; /* Id of this connection within its unixShmNode */ -#endif }; /* ** Constants used for locking */ @@ -28136,11 +28312,11 @@ unixShmNode *p = pFd->pInode->pShmNode; assert( unixMutexHeld() ); if( p && p->nRef==0 ){ int i; assert( p->pInode==pFd->pInode ); - if( p->mutex ) sqlite3_mutex_free(p->mutex); + sqlite3_mutex_free(p->mutex); for(i=0; inRegion; i++){ if( p->h>=0 ){ munmap(p->apRegion[i], p->szRegion); }else{ sqlite3_free(p->apRegion[i]); @@ -28605,11 +28781,11 @@ ** shared-memory file, too */ unixEnterMutex(); assert( pShmNode->nRef>0 ); pShmNode->nRef--; if( pShmNode->nRef==0 ){ - if( deleteFlag && pShmNode->h>=0 ) unlink(pShmNode->zFilename); + if( deleteFlag && pShmNode->h>=0 ) osUnlink(pShmNode->zFilename); unixShmPurge(pDbFd); } unixLeaveMutex(); return SQLITE_OK; @@ -28918,11 +29094,11 @@ ** Initialize the contents of the unixFile structure pointed to by pId. */ static int fillInUnixFile( sqlite3_vfs *pVfs, /* Pointer to vfs object */ int h, /* Open file descriptor of file being opened */ - int dirfd, /* Directory file descriptor */ + int syncDir, /* True to sync directory on first sync */ sqlite3_file *pId, /* Write to the unixFile structure here */ const char *zFilename, /* Name of the file being opened */ int noLock, /* Omit locking if true */ int isDelete, /* Delete on close if true */ int isReadOnly /* True if the file is opened read-only */ @@ -28949,20 +29125,22 @@ assert( zFilename==0 || zFilename[0]=='/' ); #endif OSTRACE(("OPEN %-3d %s\n", h, zFilename)); pNew->h = h; - pNew->dirfd = dirfd; pNew->zPath = zFilename; if( memcmp(pVfs->zName,"unix-excl",10)==0 ){ pNew->ctrlFlags = UNIXFILE_EXCL; }else{ pNew->ctrlFlags = 0; } if( isReadOnly ){ pNew->ctrlFlags |= UNIXFILE_RDONLY; } + if( syncDir ){ + pNew->ctrlFlags |= UNIXFILE_DIRSYNC; + } #if OS_VXWORKS pNew->pId = vxworksFindFileId(zFilename); if( pNew->pId==0 ){ noLock = 1; @@ -29085,56 +29263,24 @@ pNew->lastErrno = 0; #if OS_VXWORKS if( rc!=SQLITE_OK ){ if( h>=0 ) robust_close(pNew, h, __LINE__); h = -1; - unlink(zFilename); + osUnlink(zFilename); isDelete = 0; } pNew->isDelete = isDelete; #endif if( rc!=SQLITE_OK ){ - if( dirfd>=0 ) robust_close(pNew, dirfd, __LINE__); if( h>=0 ) robust_close(pNew, h, __LINE__); }else{ pNew->pMethod = pLockingStyle; OpenCounter(+1); } return rc; } -/* -** Open a file descriptor to the directory containing file zFilename. -** If successful, *pFd is set to the opened file descriptor and -** SQLITE_OK is returned. If an error occurs, either SQLITE_NOMEM -** or SQLITE_CANTOPEN is returned and *pFd is set to an undefined -** value. -** -** If SQLITE_OK is returned, the caller is responsible for closing -** the file descriptor *pFd using close(). -*/ -static int openDirectory(const char *zFilename, int *pFd){ - int ii; - int fd = -1; - char zDirname[MAX_PATHNAME+1]; - - sqlite3_snprintf(MAX_PATHNAME, zDirname, "%s", zFilename); - for(ii=(int)strlen(zDirname); ii>1 && zDirname[ii]!='/'; ii--); - if( ii>0 ){ - zDirname[ii] = '\0'; - fd = robust_open(zDirname, O_RDONLY|O_BINARY, 0); - if( fd>=0 ){ -#ifdef FD_CLOEXEC - osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC); -#endif - OSTRACE(("OPENDIR %-3d %s\n", fd, zDirname)); - } - } - *pFd = fd; - return (fd>=0?SQLITE_OK:unixLogError(SQLITE_CANTOPEN_BKPT, "open", zDirname)); -} - /* ** Return the name of a directory in which to put temporary files. ** If no suitable temporary file directory can be found, return NULL. */ static const char *unixTempFileDir(void){ @@ -29245,11 +29391,11 @@ ** ignored and -1 is returned. The caller will try to open a new file ** descriptor on the same path, fail, and return an error to SQLite. ** ** Even if a subsequent open() call does succeed, the consequences of ** not searching for a resusable file descriptor are not dire. */ - if( 0==stat(zPath, &sStat) ){ + if( 0==osStat(zPath, &sStat) ){ unixInodeInfo *pInode; unixEnterMutex(); pInode = inodeList; while( pInode && (pInode->fileId.dev!=sStat.st_dev @@ -29321,11 +29467,11 @@ while( nDb>0 && zPath[nDb]!='-' ) nDb--; if( nDb==0 ) return SQLITE_OK; memcpy(zDb, zPath, nDb); zDb[nDb] = '\0'; - if( 0==stat(zDb, &sStat) ){ + if( 0==osStat(zDb, &sStat) ){ *pMode = sStat.st_mode & 0777; }else{ rc = SQLITE_IOERR_FSTAT; } }else if( flags & SQLITE_OPEN_DELETEONCLOSE ){ @@ -29363,11 +29509,10 @@ int flags, /* Input flags to control the opening */ int *pOutFlags /* Output flags returned to SQLite core */ ){ unixFile *p = (unixFile *)pFile; int fd = -1; /* File descriptor returned by open() */ - int dirfd = -1; /* Directory file descriptor */ int openFlags = 0; /* Flags to pass to open() */ int eType = flags&0xFFFFFF00; /* Type of file to open */ int noLock; /* True to omit locking primitives */ int rc = SQLITE_OK; /* Function Return Code */ @@ -29377,16 +29522,19 @@ int isReadonly = (flags & SQLITE_OPEN_READONLY); int isReadWrite = (flags & SQLITE_OPEN_READWRITE); #if SQLITE_ENABLE_LOCKING_STYLE int isAutoProxy = (flags & SQLITE_OPEN_AUTOPROXY); #endif +#if defined(__APPLE__) || SQLITE_ENABLE_LOCKING_STYLE + struct statfs fsInfo; +#endif /* If creating a master or main-file journal, this function will open ** a file-descriptor on the directory too. The first time unixSync() ** is called the directory file descriptor will be fsync()ed and close()d. */ - int isOpenDirectory = (isCreate && ( + int syncDir = (isCreate && ( eType==SQLITE_OPEN_MASTER_JOURNAL || eType==SQLITE_OPEN_MAIN_JOURNAL || eType==SQLITE_OPEN_WAL )); @@ -29436,11 +29584,11 @@ } } p->pUnused = pUnused; }else if( !zName ){ /* If zName is NULL, the upper layer is requesting a temp file. */ - assert(isDelete && !isOpenDirectory); + assert(isDelete && !syncDir); rc = unixGetTempname(MAX_PATHNAME+1, zTmpname); if( rc!=SQLITE_OK ){ return rc; } zName = zTmpname; @@ -29492,44 +29640,29 @@ if( isDelete ){ #if OS_VXWORKS zPath = zName; #else - unlink(zName); + osUnlink(zName); #endif } #if SQLITE_ENABLE_LOCKING_STYLE else{ p->openFlags = openFlags; } #endif - if( isOpenDirectory ){ - rc = openDirectory(zPath, &dirfd); - if( rc!=SQLITE_OK ){ - /* It is safe to close fd at this point, because it is guaranteed not - ** to be open on a database file. If it were open on a database file, - ** it would not be safe to close as this would release any locks held - ** on the file by this process. */ - assert( eType!=SQLITE_OPEN_MAIN_DB ); - robust_close(p, fd, __LINE__); - goto open_finished; - } - } - #ifdef FD_CLOEXEC osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC); #endif noLock = eType!=SQLITE_OPEN_MAIN_DB; #if defined(__APPLE__) || SQLITE_ENABLE_LOCKING_STYLE - struct statfs fsInfo; if( fstatfs(fd, &fsInfo) == -1 ){ ((unixFile*)pFile)->lastErrno = errno; - if( dirfd>=0 ) robust_close(p, dirfd, __LINE__); robust_close(p, fd, __LINE__); return SQLITE_IOERR_ACCESS; } if (0 == strncmp("msdos", fsInfo.f_fstypename, 5)) { ((unixFile*)pFile)->fsFlags |= SQLITE_FSFLAGS_IS_MSDOS; @@ -29547,31 +29680,27 @@ /* SQLITE_FORCE_PROXY_LOCKING==1 means force always use proxy, 0 means ** never use proxy, NULL means use proxy for non-local files only. */ if( envforce!=NULL ){ useProxy = atoi(envforce)>0; }else{ - struct statfs fsInfo; if( statfs(zPath, &fsInfo) == -1 ){ /* In theory, the close(fd) call is sub-optimal. If the file opened ** with fd is a database file, and there are other connections open ** on that file that are currently holding advisory locks on it, ** then the call to close() will cancel those locks. In practice, ** we're assuming that statfs() doesn't fail very often. At least ** not while other file descriptors opened by the same process on ** the same file are working. */ p->lastErrno = errno; - if( dirfd>=0 ){ - robust_close(p, dirfd, __LINE__); - } robust_close(p, fd, __LINE__); rc = SQLITE_IOERR_ACCESS; goto open_finished; } useProxy = !(fsInfo.f_flags&MNT_LOCAL); } if( useProxy ){ - rc = fillInUnixFile(pVfs, fd, dirfd, pFile, zPath, noLock, + rc = fillInUnixFile(pVfs, fd, syncDir, pFile, zPath, noLock, isDelete, isReadonly); if( rc==SQLITE_OK ){ rc = proxyTransformUnixFile((unixFile*)pFile, ":auto:"); if( rc!=SQLITE_OK ){ /* Use unixClose to clean up the resources added in fillInUnixFile @@ -29585,11 +29714,11 @@ goto open_finished; } } #endif - rc = fillInUnixFile(pVfs, fd, dirfd, pFile, zPath, noLock, + rc = fillInUnixFile(pVfs, fd, syncDir, pFile, zPath, noLock, isDelete, isReadonly); open_finished: if( rc!=SQLITE_OK ){ sqlite3_free(p->pUnused); } @@ -29607,17 +29736,17 @@ int dirSync /* If true, fsync() directory after deleting file */ ){ int rc = SQLITE_OK; UNUSED_PARAMETER(NotUsed); SimulateIOError(return SQLITE_IOERR_DELETE); - if( unlink(zPath)==(-1) && errno!=ENOENT ){ + if( osUnlink(zPath)==(-1) && errno!=ENOENT ){ return unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); } #ifndef SQLITE_DISABLE_DIRSYNC if( dirSync ){ int fd; - rc = openDirectory(zPath, &fd); + rc = osOpenDirectory(zPath, &fd); if( rc==SQLITE_OK ){ #if OS_VXWORKS if( fsync(fd)==-1 ) #else if( fsync(fd) ) @@ -29624,10 +29753,12 @@ #endif { rc = unixLogError(SQLITE_IOERR_DIR_FSYNC, "fsync", zPath); } robust_close(0, fd, __LINE__); + }else if( rc==SQLITE_CANTOPEN ){ + rc = SQLITE_OK; } } #endif return rc; } @@ -29666,11 +29797,11 @@ assert(!"Invalid flags argument"); } *pResOut = (osAccess(zPath, amode)==0); if( flags==SQLITE_ACCESS_EXISTS && *pResOut ){ struct stat buf; - if( 0==stat(zPath, &buf) && buf.st_size==0 ){ + if( 0==osStat(zPath, &buf) && buf.st_size==0 ){ *pResOut = 0; } } return SQLITE_OK; } @@ -30185,11 +30316,10 @@ const char *path, /* path for the new unixFile */ unixFile **ppFile, /* unixFile created and returned by ref */ int islockfile /* if non zero missing dirs will be created */ ) { int fd = -1; - int dirfd = -1; unixFile *pNew; int rc = SQLITE_OK; int openFlags = O_RDWR | O_CREAT; sqlite3_vfs dummyVfs; int terrno = 0; @@ -30250,11 +30380,11 @@ dummyVfs.zName = "dummy"; pUnused->fd = fd; pUnused->flags = openFlags; pNew->pUnused = pUnused; - rc = fillInUnixFile(&dummyVfs, fd, dirfd, (sqlite3_file*)pNew, path, 0, 0, 0); + rc = fillInUnixFile(&dummyVfs, fd, 0, (sqlite3_file*)pNew, path, 0, 0, 0); if( rc==SQLITE_OK ){ *ppFile = pNew; return SQLITE_OK; } end_create_proxy: @@ -30290,10 +30420,12 @@ *pError = err; } return SQLITE_IOERR; } } +#else + UNUSED_PARAMETER(pError); #endif #ifdef SQLITE_TEST /* simulate multiple hosts by creating unique hostid file paths */ if( sqlite3_hostid_num != 0){ pHostID[0] = (char)(pHostID[0] + (char)(sqlite3_hostid_num & 0xFF)); @@ -30364,11 +30496,11 @@ conchFile->openFlags = O_RDWR | O_CREAT; end_breaklock: if( rc ){ if( fd>=0 ){ - unlink(tPath); + osUnlink(tPath); robust_close(pFile, fd, __LINE__); } fprintf(stderr, "failed to break stale lock on %s, %s\n", cPath, errmsg); } return rc; @@ -30382,10 +30514,11 @@ unixFile *conchFile = pCtx->conchFile; int rc = SQLITE_OK; int nTries = 0; struct timespec conchModTime; + memset(&conchModTime, 0, sizeof(conchModTime)); do { rc = conchFile->pMethod->xLock((sqlite3_file*)conchFile, lockType); nTries ++; if( rc==SQLITE_BUSY ){ /* If the lock failed (busy): @@ -30613,15 +30746,16 @@ conchFile->pMethod->xUnlock((sqlite3_file*)conchFile, SHARED_LOCK); end_takeconch: OSTRACE(("TRANSPROXY: CLOSE %d\n", pFile->h)); if( rc==SQLITE_OK && pFile->openFlags ){ + int fd; if( pFile->h>=0 ){ robust_close(pFile, pFile->h, __LINE__); } pFile->h = -1; - int fd = robust_open(pCtx->dbPath, pFile->openFlags, + fd = robust_open(pCtx->dbPath, pFile->openFlags, SQLITE_DEFAULT_FILE_PERMISSIONS); OSTRACE(("TRANSPROXY: OPEN %d\n", fd)); if( fd>=0 ){ pFile->h = fd; }else{ @@ -31187,11 +31321,11 @@ }; unsigned int i; /* Loop counter */ /* Double-check that the aSyscall[] array has been constructed ** correctly. See ticket [bb3a86e890c8e96ab] */ - assert( ArraySize(aSyscall)==16 ); + assert( ArraySize(aSyscall)==18 ); /* Register all VFSes defined in the aVfs[] array */ for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){ sqlite3_vfs_register(&aVfs[i], i==0); } @@ -31303,15 +31437,18 @@ */ #ifdef MEMORY_DEBUG # error "The MEMORY_DEBUG macro is obsolete. Use SQLITE_DEBUG instead." #endif -#ifdef SQLITE_DEBUG -SQLITE_PRIVATE int sqlite3OSTrace = 0; -#define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X +#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) +# ifndef SQLITE_DEBUG_OS_TRACE +# define SQLITE_DEBUG_OS_TRACE 0 +# endif + int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE; +# define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X #else -#define OSTRACE(X) +# define OSTRACE(X) #endif /* ** Macros for performance tracing. Normally turned off. Only works ** on i486 hardware. @@ -31519,12 +31656,13 @@ typedef struct winFile winFile; struct winFile { const sqlite3_io_methods *pMethod; /*** Must be first ***/ sqlite3_vfs *pVfs; /* The VFS used to open this file */ HANDLE h; /* Handle for accessing the file */ - unsigned char locktype; /* Type of lock currently held on this file */ + u8 locktype; /* Type of lock currently held on this file */ short sharedLockByte; /* Randomly chosen byte used as a shared lock */ + u8 bPersistWal; /* True to persist WAL files */ DWORD lastErrno; /* The Windows errno from the last I/O error */ DWORD sectorSize; /* Sector size of the device file is on */ winShm *pShm; /* Instance of shared memory on this file */ const char *zPath; /* Full pathname of this file */ int szChunk; /* Chunk size configured by FCNTL_CHUNK_SIZE */ @@ -31535,10 +31673,80 @@ winceLock local; /* Locks obtained by this instance of winFile */ winceLock *shared; /* Global shared lock memory for the file */ #endif }; +/* + * If compiled with SQLITE_WIN32_MALLOC on Windows, we will use the + * various Win32 API heap functions instead of our own. + */ +#ifdef SQLITE_WIN32_MALLOC +/* + * The initial size of the Win32-specific heap. This value may be zero. + */ +#ifndef SQLITE_WIN32_HEAP_INIT_SIZE +# define SQLITE_WIN32_HEAP_INIT_SIZE ((SQLITE_DEFAULT_CACHE_SIZE) * \ + (SQLITE_DEFAULT_PAGE_SIZE) + 4194304) +#endif + +/* + * The maximum size of the Win32-specific heap. This value may be zero. + */ +#ifndef SQLITE_WIN32_HEAP_MAX_SIZE +# define SQLITE_WIN32_HEAP_MAX_SIZE (0) +#endif + +/* + * The extra flags to use in calls to the Win32 heap APIs. This value may be + * zero for the default behavior. + */ +#ifndef SQLITE_WIN32_HEAP_FLAGS +# define SQLITE_WIN32_HEAP_FLAGS (0) +#endif + +/* +** The winMemData structure stores information required by the Win32-specific +** sqlite3_mem_methods implementation. +*/ +typedef struct winMemData winMemData; +struct winMemData { +#ifndef NDEBUG + u32 magic; /* Magic number to detect structure corruption. */ +#endif + HANDLE hHeap; /* The handle to our heap. */ + BOOL bOwned; /* Do we own the heap (i.e. destroy it on shutdown)? */ +}; + +#ifndef NDEBUG +#define WINMEM_MAGIC 0x42b2830b +#endif + +static struct winMemData win_mem_data = { +#ifndef NDEBUG + WINMEM_MAGIC, +#endif + NULL, FALSE +}; + +#ifndef NDEBUG +#define winMemAssertMagic() assert( win_mem_data.magic==WINMEM_MAGIC ) +#else +#define winMemAssertMagic() +#endif + +#define winMemGetHeap() win_mem_data.hHeap + +static void *winMemMalloc(int nBytes); +static void winMemFree(void *pPrior); +static void *winMemRealloc(void *pPrior, int nBytes); +static int winMemSize(void *p); +static int winMemRoundup(int n); +static int winMemInit(void *pAppData); +static void winMemShutdown(void *pAppData); + +SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetWin32(void); +#endif /* SQLITE_WIN32_MALLOC */ /* ** Forward prototypes. */ static int getSectorSize( @@ -31587,10 +31795,192 @@ } return sqlite3_os_type==2; } #endif /* SQLITE_OS_WINCE */ +#ifdef SQLITE_WIN32_MALLOC +/* +** Allocate nBytes of memory. +*/ +static void *winMemMalloc(int nBytes){ + HANDLE hHeap; + void *p; + + winMemAssertMagic(); + hHeap = winMemGetHeap(); + assert( hHeap!=0 ); + assert( hHeap!=INVALID_HANDLE_VALUE ); +#ifdef SQLITE_WIN32_MALLOC_VALIDATE + assert ( HeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) ); +#endif + assert( nBytes>=0 ); + p = HeapAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, (SIZE_T)nBytes); + if( !p ){ + sqlite3_log(SQLITE_NOMEM, "failed to HeapAlloc %u bytes (%d), heap=%p", + nBytes, GetLastError(), (void*)hHeap); + } + return p; +} + +/* +** Free memory. +*/ +static void winMemFree(void *pPrior){ + HANDLE hHeap; + + winMemAssertMagic(); + hHeap = winMemGetHeap(); + assert( hHeap!=0 ); + assert( hHeap!=INVALID_HANDLE_VALUE ); +#ifdef SQLITE_WIN32_MALLOC_VALIDATE + assert ( HeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) ); +#endif + if( !pPrior ) return; /* Passing NULL to HeapFree is undefined. */ + if( !HeapFree(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) ){ + sqlite3_log(SQLITE_NOMEM, "failed to HeapFree block %p (%d), heap=%p", + pPrior, GetLastError(), (void*)hHeap); + } +} + +/* +** Change the size of an existing memory allocation +*/ +static void *winMemRealloc(void *pPrior, int nBytes){ + HANDLE hHeap; + void *p; + + winMemAssertMagic(); + hHeap = winMemGetHeap(); + assert( hHeap!=0 ); + assert( hHeap!=INVALID_HANDLE_VALUE ); +#ifdef SQLITE_WIN32_MALLOC_VALIDATE + assert ( HeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) ); +#endif + assert( nBytes>=0 ); + if( !pPrior ){ + p = HeapAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, (SIZE_T)nBytes); + }else{ + p = HeapReAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior, (SIZE_T)nBytes); + } + if( !p ){ + sqlite3_log(SQLITE_NOMEM, "failed to %s %u bytes (%d), heap=%p", + pPrior ? "HeapReAlloc" : "HeapAlloc", nBytes, GetLastError(), + (void*)hHeap); + } + return p; +} + +/* +** Return the size of an outstanding allocation, in bytes. +*/ +static int winMemSize(void *p){ + HANDLE hHeap; + SIZE_T n; + + winMemAssertMagic(); + hHeap = winMemGetHeap(); + assert( hHeap!=0 ); + assert( hHeap!=INVALID_HANDLE_VALUE ); +#ifdef SQLITE_WIN32_MALLOC_VALIDATE + assert ( HeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) ); +#endif + if( !p ) return 0; + n = HeapSize(hHeap, SQLITE_WIN32_HEAP_FLAGS, p); + if( n==(SIZE_T)-1 ){ + sqlite3_log(SQLITE_NOMEM, "failed to HeapSize block %p (%d), heap=%p", + p, GetLastError(), (void*)hHeap); + return 0; + } + return (int)n; +} + +/* +** Round up a request size to the next valid allocation size. +*/ +static int winMemRoundup(int n){ + return n; +} + +/* +** Initialize this module. +*/ +static int winMemInit(void *pAppData){ + winMemData *pWinMemData = (winMemData *)pAppData; + + if( !pWinMemData ) return SQLITE_ERROR; + assert( pWinMemData->magic==WINMEM_MAGIC ); + if( !pWinMemData->hHeap ){ + pWinMemData->hHeap = HeapCreate(SQLITE_WIN32_HEAP_FLAGS, + SQLITE_WIN32_HEAP_INIT_SIZE, + SQLITE_WIN32_HEAP_MAX_SIZE); + if( !pWinMemData->hHeap ){ + sqlite3_log(SQLITE_NOMEM, + "failed to HeapCreate (%d), flags=%u, initSize=%u, maxSize=%u", + GetLastError(), SQLITE_WIN32_HEAP_FLAGS, SQLITE_WIN32_HEAP_INIT_SIZE, + SQLITE_WIN32_HEAP_MAX_SIZE); + return SQLITE_NOMEM; + } + pWinMemData->bOwned = TRUE; + } + assert( pWinMemData->hHeap!=0 ); + assert( pWinMemData->hHeap!=INVALID_HANDLE_VALUE ); +#ifdef SQLITE_WIN32_MALLOC_VALIDATE + assert( HeapValidate(pWinMemData->hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) ); +#endif + return SQLITE_OK; +} + +/* +** Deinitialize this module. +*/ +static void winMemShutdown(void *pAppData){ + winMemData *pWinMemData = (winMemData *)pAppData; + + if( !pWinMemData ) return; + if( pWinMemData->hHeap ){ + assert( pWinMemData->hHeap!=INVALID_HANDLE_VALUE ); +#ifdef SQLITE_WIN32_MALLOC_VALIDATE + assert( HeapValidate(pWinMemData->hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) ); +#endif + if( pWinMemData->bOwned ){ + if( !HeapDestroy(pWinMemData->hHeap) ){ + sqlite3_log(SQLITE_NOMEM, "failed to HeapDestroy (%d), heap=%p", + GetLastError(), (void*)pWinMemData->hHeap); + } + pWinMemData->bOwned = FALSE; + } + pWinMemData->hHeap = NULL; + } +} + +/* +** Populate the low-level memory allocation function pointers in +** sqlite3GlobalConfig.m with pointers to the routines in this file. The +** arguments specify the block of memory to manage. +** +** This routine is only called by sqlite3_config(), and therefore +** is not required to be threadsafe (it is not). +*/ +SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetWin32(void){ + static const sqlite3_mem_methods winMemMethods = { + winMemMalloc, + winMemFree, + winMemRealloc, + winMemSize, + winMemRoundup, + winMemInit, + winMemShutdown, + &win_mem_data + }; + return &winMemMethods; +} + +SQLITE_PRIVATE void sqlite3MemSetDefault(void){ + sqlite3_config(SQLITE_CONFIG_MALLOC, sqlite3MemGetWin32()); +} +#endif /* SQLITE_WIN32_MALLOC */ + /* ** Convert a UTF-8 string to microsoft unicode (UTF-16?). ** ** Space to hold the returned string is obtained from malloc. */ @@ -31818,19 +32208,68 @@ iLine, iErrno, zFunc, zPath, zMsg ); return errcode; } + +/* +** The number of times that a ReadFile(), WriteFile(), and DeleteFile() +** will be retried following a locking error - probably caused by +** antivirus software. Also the initial delay before the first retry. +** The delay increases linearly with each retry. +*/ +#ifndef SQLITE_WIN32_IOERR_RETRY +# define SQLITE_WIN32_IOERR_RETRY 10 +#endif +#ifndef SQLITE_WIN32_IOERR_RETRY_DELAY +# define SQLITE_WIN32_IOERR_RETRY_DELAY 25 +#endif +static int win32IoerrRetry = SQLITE_WIN32_IOERR_RETRY; +static int win32IoerrRetryDelay = SQLITE_WIN32_IOERR_RETRY_DELAY; + +/* +** If a ReadFile() or WriteFile() error occurs, invoke this routine +** to see if it should be retried. Return TRUE to retry. Return FALSE +** to give up with an error. +*/ +static int retryIoerr(int *pnRetry){ + DWORD e; + if( *pnRetry>=win32IoerrRetry ){ + return 0; + } + e = GetLastError(); + if( e==ERROR_ACCESS_DENIED || + e==ERROR_LOCK_VIOLATION || + e==ERROR_SHARING_VIOLATION ){ + Sleep(win32IoerrRetryDelay*(1+*pnRetry)); + ++*pnRetry; + return 1; + } + return 0; +} + +/* +** Log a I/O error retry episode. +*/ +static void logIoerr(int nRetry){ + if( nRetry ){ + sqlite3_log(SQLITE_IOERR, + "delayed %dms for lock/sharing conflict", + win32IoerrRetryDelay*nRetry*(nRetry+1)/2 + ); + } +} #if SQLITE_OS_WINCE /************************************************************************* ** This section contains code for WinCE only. */ /* ** WindowsCE does not have a localtime() function. So create a ** substitute. */ +/* #include */ struct tm *__cdecl localtime(const time_t *t) { static struct tm y; FILETIME uTm, lTm; SYSTEMTIME pTm; @@ -32236,22 +32675,25 @@ int amt, /* Number of bytes to read */ sqlite3_int64 offset /* Begin reading at this offset */ ){ winFile *pFile = (winFile*)id; /* file handle */ DWORD nRead; /* Number of bytes actually read from file */ + int nRetry = 0; /* Number of retrys */ assert( id!=0 ); SimulateIOError(return SQLITE_IOERR_READ); OSTRACE(("READ %d lock=%d\n", pFile->h, pFile->locktype)); if( seekWinFile(pFile, offset) ){ return SQLITE_FULL; } - if( !ReadFile(pFile->h, pBuf, amt, &nRead, 0) ){ + while( !ReadFile(pFile->h, pBuf, amt, &nRead, 0) ){ + if( retryIoerr(&nRetry) ) continue; pFile->lastErrno = GetLastError(); return winLogError(SQLITE_IOERR_READ, "winRead", pFile->zPath); } + logIoerr(nRetry); if( nRead<(DWORD)amt ){ /* Unread parts of the buffer must be zero-filled */ memset(&((char*)pBuf)[nRead], 0, amt-nRead); return SQLITE_IOERR_SHORT_READ; } @@ -32269,10 +32711,11 @@ int amt, /* Number of bytes to write */ sqlite3_int64 offset /* Offset into the file to begin writing at */ ){ int rc; /* True if error has occured, else false */ winFile *pFile = (winFile*)id; /* File handle */ + int nRetry = 0; /* Number of retries */ assert( amt>0 ); assert( pFile ); SimulateIOError(return SQLITE_IOERR_WRITE); SimulateDiskfullError(return SQLITE_FULL); @@ -32283,11 +32726,16 @@ if( rc==0 ){ u8 *aRem = (u8 *)pBuf; /* Data yet to be written */ int nRem = amt; /* Number of bytes yet to be written */ DWORD nWrite; /* Bytes written by each WriteFile() call */ - while( nRem>0 && WriteFile(pFile->h, aRem, nRem, &nWrite, 0) && nWrite>0 ){ + while( nRem>0 ){ + if( !WriteFile(pFile->h, aRem, nRem, &nWrite, 0) ){ + if( retryIoerr(&nRetry) ) continue; + break; + } + if( nWrite<=0 ) break; aRem += nWrite; nRem -= nWrite; } if( nRem>0 ){ pFile->lastErrno = GetLastError(); @@ -32299,10 +32747,12 @@ if( ( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ) || ( pFile->lastErrno==ERROR_DISK_FULL )){ return SQLITE_FULL; } return winLogError(SQLITE_IOERR_WRITE, "winWrite", pFile->zPath); + }else{ + logIoerr(nRetry); } return SQLITE_OK; } /* @@ -32320,11 +32770,11 @@ /* If the user has configured a chunk-size for this file, truncate the ** file so that it consists of an integer number of chunks (i.e. the ** actual file size after the operation may be larger than the requested ** size). */ - if( pFile->szChunk ){ + if( pFile->szChunk>0 ){ nByte = ((nByte + pFile->szChunk - 1)/pFile->szChunk) * pFile->szChunk; } /* SetEndOfFile() returns non-zero when successful, or zero when it fails. */ if( seekWinFile(pFile, nByte) ){ @@ -32349,13 +32799,23 @@ /* ** Make sure all writes to a particular file are committed to disk. */ static int winSync(sqlite3_file *id, int flags){ -#if !defined(NDEBUG) || !defined(SQLITE_NO_SYNC) || defined(SQLITE_DEBUG) - winFile *pFile = (winFile*)id; +#ifndef SQLITE_NO_SYNC + /* + ** Used only when SQLITE_NO_SYNC is not defined. + */ BOOL rc; +#endif +#if !defined(NDEBUG) || !defined(SQLITE_NO_SYNC) || \ + (defined(SQLITE_TEST) && defined(SQLITE_DEBUG)) + /* + ** Used when SQLITE_NO_SYNC is not defined and by the assert() and/or + ** OSTRACE() macros. + */ + winFile *pFile = (winFile*)id; #else UNUSED_PARAMETER(id); #endif assert( pFile ); @@ -32692,32 +33152,65 @@ /* ** Control and query of the open file handle. */ static int winFileControl(sqlite3_file *id, int op, void *pArg){ + winFile *pFile = (winFile*)id; switch( op ){ case SQLITE_FCNTL_LOCKSTATE: { - *(int*)pArg = ((winFile*)id)->locktype; + *(int*)pArg = pFile->locktype; return SQLITE_OK; } case SQLITE_LAST_ERRNO: { - *(int*)pArg = (int)((winFile*)id)->lastErrno; + *(int*)pArg = (int)pFile->lastErrno; return SQLITE_OK; } case SQLITE_FCNTL_CHUNK_SIZE: { - ((winFile*)id)->szChunk = *(int *)pArg; + pFile->szChunk = *(int *)pArg; return SQLITE_OK; } case SQLITE_FCNTL_SIZE_HINT: { - sqlite3_int64 sz = *(sqlite3_int64*)pArg; - SimulateIOErrorBenign(1); - winTruncate(id, sz); - SimulateIOErrorBenign(0); + if( pFile->szChunk>0 ){ + sqlite3_int64 oldSz; + int rc = winFileSize(id, &oldSz); + if( rc==SQLITE_OK ){ + sqlite3_int64 newSz = *(sqlite3_int64*)pArg; + if( newSz>oldSz ){ + SimulateIOErrorBenign(1); + rc = winTruncate(id, newSz); + SimulateIOErrorBenign(0); + } + } + return rc; + } + return SQLITE_OK; + } + case SQLITE_FCNTL_PERSIST_WAL: { + int bPersist = *(int*)pArg; + if( bPersist<0 ){ + *(int*)pArg = pFile->bPersistWal; + }else{ + pFile->bPersistWal = bPersist!=0; + } return SQLITE_OK; } case SQLITE_FCNTL_SYNC_OMITTED: { return SQLITE_OK; + } + case SQLITE_FCNTL_WIN32_AV_RETRY: { + int *a = (int*)pArg; + if( a[0]>0 ){ + win32IoerrRetry = a[0]; + }else{ + a[0] = win32IoerrRetry; + } + if( a[1]>0 ){ + win32IoerrRetryDelay = a[1]; + }else{ + a[1] = win32IoerrRetryDelay; + } + return SQLITE_OK; } } return SQLITE_NOTFOUND; } @@ -33523,10 +34016,11 @@ int isTemp = 0; #endif winFile *pFile = (winFile*)id; void *zConverted; /* Filename in OS encoding */ const char *zUtf8Name = zName; /* Filename in UTF-8 encoding */ + int cnt = 0; /* If argument zPath is a NULL pointer, this function is required to open ** a temporary file. Use this buffer to store the file name in. */ char zTmpname[MAX_PATH+1]; /* Buffer used to create temp filename */ @@ -33642,34 +34136,34 @@ #if SQLITE_OS_WINCE dwFlagsAndAttributes |= FILE_FLAG_RANDOM_ACCESS; #endif if( isNT() ){ - h = CreateFileW((WCHAR*)zConverted, - dwDesiredAccess, - dwShareMode, - NULL, - dwCreationDisposition, - dwFlagsAndAttributes, - NULL - ); + while( (h = CreateFileW((WCHAR*)zConverted, + dwDesiredAccess, + dwShareMode, NULL, + dwCreationDisposition, + dwFlagsAndAttributes, + NULL))==INVALID_HANDLE_VALUE && + retryIoerr(&cnt) ){} /* isNT() is 1 if SQLITE_OS_WINCE==1, so this else is never executed. ** Since the ASCII version of these Windows API do not exist for WINCE, ** it's important to not reference them for WINCE builds. */ #if SQLITE_OS_WINCE==0 }else{ - h = CreateFileA((char*)zConverted, - dwDesiredAccess, - dwShareMode, - NULL, - dwCreationDisposition, - dwFlagsAndAttributes, - NULL - ); + while( (h = CreateFileA((char*)zConverted, + dwDesiredAccess, + dwShareMode, NULL, + dwCreationDisposition, + dwFlagsAndAttributes, + NULL))==INVALID_HANDLE_VALUE && + retryIoerr(&cnt) ){} #endif } + + logIoerr(cnt); OSTRACE(("OPEN %d %s 0x%lx %s\n", h, zName, dwDesiredAccess, h==INVALID_HANDLE_VALUE ? "failed" : "ok")); @@ -33732,19 +34226,17 @@ ** file open, we will be unable to delete it. To work around this ** problem, we delay 100 milliseconds and try to delete again. Up ** to MX_DELETION_ATTEMPTs deletion attempts are run before giving ** up and returning an error. */ -#define MX_DELETION_ATTEMPTS 5 static int winDelete( sqlite3_vfs *pVfs, /* Not used on win32 */ const char *zFilename, /* Name of file to delete */ int syncDir /* Not used on win32 */ ){ int cnt = 0; - DWORD rc; - DWORD error = 0; + int rc; void *zConverted; UNUSED_PARAMETER(pVfs); UNUSED_PARAMETER(syncDir); SimulateIOError(return SQLITE_IOERR_DELETE); @@ -33751,38 +34243,34 @@ zConverted = convertUtf8Filename(zFilename); if( zConverted==0 ){ return SQLITE_NOMEM; } if( isNT() ){ - do{ - DeleteFileW(zConverted); - }while( ( ((rc = GetFileAttributesW(zConverted)) != INVALID_FILE_ATTRIBUTES) - || ((error = GetLastError()) == ERROR_ACCESS_DENIED)) - && (++cnt < MX_DELETION_ATTEMPTS) - && (Sleep(100), 1) ); + rc = 1; + while( GetFileAttributesW(zConverted)!=INVALID_FILE_ATTRIBUTES && + (rc = DeleteFileW(zConverted))==0 && retryIoerr(&cnt) ){} + rc = rc ? SQLITE_OK : SQLITE_ERROR; /* isNT() is 1 if SQLITE_OS_WINCE==1, so this else is never executed. ** Since the ASCII version of these Windows API do not exist for WINCE, ** it's important to not reference them for WINCE builds. */ #if SQLITE_OS_WINCE==0 }else{ - do{ - DeleteFileA(zConverted); - }while( ( ((rc = GetFileAttributesA(zConverted)) != INVALID_FILE_ATTRIBUTES) - || ((error = GetLastError()) == ERROR_ACCESS_DENIED)) - && (++cnt < MX_DELETION_ATTEMPTS) - && (Sleep(100), 1) ); + rc = 1; + while( GetFileAttributesA(zConverted)!=INVALID_FILE_ATTRIBUTES && + (rc = DeleteFileA(zConverted))==0 && retryIoerr(&cnt) ){} + rc = rc ? SQLITE_OK : SQLITE_ERROR; #endif } + if( rc ){ + rc = winLogError(SQLITE_IOERR_DELETE, "winDelete", zFilename); + }else{ + logIoerr(cnt); + } free(zConverted); - OSTRACE(("DELETE \"%s\" %s\n", zFilename, - ( (rc==INVALID_FILE_ATTRIBUTES) && (error==ERROR_FILE_NOT_FOUND)) ? - "ok" : "failed" )); - - return ( (rc == INVALID_FILE_ATTRIBUTES) - && (error == ERROR_FILE_NOT_FOUND)) ? SQLITE_OK : - winLogError(SQLITE_IOERR_DELETE, "winDelete", zFilename); + OSTRACE(("DELETE \"%s\" %s\n", zFilename, (rc ? "failed" : "ok" ))); + return rc; } /* ** Check the existance and status of a file. */ @@ -33801,15 +34289,17 @@ zConverted = convertUtf8Filename(zFilename); if( zConverted==0 ){ return SQLITE_NOMEM; } if( isNT() ){ + int cnt = 0; WIN32_FILE_ATTRIBUTE_DATA sAttrData; memset(&sAttrData, 0, sizeof(sAttrData)); - if( GetFileAttributesExW((WCHAR*)zConverted, + while( !(rc = GetFileAttributesExW((WCHAR*)zConverted, GetFileExInfoStandard, - &sAttrData) ){ + &sAttrData)) && retryIoerr(&cnt) ){} + if( rc ){ /* For an SQLITE_ACCESS_EXISTS query, treat a zero-length file ** as if it does not exist. */ if( flags==SQLITE_ACCESS_EXISTS && sAttrData.nFileSizeHigh==0 @@ -33817,10 +34307,11 @@ attr = INVALID_FILE_ATTRIBUTES; }else{ attr = sAttrData.dwFileAttributes; } }else{ + logIoerr(cnt); if( GetLastError()!=ERROR_FILE_NOT_FOUND ){ winLogError(SQLITE_IOERR_ACCESS, "winAccess", zFilename); free(zConverted); return SQLITE_IOERR_ACCESS; }else{ @@ -33841,11 +34332,12 @@ case SQLITE_ACCESS_READ: case SQLITE_ACCESS_EXISTS: rc = attr!=INVALID_FILE_ATTRIBUTES; break; case SQLITE_ACCESS_READWRITE: - rc = (attr & FILE_ATTRIBUTE_READONLY)==0; + rc = attr!=INVALID_FILE_ATTRIBUTES && + (attr & FILE_ATTRIBUTE_READONLY)==0; break; default: assert(!"Invalid flags argument"); } *pResOut = rc; @@ -35297,10 +35789,13 @@ typedef struct PCache1 PCache1; typedef struct PgHdr1 PgHdr1; typedef struct PgFreeslot PgFreeslot; typedef struct PGroup PGroup; +typedef struct PGroupBlock PGroupBlock; +typedef struct PGroupBlockList PGroupBlockList; + /* Each page cache (or PCache) belongs to a PGroup. A PGroup is a set ** of one or more PCaches that are able to recycle each others unpinned ** pages when they are under memory pressure. A PGroup is an instance of ** the following object. ** @@ -35326,12 +35821,70 @@ int nMaxPage; /* Sum of nMax for purgeable caches */ int nMinPage; /* Sum of nMin for purgeable caches */ int mxPinned; /* nMaxpage + 10 - nMinPage */ int nCurrentPage; /* Number of purgeable pages allocated */ PgHdr1 *pLruHead, *pLruTail; /* LRU list of unpinned pages */ +#ifdef SQLITE_PAGECACHE_BLOCKALLOC + int isBusy; /* Do not run ReleaseMemory() if true */ + PGroupBlockList *pBlockList; /* List of block-lists for this group */ +#endif }; +/* +** If SQLITE_PAGECACHE_BLOCKALLOC is defined when the library is built, +** each PGroup structure has a linked list of the the following starting +** at PGroup.pBlockList. There is one entry for each distinct page-size +** currently used by members of the PGroup (i.e. 1024 bytes, 4096 bytes +** etc.). Variable PGroupBlockList.nByte is set to the actual allocation +** size requested by each pcache, which is the database page-size plus +** the various header structures used by the pcache, pager and btree layers. +** Usually around (pgsz+200) bytes. +** +** This size (pgsz+200) bytes is not allocated efficiently by some +** implementations of malloc. In particular, some implementations are only +** able to allocate blocks of memory chunks of 2^N bytes, where N is some +** integer value. Since the page-size is a power of 2, this means we +** end up wasting (pgsz-200) bytes in each allocation. +** +** If SQLITE_PAGECACHE_BLOCKALLOC is defined, the (pgsz+200) byte blocks +** are not allocated directly. Instead, blocks of roughly M*(pgsz+200) bytes +** are requested from malloc allocator. After a block is returned, +** sqlite3MallocSize() is used to determine how many (pgsz+200) byte +** allocations can fit in the space returned by malloc(). This value may +** be more than M. +** +** The blocks are stored in a doubly-linked list. Variable PGroupBlock.nEntry +** contains the number of allocations that will fit in the aData[] space. +** nEntry is limited to the number of bits in bitmask mUsed. If a slot +** within aData is in use, the corresponding bit in mUsed is set. Thus +** when (mUsed+1==(1 << nEntry)) the block is completely full. +** +** Each time a slot within a block is freed, the block is moved to the start +** of the linked-list. And if a block becomes completely full, then it is +** moved to the end of the list. As a result, when searching for a free +** slot, only the first block in the list need be examined. If it is full, +** then it is guaranteed that all blocks are full. +*/ +struct PGroupBlockList { + int nByte; /* Size of each allocation in bytes */ + PGroupBlock *pFirst; /* First PGroupBlock in list */ + PGroupBlock *pLast; /* Last PGroupBlock in list */ + PGroupBlockList *pNext; /* Next block-list attached to group */ +}; + +struct PGroupBlock { + Bitmask mUsed; /* Mask of used slots */ + int nEntry; /* Maximum number of allocations in aData[] */ + u8 *aData; /* Pointer to data block */ + PGroupBlock *pNext; /* Next PGroupBlock in list */ + PGroupBlock *pPrev; /* Previous PGroupBlock in list */ + PGroupBlockList *pList; /* Owner list */ +}; + +/* Minimum value for PGroupBlock.nEntry */ +#define PAGECACHE_BLOCKALLOC_MINENTRY 15 + /* Each page cache is an instance of the following object. Every ** open database file (including each in-memory database and each ** temporary or transient database) has a single page cache which ** is an instance of this object. ** @@ -35430,10 +35983,21 @@ ** ** assert( PGHDR1_TO_PAGE(PAGE_TO_PGHDR1(pCache, X))==X ); */ #define PGHDR1_TO_PAGE(p) (void*)(((char*)p) - p->pCache->szPage) #define PAGE_TO_PGHDR1(c, p) (PgHdr1*)(((char*)p) + c->szPage) + +/* +** Blocks used by the SQLITE_PAGECACHE_BLOCKALLOC blocks to store/retrieve +** a PGroupBlock pointer based on a pointer to a page buffer. +*/ +#define PAGE_SET_BLOCKPTR(pCache, pPg, pBlock) \ + ( *(PGroupBlock **)&(((u8*)pPg)[sizeof(PgHdr1) + pCache->szPage]) = pBlock ) + +#define PAGE_GET_BLOCKPTR(pCache, pPg) \ + ( *(PGroupBlock **)&(((u8*)pPg)[sizeof(PgHdr1) + pCache->szPage]) ) + /* ** Macros to enter and leave the PCache LRU mutex. */ #define pcache1EnterMutex(X) sqlite3_mutex_enter((X)->mutex) @@ -35556,25 +36120,159 @@ return iSize; } } #endif /* SQLITE_ENABLE_MEMORY_MANAGEMENT */ +#ifdef SQLITE_PAGECACHE_BLOCKALLOC +/* +** The block pBlock belongs to list pList but is not currently linked in. +** Insert it into the start of the list. +*/ +static void addBlockToList(PGroupBlockList *pList, PGroupBlock *pBlock){ + pBlock->pPrev = 0; + pBlock->pNext = pList->pFirst; + pList->pFirst = pBlock; + if( pBlock->pNext ){ + pBlock->pNext->pPrev = pBlock; + }else{ + assert( pList->pLast==0 ); + pList->pLast = pBlock; + } +} + +/* +** If there are no blocks in the list headed by pList, remove pList +** from the pGroup->pBlockList list and free it with sqlite3_free(). +*/ +static void freeListIfEmpty(PGroup *pGroup, PGroupBlockList *pList){ + assert( sqlite3_mutex_held(pGroup->mutex) ); + if( pList->pFirst==0 ){ + PGroupBlockList **pp; + for(pp=&pGroup->pBlockList; *pp!=pList; pp=&(*pp)->pNext); + *pp = (*pp)->pNext; + sqlite3_free(pList); + } +} +#endif /* SQLITE_PAGECACHE_BLOCKALLOC */ + /* ** Allocate a new page object initially associated with cache pCache. */ static PgHdr1 *pcache1AllocPage(PCache1 *pCache){ int nByte = sizeof(PgHdr1) + pCache->szPage; - void *pPg = pcache1Alloc(nByte); + void *pPg = 0; PgHdr1 *p; + +#ifdef SQLITE_PAGECACHE_BLOCKALLOC + PGroup *pGroup = pCache->pGroup; + PGroupBlockList *pList; + PGroupBlock *pBlock; + int i; + + nByte += sizeof(PGroupBlockList *); + nByte = ROUND8(nByte); + + for(pList=pGroup->pBlockList; pList; pList=pList->pNext){ + if( pList->nByte==nByte ) break; + } + if( pList==0 ){ + PGroupBlockList *pNew; + assert( pGroup->isBusy==0 ); + assert( sqlite3_mutex_held(pGroup->mutex) ); + pGroup->isBusy = 1; /* Disable sqlite3PcacheReleaseMemory() */ + pNew = (PGroupBlockList *)sqlite3MallocZero(sizeof(PGroupBlockList)); + pGroup->isBusy = 0; /* Reenable sqlite3PcacheReleaseMemory() */ + if( pNew==0 ){ + /* malloc() failure. Return early. */ + return 0; + } +#ifdef SQLITE_DEBUG + for(pList=pGroup->pBlockList; pList; pList=pList->pNext){ + assert( pList->nByte!=nByte ); + } +#endif + pNew->nByte = nByte; + pNew->pNext = pGroup->pBlockList; + pGroup->pBlockList = pNew; + pList = pNew; + } + + pBlock = pList->pFirst; + if( pBlock==0 || pBlock->mUsed==(((Bitmask)1<nEntry)-1) ){ + int sz; + + /* Allocate a new block. Try to allocate enough space for the PGroupBlock + ** structure and MINENTRY allocations of nByte bytes each. If the + ** allocator returns more memory than requested, then more than MINENTRY + ** allocations may fit in it. */ + assert( sqlite3_mutex_held(pGroup->mutex) ); + pcache1LeaveMutex(pCache->pGroup); + sz = sizeof(PGroupBlock) + PAGECACHE_BLOCKALLOC_MINENTRY * nByte; + pBlock = (PGroupBlock *)sqlite3Malloc(sz); + pcache1EnterMutex(pCache->pGroup); + + if( !pBlock ){ + freeListIfEmpty(pGroup, pList); + return 0; + } + pBlock->nEntry = (sqlite3MallocSize(pBlock) - sizeof(PGroupBlock)) / nByte; + if( pBlock->nEntry>=BMS ){ + pBlock->nEntry = BMS-1; + } + pBlock->pList = pList; + pBlock->mUsed = 0; + pBlock->aData = (u8 *)&pBlock[1]; + addBlockToList(pList, pBlock); + + sz = sqlite3MallocSize(pBlock); + sqlite3_mutex_enter(pcache1.mutex); + sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, sz); + sqlite3_mutex_leave(pcache1.mutex); + } + + for(i=0; pPg==0 && ALWAYS(inEntry); i++){ + if( 0==(pBlock->mUsed & ((Bitmask)1<mUsed |= ((Bitmask)1<aData[pList->nByte * i]; + } + } + assert( pPg ); + PAGE_SET_BLOCKPTR(pCache, pPg, pBlock); + + /* If the block is now full, shift it to the end of the list */ + if( pBlock->mUsed==(((Bitmask)1<nEntry)-1) && pList->pLast!=pBlock ){ + assert( pList->pFirst==pBlock ); + assert( pBlock->pPrev==0 ); + assert( pList->pLast->pNext==0 ); + pList->pFirst = pBlock->pNext; + pList->pFirst->pPrev = 0; + pBlock->pPrev = pList->pLast; + pBlock->pNext = 0; + pList->pLast->pNext = pBlock; + pList->pLast = pBlock; + } + p = PAGE_TO_PGHDR1(pCache, pPg); + if( pCache->bPurgeable ){ + pCache->pGroup->nCurrentPage++; + } +#else + /* The group mutex must be released before pcache1Alloc() is called. This + ** is because it may call sqlite3_release_memory(), which assumes that + ** this mutex is not held. */ + assert( sqlite3_mutex_held(pCache->pGroup->mutex) ); + pcache1LeaveMutex(pCache->pGroup); + pPg = pcache1Alloc(nByte); + pcache1EnterMutex(pCache->pGroup); if( pPg ){ p = PAGE_TO_PGHDR1(pCache, pPg); if( pCache->bPurgeable ){ pCache->pGroup->nCurrentPage++; } }else{ p = 0; } +#endif return p; } /* ** Free a page object allocated by pcache1AllocPage(). @@ -35584,14 +36282,56 @@ ** with a NULL pointer, so we mark the NULL test with ALWAYS(). */ static void pcache1FreePage(PgHdr1 *p){ if( ALWAYS(p) ){ PCache1 *pCache = p->pCache; + void *pPg = PGHDR1_TO_PAGE(p); + +#ifdef SQLITE_PAGECACHE_BLOCKALLOC + PGroupBlock *pBlock = PAGE_GET_BLOCKPTR(pCache, pPg); + PGroupBlockList *pList = pBlock->pList; + int i = ((u8 *)pPg - pBlock->aData) / pList->nByte; + + assert( pPg==(void *)&pBlock->aData[i*pList->nByte] ); + assert( pBlock->mUsed & ((Bitmask)1<mUsed &= ~((Bitmask)1<pFirst==pBlock ){ + pList->pFirst = pBlock->pNext; + if( pList->pFirst ) pList->pFirst->pPrev = 0; + }else{ + pBlock->pPrev->pNext = pBlock->pNext; + } + if( pList->pLast==pBlock ){ + pList->pLast = pBlock->pPrev; + if( pList->pLast ) pList->pLast->pNext = 0; + }else{ + pBlock->pNext->pPrev = pBlock->pPrev; + } + + if( pBlock->mUsed==0 ){ + PGroup *pGroup = p->pCache->pGroup; + + int sz = sqlite3MallocSize(pBlock); + sqlite3_mutex_enter(pcache1.mutex); + sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -sz); + sqlite3_mutex_leave(pcache1.mutex); + freeListIfEmpty(pGroup, pList); + sqlite3_free(pBlock); + }else{ + addBlockToList(pList, pBlock); + } +#else + assert( sqlite3_mutex_held(p->pCache->pGroup->mutex) ); + pcache1Free(pPg); +#endif if( pCache->bPurgeable ){ pCache->pGroup->nCurrentPage--; } - pcache1Free(PGHDR1_TO_PAGE(p)); } } /* ** Malloc function used by SQLite to obtain space from the buffer configured @@ -36025,13 +36765,11 @@ /* Step 5. If a usable page buffer has still not been found, ** attempt to allocate a new one. */ if( !pPage ){ if( createFlag==1 ) sqlite3BeginBenignMalloc(); - pcache1LeaveMutex(pGroup); pPage = pcache1AllocPage(pCache); - pcache1EnterMutex(pGroup); if( createFlag==1 ) sqlite3EndBenignMalloc(); } if( pPage ){ unsigned int h = iKey % pCache->nHash; @@ -36197,10 +36935,13 @@ ** been released, the function returns. The return value is the total number ** of bytes of memory released. */ SQLITE_PRIVATE int sqlite3PcacheReleaseMemory(int nReq){ int nFree = 0; +#ifdef SQLITE_PAGECACHE_BLOCKALLOC + if( pcache1.grp.isBusy ) return 0; +#endif assert( sqlite3_mutex_notheld(pcache1.grp.mutex) ); assert( sqlite3_mutex_notheld(pcache1.mutex) ); if( pcache1.pStart==0 ){ PgHdr1 *p; pcache1EnterMutex(&pcache1.grp); @@ -40528,10 +41269,11 @@ ** to the caller. */ SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager){ u8 *pTmp = (u8 *)pPager->pTmpSpace; + assert( assert_pager_state(pPager) ); disable_simulated_io_errors(); sqlite3BeginBenignMalloc(); /* pPager->errCode = 0; */ pPager->exclusiveMode = 0; #ifndef SQLITE_OMIT_WAL @@ -45425,17 +46167,19 @@ ** ** The EXCLUSIVE lock is not released before returning. */ rc = sqlite3OsLock(pWal->pDbFd, SQLITE_LOCK_EXCLUSIVE); if( rc==SQLITE_OK ){ + int bPersistWal = -1; if( pWal->exclusiveMode==WAL_NORMAL_MODE ){ pWal->exclusiveMode = WAL_EXCLUSIVE_MODE; } rc = sqlite3WalCheckpoint( pWal, SQLITE_CHECKPOINT_PASSIVE, 0, 0, sync_flags, nBuf, zBuf, 0, 0 ); - if( rc==SQLITE_OK ){ + sqlite3OsFileControl(pWal->pDbFd, SQLITE_FCNTL_PERSIST_WAL, &bPersistWal); + if( rc==SQLITE_OK && bPersistWal!=1 ){ isDelete = 1; } } walIndexClose(pWal, isDelete); @@ -48165,22 +48909,25 @@ int *pRes /* Write search results here */ ){ int rc; /* Status code */ UnpackedRecord *pIdxKey; /* Unpacked index key */ char aSpace[150]; /* Temp space for pIdxKey - to avoid a malloc */ + char *pFree = 0; if( pKey ){ assert( nKey==(i64)(int)nKey ); - pIdxKey = sqlite3VdbeRecordUnpack(pCur->pKeyInfo, (int)nKey, pKey, - aSpace, sizeof(aSpace)); + pIdxKey = sqlite3VdbeAllocUnpackedRecord( + pCur->pKeyInfo, aSpace, sizeof(aSpace), &pFree + ); if( pIdxKey==0 ) return SQLITE_NOMEM; + sqlite3VdbeRecordUnpack(pCur->pKeyInfo, (int)nKey, pKey, pIdxKey); }else{ pIdxKey = 0; } rc = sqlite3BtreeMovetoUnpacked(pCur, pIdxKey, nKey, bias, pRes); - if( pKey ){ - sqlite3VdbeDeleteUnpackedRecord(pIdxKey); + if( pFree ){ + sqlite3DbFree(pCur->pKeyInfo->db, pFree); } return rc; } /* @@ -50252,15 +50999,16 @@ for(i=0; iaData+pPage->maskPage + && iFrom==get4byte(&pCell[info.iOverflow]) + ){ + put4byte(&pCell[info.iOverflow], iTo); + break; } }else{ if( get4byte(pCell)==iFrom ){ put4byte(pCell, iTo); break; @@ -50977,11 +51725,12 @@ if( NEVER(wrFlag && pBt->readOnly) ){ return SQLITE_READONLY; } if( iTable==1 && btreePagecount(pBt)==0 ){ - return SQLITE_EMPTY; + assert( wrFlag==0 ); + iTable = 0; } /* Now that no other errors can occur, finish filling in the BtCursor ** variables and link the cursor into the BtShared list. */ pCur->pgnoRoot = (Pgno)iTable; @@ -51731,10 +52480,13 @@ int i; for(i=1; i<=pCur->iPage; i++){ releasePage(pCur->apPage[i]); } pCur->iPage = 0; + }else if( pCur->pgnoRoot==0 ){ + pCur->eState = CURSOR_INVALID; + return SQLITE_OK; }else{ rc = getAndInitPage(pBt, pCur->pgnoRoot, &pCur->apPage[0]); if( rc!=SQLITE_OK ){ pCur->eState = CURSOR_INVALID; return rc; @@ -51840,11 +52592,11 @@ assert( cursorHoldsMutex(pCur) ); assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) ); rc = moveToRoot(pCur); if( rc==SQLITE_OK ){ if( pCur->eState==CURSOR_INVALID ){ - assert( pCur->apPage[pCur->iPage]->nCell==0 ); + assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 ); *pRes = 1; }else{ assert( pCur->apPage[pCur->iPage]->nCell>0 ); *pRes = 0; rc = moveToLeftmost(pCur); @@ -51879,11 +52631,11 @@ } rc = moveToRoot(pCur); if( rc==SQLITE_OK ){ if( CURSOR_INVALID==pCur->eState ){ - assert( pCur->apPage[pCur->iPage]->nCell==0 ); + assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 ); *pRes = 1; }else{ assert( pCur->eState==CURSOR_VALID ); *pRes = 0; rc = moveToRightmost(pCur); @@ -51952,16 +52704,16 @@ rc = moveToRoot(pCur); if( rc ){ return rc; } - assert( pCur->apPage[pCur->iPage] ); - assert( pCur->apPage[pCur->iPage]->isInit ); - assert( pCur->apPage[pCur->iPage]->nCell>0 || pCur->eState==CURSOR_INVALID ); + assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage] ); + assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->isInit ); + assert( pCur->eState==CURSOR_INVALID || pCur->apPage[pCur->iPage]->nCell>0 ); if( pCur->eState==CURSOR_INVALID ){ *pRes = -1; - assert( pCur->apPage[pCur->iPage]->nCell==0 ); + assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 ); return SQLITE_OK; } assert( pCur->apPage[0]->intKey || pIdxKey ); for(;;){ int lwr, upr, idx; @@ -52684,10 +53436,13 @@ assert( sqlite3_mutex_held(pPage->pBt->mutex) ); btreeParseCellPtr(pPage, pCell, &info); if( info.iOverflow==0 ){ return SQLITE_OK; /* No overflow pages. Return without doing anything */ } + if( pCell+info.iOverflow+3 > pPage->aData+pPage->maskPage ){ + return SQLITE_CORRUPT; /* Cell extends past end of page */ + } ovflPgno = get4byte(&pCell[info.iOverflow]); assert( pBt->usableSize > 4 ); ovflPageSize = pBt->usableSize - 4; nOvfl = (info.nPayload - info.nLocal + ovflPageSize - 1)/ovflPageSize; assert( ovflPgno==0 || nOvfl>0 ); @@ -54867,10 +55622,15 @@ ** corruption) an SQLite error code is returned. */ SQLITE_PRIVATE int sqlite3BtreeCount(BtCursor *pCur, i64 *pnEntry){ i64 nEntry = 0; /* Value to return in *pnEntry */ int rc; /* Return code */ + + if( pCur->pgnoRoot==0 ){ + *pnEntry = 0; + return SQLITE_OK; + } rc = moveToRoot(pCur); /* Unless an error occurs, the following loop runs one iteration for each ** page in the B-Tree structure (not including overflow pages). */ @@ -55651,11 +56411,10 @@ */ SQLITE_PRIVATE int sqlite3BtreeSetVersion(Btree *pBtree, int iVersion){ BtShared *pBt = pBtree->pBt; int rc; /* Return code */ - assert( pBtree->inTrans==TRANS_NONE ); assert( iVersion==1 || iVersion==2 ); /* If setting the version fields to 1, do not automatically open the ** WAL connection, even if the version fields are currently set to 2. */ @@ -56090,106 +56849,110 @@ /* Update the schema version field in the destination database. This ** is to make sure that the schema-version really does change in ** the case where the source and destination databases have the ** same schema version. */ - if( rc==SQLITE_DONE - && (rc = sqlite3BtreeUpdateMeta(p->pDest,1,p->iDestSchema+1))==SQLITE_OK - ){ - int nDestTruncate; - - if( p->pDestDb ){ - sqlite3ResetInternalSchema(p->pDestDb, -1); - } - - /* Set nDestTruncate to the final number of pages in the destination - ** database. The complication here is that the destination page - ** size may be different to the source page size. - ** - ** If the source page size is smaller than the destination page size, - ** round up. In this case the call to sqlite3OsTruncate() below will - ** fix the size of the file. However it is important to call - ** sqlite3PagerTruncateImage() here so that any pages in the - ** destination file that lie beyond the nDestTruncate page mark are - ** journalled by PagerCommitPhaseOne() before they are destroyed - ** by the file truncation. - */ - assert( pgszSrc==sqlite3BtreeGetPageSize(p->pSrc) ); - assert( pgszDest==sqlite3BtreeGetPageSize(p->pDest) ); - if( pgszSrcpDest->pBt) ){ - nDestTruncate--; - } - }else{ - nDestTruncate = nSrcPage * (pgszSrc/pgszDest); - } - sqlite3PagerTruncateImage(pDestPager, nDestTruncate); - - if( pgszSrc= iSize || ( - nDestTruncate==(int)(PENDING_BYTE_PAGE(p->pDest->pBt)-1) - && iSize>=PENDING_BYTE && iSize<=PENDING_BYTE+pgszDest - )); - - /* This call ensures that all data required to recreate the original - ** database has been stored in the journal for pDestPager and the - ** journal synced to disk. So at this point we may safely modify - ** the database file in any way, knowing that if a power failure - ** occurs, the original database will be reconstructed from the - ** journal file. */ - rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 1); - - /* Write the extra pages and truncate the database file as required. */ - iEnd = MIN(PENDING_BYTE + pgszDest, iSize); - for( - iOff=PENDING_BYTE+pgszSrc; - rc==SQLITE_OK && iOffpDest, 0)) - ){ - rc = SQLITE_DONE; + if( rc==SQLITE_DONE ){ + rc = sqlite3BtreeUpdateMeta(p->pDest,1,p->iDestSchema+1); + if( rc==SQLITE_OK ){ + if( p->pDestDb ){ + sqlite3ResetInternalSchema(p->pDestDb, -1); + } + if( destMode==PAGER_JOURNALMODE_WAL ){ + rc = sqlite3BtreeSetVersion(p->pDest, 2); + } + } + if( rc==SQLITE_OK ){ + int nDestTruncate; + /* Set nDestTruncate to the final number of pages in the destination + ** database. The complication here is that the destination page + ** size may be different to the source page size. + ** + ** If the source page size is smaller than the destination page size, + ** round up. In this case the call to sqlite3OsTruncate() below will + ** fix the size of the file. However it is important to call + ** sqlite3PagerTruncateImage() here so that any pages in the + ** destination file that lie beyond the nDestTruncate page mark are + ** journalled by PagerCommitPhaseOne() before they are destroyed + ** by the file truncation. + */ + assert( pgszSrc==sqlite3BtreeGetPageSize(p->pSrc) ); + assert( pgszDest==sqlite3BtreeGetPageSize(p->pDest) ); + if( pgszSrcpDest->pBt) ){ + nDestTruncate--; + } + }else{ + nDestTruncate = nSrcPage * (pgszSrc/pgszDest); + } + sqlite3PagerTruncateImage(pDestPager, nDestTruncate); + + if( pgszSrc= iSize || ( + nDestTruncate==(int)(PENDING_BYTE_PAGE(p->pDest->pBt)-1) + && iSize>=PENDING_BYTE && iSize<=PENDING_BYTE+pgszDest + )); + + /* This call ensures that all data required to recreate the original + ** database has been stored in the journal for pDestPager and the + ** journal synced to disk. So at this point we may safely modify + ** the database file in any way, knowing that if a power failure + ** occurs, the original database will be reconstructed from the + ** journal file. */ + rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 1); + + /* Write the extra pages and truncate the database file as required */ + iEnd = MIN(PENDING_BYTE + pgszDest, iSize); + for( + iOff=PENDING_BYTE+pgszSrc; + rc==SQLITE_OK && iOffpDest, 0)) + ){ + rc = SQLITE_DONE; + } } } /* If bCloseTrans is true, then this function opened a read transaction ** on the source database. Close the read transaction here. There is @@ -56653,38 +57416,32 @@ ** invoking an external callback, free it now. Calling this function ** does not free any Mem.zMalloc buffer. */ SQLITE_PRIVATE void sqlite3VdbeMemReleaseExternal(Mem *p){ assert( p->db==0 || sqlite3_mutex_held(p->db->mutex) ); - testcase( p->flags & MEM_Agg ); - testcase( p->flags & MEM_Dyn ); - testcase( p->flags & MEM_RowSet ); - testcase( p->flags & MEM_Frame ); - if( p->flags&(MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame) ){ - if( p->flags&MEM_Agg ){ - sqlite3VdbeMemFinalize(p, p->u.pDef); - assert( (p->flags & MEM_Agg)==0 ); - sqlite3VdbeMemRelease(p); - }else if( p->flags&MEM_Dyn && p->xDel ){ - assert( (p->flags&MEM_RowSet)==0 ); - p->xDel((void *)p->z); - p->xDel = 0; - }else if( p->flags&MEM_RowSet ){ - sqlite3RowSetClear(p->u.pRowSet); - }else if( p->flags&MEM_Frame ){ - sqlite3VdbeMemSetNull(p); - } + if( p->flags&MEM_Agg ){ + sqlite3VdbeMemFinalize(p, p->u.pDef); + assert( (p->flags & MEM_Agg)==0 ); + sqlite3VdbeMemRelease(p); + }else if( p->flags&MEM_Dyn && p->xDel ){ + assert( (p->flags&MEM_RowSet)==0 ); + p->xDel((void *)p->z); + p->xDel = 0; + }else if( p->flags&MEM_RowSet ){ + sqlite3RowSetClear(p->u.pRowSet); + }else if( p->flags&MEM_Frame ){ + sqlite3VdbeMemSetNull(p); } } /* ** Release any memory held by the Mem. This may leave the Mem in an ** inconsistent state, for example with (Mem.z==0) and ** (Mem.type==SQLITE_TEXT). */ SQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p){ - sqlite3VdbeMemReleaseExternal(p); + MemReleaseExt(p); sqlite3DbFree(p->db, p->zMalloc); p->z = 0; p->zMalloc = 0; p->xDel = 0; } @@ -57002,11 +57759,11 @@ ** pFrom->z is used, then pTo->z points to the same thing as pFrom->z ** and flags gets srcType (either MEM_Ephem or MEM_Static). */ SQLITE_PRIVATE void sqlite3VdbeMemShallowCopy(Mem *pTo, const Mem *pFrom, int srcType){ assert( (pFrom->flags & MEM_RowSet)==0 ); - sqlite3VdbeMemReleaseExternal(pTo); + MemReleaseExt(pTo); memcpy(pTo, pFrom, MEMCELLSIZE); pTo->xDel = 0; if( (pFrom->flags&MEM_Static)==0 ){ pTo->flags &= ~(MEM_Dyn|MEM_Static|MEM_Ephem); assert( srcType==MEM_Ephem || srcType==MEM_Static ); @@ -57020,11 +57777,11 @@ */ SQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem *pTo, const Mem *pFrom){ int rc = SQLITE_OK; assert( (pFrom->flags & MEM_RowSet)==0 ); - sqlite3VdbeMemReleaseExternal(pTo); + MemReleaseExt(pTo); memcpy(pTo, pFrom, MEMCELLSIZE); pTo->flags &= ~MEM_Dyn; if( pTo->flags&(MEM_Str|MEM_Blob) ){ if( 0==(pFrom->flags&MEM_Static) ){ @@ -57975,10 +58732,16 @@ assert( p->nOp - i >= 3 ); assert( pOp[-1].opcode==OP_Integer ); n = pOp[-1].p1; if( n>nMaxArgs ) nMaxArgs = n; #endif + }else if( opcode==OP_Next || opcode==OP_SorterNext ){ + pOp->p4.xAdvance = sqlite3BtreeNext; + pOp->p4type = P4_ADVANCE; + }else if( opcode==OP_Prev ){ + pOp->p4.xAdvance = sqlite3BtreePrevious; + pOp->p4type = P4_ADVANCE; } if( (pOp->opflags & OPFLG_JUMP)!=0 && pOp->p2<0 ){ assert( -1-pOp->p2nLabel ); pOp->p2 = aLabel[-1-pOp->p2]; @@ -58066,37 +58829,34 @@ ** Change the value of the P1 operand for a specific instruction. ** This routine is useful when a large program is loaded from a ** static array using sqlite3VdbeAddOpList but we want to make a ** few minor changes to the program. */ -SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){ +SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe *p, u32 addr, int val){ assert( p!=0 ); - assert( addr>=0 ); - if( p->nOp>addr ){ + if( ((u32)p->nOp)>addr ){ p->aOp[addr].p1 = val; } } /* ** Change the value of the P2 operand for a specific instruction. ** This routine is useful for setting a jump destination. */ -SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){ +SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe *p, u32 addr, int val){ assert( p!=0 ); - assert( addr>=0 ); - if( p->nOp>addr ){ + if( ((u32)p->nOp)>addr ){ p->aOp[addr].p2 = val; } } /* ** Change the value of the P3 operand for a specific instruction. */ -SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe *p, int addr, int val){ +SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe *p, u32 addr, int val){ assert( p!=0 ); - assert( addr>=0 ); - if( p->nOp>addr ){ + if( ((u32)p->nOp)>addr ){ p->aOp[addr].p3 = val; } } /* @@ -58209,22 +58969,19 @@ p->pNext = pVdbe->pProgram; pVdbe->pProgram = p; } /* -** Change N opcodes starting at addr to No-ops. +** Change the opcode at addr into OP_Noop */ -SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr, int N){ +SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr){ if( p->aOp ){ VdbeOp *pOp = &p->aOp[addr]; sqlite3 *db = p->db; - while( N-- ){ - freeP4(db, pOp->p4type, pOp->p4.p); - memset(pOp, 0, sizeof(pOp[0])); - pOp->opcode = OP_Noop; - pOp++; - } + freeP4(db, pOp->p4type, pOp->p4.p); + memset(pOp, 0, sizeof(pOp[0])); + pOp->opcode = OP_Noop; } } /* ** Change the value of the P4 operand for a specific instruction. @@ -58376,11 +59133,11 @@ ** check the value of p->nOp-1 before continuing. */ SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){ /* C89 specifies that the constant "dummy" will be initialized to all ** zeros, which is correct. MSVC generates a warning, nevertheless. */ - static const VdbeOp dummy; /* Ignore the MSVC warning about no initializer */ + static VdbeOp dummy; /* Ignore the MSVC warning about no initializer */ assert( p->magic==VDBE_MAGIC_INIT ); if( addr<0 ){ #ifdef SQLITE_OMIT_TRACE if( p->nOp==0 ) return (VdbeOp*)&dummy; #endif @@ -58483,10 +59240,14 @@ break; } case P4_SUBPROGRAM: { sqlite3_snprintf(nTemp, zTemp, "program"); break; + } + case P4_ADVANCE: { + zTemp[0] = 0; + break; } default: { zP4 = pOp->p4.z; if( zP4==0 ){ zP4 = zTemp; @@ -59107,10 +59868,11 @@ */ SQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *p, VdbeCursor *pCx){ if( pCx==0 ){ return; } + sqlite3VdbeSorterClose(p->db, pCx); if( pCx->pBt ){ sqlite3BtreeClose(pCx->pBt); /* The pCx->pCursor will be close automatically, if it exists, by ** the call above. */ }else if( pCx->pCursor ){ @@ -60364,61 +61126,74 @@ } } return 0; } - -/* -** Given the nKey-byte encoding of a record in pKey[], parse the -** record into a UnpackedRecord structure. Return a pointer to -** that structure. -** -** The calling function might provide szSpace bytes of memory -** space at pSpace. This space can be used to hold the returned -** VDbeParsedRecord structure if it is large enough. If it is -** not big enough, space is obtained from sqlite3_malloc(). -** -** The returned structure should be closed by a call to -** sqlite3VdbeDeleteUnpackedRecord(). -*/ -SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeRecordUnpack( - KeyInfo *pKeyInfo, /* Information about the record format */ - int nKey, /* Size of the binary record */ - const void *pKey, /* The binary record */ - char *pSpace, /* Unaligned space available to hold the object */ - int szSpace /* Size of pSpace[] in bytes */ -){ - const unsigned char *aKey = (const unsigned char *)pKey; - UnpackedRecord *p; /* The unpacked record that we will return */ - int nByte; /* Memory space needed to hold p, in bytes */ - int d; - u32 idx; - u16 u; /* Unsigned loop counter */ - u32 szHdr; - Mem *pMem; - int nOff; /* Increase pSpace by this much to 8-byte align it */ - - /* - ** We want to shift the pointer pSpace up such that it is 8-byte aligned. +/* +** This routine is used to allocate sufficient space for an UnpackedRecord +** structure large enough to be used with sqlite3VdbeRecordUnpack() if +** the first argument is a pointer to KeyInfo structure pKeyInfo. +** +** The space is either allocated using sqlite3DbMallocRaw() or from within +** the unaligned buffer passed via the second and third arguments (presumably +** stack space). If the former, then *ppFree is set to a pointer that should +** be eventually freed by the caller using sqlite3DbFree(). Or, if the +** allocation comes from the pSpace/szSpace buffer, *ppFree is set to NULL +** before returning. +** +** If an OOM error occurs, NULL is returned. +*/ +SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeAllocUnpackedRecord( + KeyInfo *pKeyInfo, /* Description of the record */ + char *pSpace, /* Unaligned space available */ + int szSpace, /* Size of pSpace[] in bytes */ + char **ppFree /* OUT: Caller should free this pointer */ +){ + UnpackedRecord *p; /* Unpacked record to return */ + int nOff; /* Increment pSpace by nOff to align it */ + int nByte; /* Number of bytes required for *p */ + + /* We want to shift the pointer pSpace up such that it is 8-byte aligned. ** Thus, we need to calculate a value, nOff, between 0 and 7, to shift ** it by. If pSpace is already 8-byte aligned, nOff should be zero. */ nOff = (8 - (SQLITE_PTR_TO_INT(pSpace) & 7)) & 7; - pSpace += nOff; - szSpace -= nOff; nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nField+1); - if( nByte>szSpace ){ - p = sqlite3DbMallocRaw(pKeyInfo->db, nByte); - if( p==0 ) return 0; - p->flags = UNPACKED_NEED_FREE | UNPACKED_NEED_DESTROY; + if( nByte>szSpace+nOff ){ + p = (UnpackedRecord *)sqlite3DbMallocRaw(pKeyInfo->db, nByte); + *ppFree = (char *)p; + if( !p ) return 0; }else{ - p = (UnpackedRecord*)pSpace; - p->flags = UNPACKED_NEED_DESTROY; + p = (UnpackedRecord*)&pSpace[nOff]; + *ppFree = 0; } + + p->aMem = (Mem*)&((char*)p)[ROUND8(sizeof(UnpackedRecord))]; p->pKeyInfo = pKeyInfo; p->nField = pKeyInfo->nField + 1; - p->aMem = pMem = (Mem*)&((char*)p)[ROUND8(sizeof(UnpackedRecord))]; + return p; +} + +/* +** Given the nKey-byte encoding of a record in pKey[], populate the +** UnpackedRecord structure indicated by the fourth argument with the +** contents of the decoded record. +*/ +SQLITE_PRIVATE void sqlite3VdbeRecordUnpack( + KeyInfo *pKeyInfo, /* Information about the record format */ + int nKey, /* Size of the binary record */ + const void *pKey, /* The binary record */ + UnpackedRecord *p /* Populate this structure before returning. */ +){ + const unsigned char *aKey = (const unsigned char *)pKey; + int d; + u32 idx; /* Offset in aKey[] to read from */ + u16 u; /* Unsigned loop counter */ + u32 szHdr; + Mem *pMem = p->aMem; + + p->flags = 0; assert( EIGHT_BYTE_ALIGNMENT(pMem) ); idx = getVarint32(aKey, szHdr); d = szHdr; u = 0; while( idxnField && d<=nKey ){ @@ -60433,35 +61208,10 @@ pMem++; u++; } assert( u<=pKeyInfo->nField + 1 ); p->nField = u; - return (void*)p; -} - -/* -** This routine destroys a UnpackedRecord object. -*/ -SQLITE_PRIVATE void sqlite3VdbeDeleteUnpackedRecord(UnpackedRecord *p){ -#ifdef SQLITE_DEBUG - int i; - Mem *pMem; - - assert( p!=0 ); - assert( p->flags & UNPACKED_NEED_DESTROY ); - for(i=0, pMem=p->aMem; inField; i++, pMem++){ - /* The unpacked record is always constructed by the - ** sqlite3VdbeUnpackRecord() function above, which makes all - ** strings and blobs static. And none of the elements are - ** ever transformed, so there is never anything to delete. - */ - if( NEVER(pMem->zMalloc) ) sqlite3VdbeMemRelease(pMem); - } -#endif - if( p->flags & UNPACKED_NEED_FREE ){ - sqlite3DbFree(p->pKeyInfo->db, p); - } } /* ** This function compares the two table rows or index records ** specified by {nKey1, pKey1} and pPKey2. It returns a negative, zero @@ -61276,11 +62026,11 @@ sqlite3_mutex_enter(db->mutex); while( (rc = sqlite3Step(v))==SQLITE_SCHEMA && cnt++ < SQLITE_MAX_SCHEMA_RETRY && (rc2 = rc = sqlite3Reprepare(v))==SQLITE_OK ){ sqlite3_reset(pStmt); - v->expired = 0; + assert( v->expired==0 ); } if( rc2!=SQLITE_OK && ALWAYS(v->isPrepareV2) && ALWAYS(db->pErr) ){ /* This case occurs after failing to recompile an sql statement. ** The error message from the SQL compiler has already been loaded ** into the database handle. This block copies the error message @@ -62407,10 +63157,17 @@ ** Call sqlite3VdbeMemExpandBlob() on the supplied value (type Mem*) ** P if required. */ #define ExpandBlob(P) (((P)->flags&MEM_Zero)?sqlite3VdbeMemExpandBlob(P):0) +/* Return true if the cursor was opened using the OP_OpenSorter opcode. */ +#ifdef SQLITE_OMIT_MERGE_SORT +# define isSorter(x) 0 +#else +# define isSorter(x) ((x)->pSorter!=0) +#endif + /* ** Argument pMem points at a register that will be passed to a ** user-defined function or returned to the user as the result of a query. ** This routine sets the pMem->type variable used by the sqlite3_value_*() ** routines. @@ -63001,10 +63758,11 @@ u8 *zEndHdr; /* Pointer to first byte after the header */ u32 offset; /* Offset into the data */ u32 szField; /* Number of bytes in the content of a field */ int szHdr; /* Size of the header size field at start of record */ int avail; /* Number of bytes of available data */ + u32 t; /* A type code from the record header */ Mem *pReg; /* PseudoTable input register */ } am; struct OP_Affinity_stack_vars { const char *zAffinity; /* The affinity to be applied */ char cAff; /* A single character of affinity */ @@ -63072,55 +63830,59 @@ Db *pDb; } aw; struct OP_OpenEphemeral_stack_vars { VdbeCursor *pCx; } ax; - struct OP_OpenPseudo_stack_vars { + struct OP_SorterOpen_stack_vars { VdbeCursor *pCx; } ay; + struct OP_OpenPseudo_stack_vars { + VdbeCursor *pCx; + } az; struct OP_SeekGt_stack_vars { int res; int oc; VdbeCursor *pC; UnpackedRecord r; int nField; i64 iKey; /* The rowid we are to seek to */ - } az; + } ba; struct OP_Seek_stack_vars { VdbeCursor *pC; - } ba; + } bb; struct OP_Found_stack_vars { int alreadyExists; VdbeCursor *pC; int res; + char *pFree; UnpackedRecord *pIdxKey; UnpackedRecord r; char aTempRec[ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*3 + 7]; - } bb; + } bc; struct OP_IsUnique_stack_vars { u16 ii; VdbeCursor *pCx; BtCursor *pCrsr; u16 nField; Mem *aMx; UnpackedRecord r; /* B-Tree index search key */ i64 R; /* Rowid stored in register P3 */ - } bc; + } bd; struct OP_NotExists_stack_vars { VdbeCursor *pC; BtCursor *pCrsr; int res; u64 iKey; - } bd; + } be; struct OP_NewRowid_stack_vars { i64 v; /* The new rowid */ VdbeCursor *pC; /* Cursor of table to get the new rowid */ int res; /* Result of an sqlite3BtreeLast() */ int cnt; /* Counter to limit the number of searches */ Mem *pMem; /* Register holding largest rowid for AUTOINCREMENT */ VdbeFrame *pFrame; /* Root frame of VDBE */ - } be; + } bf; struct OP_InsertInt_stack_vars { Mem *pData; /* MEM cell holding data for the record to be inserted */ Mem *pKey; /* MEM cell holding key for the record */ i64 iKey; /* The integer ROWID or key for the record to be inserted */ VdbeCursor *pC; /* Cursor to table into which insert is written */ @@ -63127,155 +63889,161 @@ int nZero; /* Number of zero-bytes to append */ int seekResult; /* Result of prior seek or 0 if no USESEEKRESULT flag */ const char *zDb; /* database name - used by the update hook */ const char *zTbl; /* Table name - used by the opdate hook */ int op; /* Opcode for update hook: SQLITE_UPDATE or SQLITE_INSERT */ - } bf; + } bg; struct OP_Delete_stack_vars { i64 iKey; VdbeCursor *pC; - } bg; + } bh; + struct OP_SorterCompare_stack_vars { + VdbeCursor *pC; + int res; + } bi; + struct OP_SorterData_stack_vars { + VdbeCursor *pC; + } bj; struct OP_RowData_stack_vars { VdbeCursor *pC; BtCursor *pCrsr; u32 n; i64 n64; - } bh; + } bk; struct OP_Rowid_stack_vars { VdbeCursor *pC; i64 v; sqlite3_vtab *pVtab; const sqlite3_module *pModule; - } bi; + } bl; struct OP_NullRow_stack_vars { VdbeCursor *pC; - } bj; + } bm; struct OP_Last_stack_vars { VdbeCursor *pC; BtCursor *pCrsr; int res; - } bk; + } bn; struct OP_Rewind_stack_vars { VdbeCursor *pC; BtCursor *pCrsr; int res; - } bl; + } bo; struct OP_Next_stack_vars { VdbeCursor *pC; - BtCursor *pCrsr; int res; - } bm; + } bp; struct OP_IdxInsert_stack_vars { VdbeCursor *pC; BtCursor *pCrsr; int nKey; const char *zKey; - } bn; + } bq; struct OP_IdxDelete_stack_vars { VdbeCursor *pC; BtCursor *pCrsr; int res; UnpackedRecord r; - } bo; + } br; struct OP_IdxRowid_stack_vars { BtCursor *pCrsr; VdbeCursor *pC; i64 rowid; - } bp; + } bs; struct OP_IdxGE_stack_vars { VdbeCursor *pC; int res; UnpackedRecord r; - } bq; + } bt; struct OP_Destroy_stack_vars { int iMoved; int iCnt; Vdbe *pVdbe; int iDb; - } br; + } bu; struct OP_Clear_stack_vars { int nChange; - } bs; + } bv; struct OP_CreateTable_stack_vars { int pgno; int flags; Db *pDb; - } bt; + } bw; struct OP_ParseSchema_stack_vars { int iDb; const char *zMaster; char *zSql; InitData initData; - } bu; + } bx; struct OP_IntegrityCk_stack_vars { int nRoot; /* Number of tables to check. (Number of root pages.) */ int *aRoot; /* Array of rootpage numbers for tables to be checked */ int j; /* Loop counter */ int nErr; /* Number of errors reported */ char *z; /* Text of the error report */ Mem *pnErr; /* Register keeping track of errors remaining */ - } bv; + } by; struct OP_RowSetRead_stack_vars { i64 val; - } bw; + } bz; struct OP_RowSetTest_stack_vars { int iSet; int exists; - } bx; + } ca; struct OP_Program_stack_vars { int nMem; /* Number of memory registers for sub-program */ int nByte; /* Bytes of runtime space required for sub-program */ Mem *pRt; /* Register to allocate runtime space */ Mem *pMem; /* Used to iterate through memory cells */ Mem *pEnd; /* Last memory cell in new array */ VdbeFrame *pFrame; /* New vdbe frame to execute in */ SubProgram *pProgram; /* Sub-program to execute */ void *t; /* Token identifying trigger */ - } by; + } cb; struct OP_Param_stack_vars { VdbeFrame *pFrame; Mem *pIn; - } bz; + } cc; struct OP_MemMax_stack_vars { Mem *pIn1; VdbeFrame *pFrame; - } ca; + } cd; struct OP_AggStep_stack_vars { int n; int i; Mem *pMem; Mem *pRec; sqlite3_context ctx; sqlite3_value **apVal; - } cb; + } ce; struct OP_AggFinal_stack_vars { Mem *pMem; - } cc; + } cf; struct OP_Checkpoint_stack_vars { int i; /* Loop counter */ int aRes[3]; /* Results */ Mem *pMem; /* Write results here */ - } cd; + } cg; struct OP_JournalMode_stack_vars { Btree *pBt; /* Btree to change journal mode of */ Pager *pPager; /* Pager associated with pBt */ int eNew; /* New journal mode */ int eOld; /* The old journal mode */ const char *zFilename; /* Name of database file for pPager */ - } ce; + } ch; struct OP_IncrVacuum_stack_vars { Btree *pBt; - } cf; + } ci; struct OP_VBegin_stack_vars { VTable *pVTab; - } cg; + } cj; struct OP_VOpen_stack_vars { VdbeCursor *pCur; sqlite3_vtab_cursor *pVtabCursor; sqlite3_vtab *pVtab; sqlite3_module *pModule; - } ch; + } ck; struct OP_VFilter_stack_vars { int nArg; int iQuery; const sqlite3_module *pModule; Mem *pQuery; @@ -63284,40 +64052,40 @@ sqlite3_vtab *pVtab; VdbeCursor *pCur; int res; int i; Mem **apArg; - } ci; + } cl; struct OP_VColumn_stack_vars { sqlite3_vtab *pVtab; const sqlite3_module *pModule; Mem *pDest; sqlite3_context sContext; - } cj; + } cm; struct OP_VNext_stack_vars { sqlite3_vtab *pVtab; const sqlite3_module *pModule; int res; VdbeCursor *pCur; - } ck; + } cn; struct OP_VRename_stack_vars { sqlite3_vtab *pVtab; Mem *pName; - } cl; + } co; struct OP_VUpdate_stack_vars { sqlite3_vtab *pVtab; sqlite3_module *pModule; int nArg; int i; sqlite_int64 rowid; Mem **apArg; Mem *pX; - } cm; + } cp; struct OP_Trace_stack_vars { char *zTrace; char *z; - } cn; + } cq; } u; /* End automatically generated code ********************************************************************/ assert( p->magic==VDBE_MAGIC_RUN ); /* sqlite3_step() verifies this */ @@ -63413,11 +64181,11 @@ if( pOp->opflags & OPFLG_OUT2_PRERELEASE ){ assert( pOp->p2>0 ); assert( pOp->p2<=p->nMem ); pOut = &aMem[pOp->p2]; memAboutToChange(p, pOut); - sqlite3VdbeMemReleaseExternal(pOut); + MemReleaseExt(pOut); pOut->flags = MEM_Int; } /* Sanity checking on other operands */ #ifdef SQLITE_DEBUG @@ -63780,10 +64548,15 @@ assert( memIsValid(pIn1) ); memAboutToChange(p, pOut); u.ac.zMalloc = pOut->zMalloc; pOut->zMalloc = 0; sqlite3VdbeMemMove(pOut, pIn1); +#ifdef SQLITE_DEBUG + if( pOut->pScopyFrom>=&aMem[u.ac.p1] && pOut->pScopyFrom<&aMem[u.ac.p1+pOp->p3] ){ + pOut->pScopyFrom += u.ac.p1 - pOp->p2; + } +#endif pIn1->zMalloc = u.ac.zMalloc; REGISTER_TRACE(u.ac.p2++, pOut); pIn1++; pOut++; } @@ -64778,10 +65551,20 @@ sqlite3VdbeMemSetInt64(pOut, ~sqlite3VdbeIntValue(pIn1)); } break; } +/* Opcode: Once P1 P2 * * * +** +** Jump to P2 if the value in register P1 is a not null or zero. If +** the value is NULL or zero, fall through and change the P1 register +** to an integer 1. +** +** When P1 is not used otherwise in a program, this opcode falls through +** once and jumps on all subsequent invocations. It is the equivalent +** of "OP_If P1 P2", followed by "OP_Integer 1 P1". +*/ /* Opcode: If P1 P2 P3 * * ** ** Jump to P2 if the value in register P1 is true. The value ** is considered true if it is numeric and non-zero. If the value ** in P1 is NULL then take the jump if P3 is true. @@ -64790,10 +65573,11 @@ ** ** Jump to P2 if the value in register P1 is False. The value ** is considered true if it has a numeric value of zero. If the value ** in P1 is NULL then take the jump if P3 is true. */ +case OP_Once: /* jump, in1 */ case OP_If: /* jump, in1 */ case OP_IfNot: { /* jump, in1 */ #if 0 /* local variables moved into u.al */ int c; #endif /* local variables moved into u.al */ @@ -64808,10 +65592,16 @@ #endif if( pOp->opcode==OP_IfNot ) u.al.c = !u.al.c; } if( u.al.c ){ pc = pOp->p2-1; + }else if( pOp->opcode==OP_Once ){ + assert( (pIn1->flags & (MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame))==0 ); + memAboutToChange(p, pIn1); + pIn1->flags = MEM_Int; + pIn1->u.i = 1; + REGISTER_TRACE(pOp->p1, pIn1); } break; } /* Opcode: IsNull P1 P2 * * * @@ -64878,10 +65668,11 @@ u8 *zEndHdr; /* Pointer to first byte after the header */ u32 offset; /* Offset into the data */ u32 szField; /* Number of bytes in the content of a field */ int szHdr; /* Size of the header size field at start of record */ int avail; /* Number of bytes of available data */ + u32 t; /* A type code from the record header */ Mem *pReg; /* PseudoTable input register */ #endif /* local variables moved into u.am */ u.am.p1 = pOp->p1; @@ -64890,11 +65681,10 @@ memset(&u.am.sMem, 0, sizeof(u.am.sMem)); assert( u.am.p1nCursor ); assert( pOp->p3>0 && pOp->p3<=p->nMem ); u.am.pDest = &aMem[pOp->p3]; memAboutToChange(p, u.am.pDest); - MemSetTypeFlag(u.am.pDest, MEM_Null); u.am.zRec = 0; /* This block sets the variable u.am.payloadSize to be the total number of ** bytes in the record. ** @@ -64934,11 +65724,11 @@ }else{ assert( sqlite3BtreeCursorIsValid(u.am.pCrsr) ); rc = sqlite3BtreeDataSize(u.am.pCrsr, &u.am.payloadSize); assert( rc==SQLITE_OK ); /* DataSize() cannot fail */ } - }else if( u.am.pC->pseudoTableReg>0 ){ + }else if( ALWAYS(u.am.pC->pseudoTableReg>0) ){ u.am.pReg = &aMem[u.am.pC->pseudoTableReg]; assert( u.am.pReg->flags & MEM_Blob ); assert( memIsValid(u.am.pReg) ); u.am.payloadSize = u.am.pReg->n; u.am.zRec = u.am.pReg->z; @@ -64947,13 +65737,14 @@ }else{ /* Consider the row to be NULL */ u.am.payloadSize = 0; } - /* If u.am.payloadSize is 0, then just store a NULL */ + /* If u.am.payloadSize is 0, then just store a NULL. This can happen because of + ** nullRow or because of a corrupt database. */ if( u.am.payloadSize==0 ){ - assert( u.am.pDest->flags&MEM_Null ); + MemSetTypeFlag(u.am.pDest, MEM_Null); goto op_column_out; } assert( db->aLimit[SQLITE_LIMIT_LENGTH]>=0 ); if( u.am.payloadSize > (u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){ goto too_big; @@ -65056,12 +65847,18 @@ ** of the record to the start of the data for the u.am.i-th column */ for(u.am.i=0; u.am.iisIndex, &u.am.sMem); @@ -65115,11 +65912,11 @@ u.am.pDest->enc = encoding; }else{ if( pOp->p4type==P4_MEM ){ sqlite3VdbeMemShallowCopy(u.am.pDest, pOp->p4.pMem, MEM_Static); }else{ - assert( u.am.pDest->flags&MEM_Null ); + MemSetTypeFlag(u.am.pDest, MEM_Null); } } /* If we dynamically allocated space to hold the data (in the ** sqlite3VdbeMemFromBtree() call above) then transfer control of that @@ -65317,11 +66114,11 @@ i64 nEntry; BtCursor *pCrsr; #endif /* local variables moved into u.ap */ u.ap.pCrsr = p->apCsr[pOp->p1]->pCursor; - if( u.ap.pCrsr ){ + if( ALWAYS(u.ap.pCrsr) ){ rc = sqlite3BtreeCount(u.ap.pCrsr, &u.ap.nEntry); }else{ u.ap.nEntry = 0; } pOut->u.i = u.ap.nEntry; @@ -65893,19 +66690,13 @@ u.aw.pCur->nullRow = 1; u.aw.pCur->isOrdered = 1; rc = sqlite3BtreeCursor(u.aw.pX, u.aw.p2, u.aw.wrFlag, u.aw.pKeyInfo, u.aw.pCur->pCursor); u.aw.pCur->pKeyInfo = u.aw.pKeyInfo; - /* Since it performs no memory allocation or IO, the only values that - ** sqlite3BtreeCursor() may return are SQLITE_EMPTY and SQLITE_OK. - ** SQLITE_EMPTY is only returned when attempting to open the table - ** rooted at page 1 of a zero-byte database. */ - assert( rc==SQLITE_EMPTY || rc==SQLITE_OK ); - if( rc==SQLITE_EMPTY ){ - u.aw.pCur->pCursor = 0; - rc = SQLITE_OK; - } + /* Since it performs no memory allocation or IO, the only value that + ** sqlite3BtreeCursor() may return is SQLITE_OK. */ + assert( rc==SQLITE_OK ); /* Set the VdbeCursor.isTable and isIndex variables. Previous versions of ** SQLite used to check if the root-page flags were sane at this point ** and report database corruption if they were not, but this check has ** since moved into the btree layer. */ @@ -65912,11 +66703,11 @@ u.aw.pCur->isTable = pOp->p4type!=P4_KEYINFO; u.aw.pCur->isIndex = !u.aw.pCur->isTable; break; } -/* Opcode: OpenEphemeral P1 P2 * P4 * +/* Opcode: OpenEphemeral P1 P2 * P4 P5 ** ** Open a new cursor P1 to a transient table. ** The cursor is always opened read/write even if ** the main database is read-only. The ephemeral ** table is deleted automatically when the cursor is closed. @@ -65929,10 +66720,15 @@ ** This opcode was once called OpenTemp. But that created ** confusion because the term "temp table", might refer either ** to a TEMP table at the SQL level, or to a table opened by ** this opcode. Then this opcode was call OpenVirtual. But ** that created confusion with the whole virtual-table idea. +** +** The P5 parameter can be a mask of the BTREE_* flags defined +** in btree.h. These flags control aspects of the operation of +** the btree. The BTREE_OMIT_JOURNAL and BTREE_SINGLE flags are +** added automatically. */ /* Opcode: OpenAutoindex P1 P2 * P4 * ** ** This opcode works the same as OP_OpenEphemeral. It has a ** different name to distinguish its use. Tables created using @@ -65967,11 +66763,11 @@ ** automatically created table with root-page 1 (an BLOB_INTKEY table). */ if( pOp->p4.pKeyInfo ){ int pgno; assert( pOp->p4type==P4_KEYINFO ); - rc = sqlite3BtreeCreateTable(u.ax.pCx->pBt, &pgno, BTREE_BLOBKEY); + rc = sqlite3BtreeCreateTable(u.ax.pCx->pBt, &pgno, BTREE_BLOBKEY | pOp->p5); if( rc==SQLITE_OK ){ assert( pgno==MASTER_ROOT+1 ); rc = sqlite3BtreeCursor(u.ax.pCx->pBt, pgno, 1, (KeyInfo*)pOp->p4.z, u.ax.pCx->pCursor); u.ax.pCx->pKeyInfo = pOp->p4.pKeyInfo; @@ -65985,10 +66781,34 @@ } u.ax.pCx->isOrdered = (pOp->p5!=BTREE_UNORDERED); u.ax.pCx->isIndex = !u.ax.pCx->isTable; break; } + +/* Opcode: OpenSorter P1 P2 * P4 * +** +** This opcode works like OP_OpenEphemeral except that it opens +** a transient index that is specifically designed to sort large +** tables using an external merge-sort algorithm. +*/ +case OP_SorterOpen: { +#if 0 /* local variables moved into u.ay */ + VdbeCursor *pCx; +#endif /* local variables moved into u.ay */ +#ifndef SQLITE_OMIT_MERGE_SORT + u.ay.pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, 1); + if( u.ay.pCx==0 ) goto no_mem; + u.ay.pCx->pKeyInfo = pOp->p4.pKeyInfo; + u.ay.pCx->pKeyInfo->enc = ENC(p->db); + u.ay.pCx->isSorter = 1; + rc = sqlite3VdbeSorterInit(db, u.ay.pCx); +#else + pOp->opcode = OP_OpenEphemeral; + pc--; +#endif + break; +} /* Opcode: OpenPseudo P1 P2 P3 * * ** ** Open a new cursor that points to a fake table that contains a single ** row of data. The content of that one row in the content of memory @@ -66002,21 +66822,21 @@ ** ** P3 is the number of fields in the records that will be stored by ** the pseudo-table. */ case OP_OpenPseudo: { -#if 0 /* local variables moved into u.ay */ +#if 0 /* local variables moved into u.az */ VdbeCursor *pCx; -#endif /* local variables moved into u.ay */ +#endif /* local variables moved into u.az */ assert( pOp->p1>=0 ); - u.ay.pCx = allocateCursor(p, pOp->p1, pOp->p3, -1, 0); - if( u.ay.pCx==0 ) goto no_mem; - u.ay.pCx->nullRow = 1; - u.ay.pCx->pseudoTableReg = pOp->p2; - u.ay.pCx->isTable = 1; - u.ay.pCx->isIndex = 0; + u.az.pCx = allocateCursor(p, pOp->p1, pOp->p3, -1, 0); + if( u.az.pCx==0 ) goto no_mem; + u.az.pCx->nullRow = 1; + u.az.pCx->pseudoTableReg = pOp->p2; + u.az.pCx->isTable = 1; + u.az.pCx->isIndex = 0; break; } /* Opcode: Close P1 * * * * ** @@ -66084,39 +66904,39 @@ */ case OP_SeekLt: /* jump, in3 */ case OP_SeekLe: /* jump, in3 */ case OP_SeekGe: /* jump, in3 */ case OP_SeekGt: { /* jump, in3 */ -#if 0 /* local variables moved into u.az */ +#if 0 /* local variables moved into u.ba */ int res; int oc; VdbeCursor *pC; UnpackedRecord r; int nField; i64 iKey; /* The rowid we are to seek to */ -#endif /* local variables moved into u.az */ +#endif /* local variables moved into u.ba */ assert( pOp->p1>=0 && pOp->p1nCursor ); assert( pOp->p2!=0 ); - u.az.pC = p->apCsr[pOp->p1]; - assert( u.az.pC!=0 ); - assert( u.az.pC->pseudoTableReg==0 ); + u.ba.pC = p->apCsr[pOp->p1]; + assert( u.ba.pC!=0 ); + assert( u.ba.pC->pseudoTableReg==0 ); assert( OP_SeekLe == OP_SeekLt+1 ); assert( OP_SeekGe == OP_SeekLt+2 ); assert( OP_SeekGt == OP_SeekLt+3 ); - assert( u.az.pC->isOrdered ); - if( u.az.pC->pCursor!=0 ){ - u.az.oc = pOp->opcode; - u.az.pC->nullRow = 0; - if( u.az.pC->isTable ){ + assert( u.ba.pC->isOrdered ); + if( ALWAYS(u.ba.pC->pCursor!=0) ){ + u.ba.oc = pOp->opcode; + u.ba.pC->nullRow = 0; + if( u.ba.pC->isTable ){ /* The input value in P3 might be of any type: integer, real, string, ** blob, or NULL. But it needs to be an integer before we can do ** the seek, so covert it. */ pIn3 = &aMem[pOp->p3]; applyNumericAffinity(pIn3); - u.az.iKey = sqlite3VdbeIntValue(pIn3); - u.az.pC->rowidIsValid = 0; + u.ba.iKey = sqlite3VdbeIntValue(pIn3); + u.ba.pC->rowidIsValid = 0; /* If the P3 value could not be converted into an integer without ** loss of information, then special processing is required... */ if( (pIn3->flags & MEM_Int)==0 ){ if( (pIn3->flags & MEM_Real)==0 ){ @@ -66127,105 +66947,105 @@ } /* If we reach this point, then the P3 value must be a floating ** point number. */ assert( (pIn3->flags & MEM_Real)!=0 ); - if( u.az.iKey==SMALLEST_INT64 && (pIn3->r<(double)u.az.iKey || pIn3->r>0) ){ - /* The P3 value is too large in magnitude to be expressed as an - ** integer. */ - u.az.res = 1; - if( pIn3->r<0 ){ - if( u.az.oc>=OP_SeekGe ){ assert( u.az.oc==OP_SeekGe || u.az.oc==OP_SeekGt ); - rc = sqlite3BtreeFirst(u.az.pC->pCursor, &u.az.res); - if( rc!=SQLITE_OK ) goto abort_due_to_error; - } - }else{ - if( u.az.oc<=OP_SeekLe ){ assert( u.az.oc==OP_SeekLt || u.az.oc==OP_SeekLe ); - rc = sqlite3BtreeLast(u.az.pC->pCursor, &u.az.res); - if( rc!=SQLITE_OK ) goto abort_due_to_error; - } - } - if( u.az.res ){ - pc = pOp->p2 - 1; - } - break; - }else if( u.az.oc==OP_SeekLt || u.az.oc==OP_SeekGe ){ - /* Use the ceiling() function to convert real->int */ - if( pIn3->r > (double)u.az.iKey ) u.az.iKey++; - }else{ - /* Use the floor() function to convert real->int */ - assert( u.az.oc==OP_SeekLe || u.az.oc==OP_SeekGt ); - if( pIn3->r < (double)u.az.iKey ) u.az.iKey--; - } - } - rc = sqlite3BtreeMovetoUnpacked(u.az.pC->pCursor, 0, (u64)u.az.iKey, 0, &u.az.res); - if( rc!=SQLITE_OK ){ - goto abort_due_to_error; - } - if( u.az.res==0 ){ - u.az.pC->rowidIsValid = 1; - u.az.pC->lastRowid = u.az.iKey; - } - }else{ - u.az.nField = pOp->p4.i; - assert( pOp->p4type==P4_INT32 ); - assert( u.az.nField>0 ); - u.az.r.pKeyInfo = u.az.pC->pKeyInfo; - u.az.r.nField = (u16)u.az.nField; - - /* The next line of code computes as follows, only faster: - ** if( u.az.oc==OP_SeekGt || u.az.oc==OP_SeekLe ){ - ** u.az.r.flags = UNPACKED_INCRKEY; - ** }else{ - ** u.az.r.flags = 0; - ** } - */ - u.az.r.flags = (u16)(UNPACKED_INCRKEY * (1 & (u.az.oc - OP_SeekLt))); - assert( u.az.oc!=OP_SeekGt || u.az.r.flags==UNPACKED_INCRKEY ); - assert( u.az.oc!=OP_SeekLe || u.az.r.flags==UNPACKED_INCRKEY ); - assert( u.az.oc!=OP_SeekGe || u.az.r.flags==0 ); - assert( u.az.oc!=OP_SeekLt || u.az.r.flags==0 ); - - u.az.r.aMem = &aMem[pOp->p3]; -#ifdef SQLITE_DEBUG - { int i; for(i=0; ipCursor, &u.az.r, 0, 0, &u.az.res); - if( rc!=SQLITE_OK ){ - goto abort_due_to_error; - } - u.az.pC->rowidIsValid = 0; - } - u.az.pC->deferredMoveto = 0; - u.az.pC->cacheStatus = CACHE_STALE; -#ifdef SQLITE_TEST - sqlite3_search_count++; -#endif - if( u.az.oc>=OP_SeekGe ){ assert( u.az.oc==OP_SeekGe || u.az.oc==OP_SeekGt ); - if( u.az.res<0 || (u.az.res==0 && u.az.oc==OP_SeekGt) ){ - rc = sqlite3BtreeNext(u.az.pC->pCursor, &u.az.res); - if( rc!=SQLITE_OK ) goto abort_due_to_error; - u.az.pC->rowidIsValid = 0; - }else{ - u.az.res = 0; - } - }else{ - assert( u.az.oc==OP_SeekLt || u.az.oc==OP_SeekLe ); - if( u.az.res>0 || (u.az.res==0 && u.az.oc==OP_SeekLt) ){ - rc = sqlite3BtreePrevious(u.az.pC->pCursor, &u.az.res); - if( rc!=SQLITE_OK ) goto abort_due_to_error; - u.az.pC->rowidIsValid = 0; - }else{ - /* u.az.res might be negative because the table is empty. Check to - ** see if this is the case. - */ - u.az.res = sqlite3BtreeEof(u.az.pC->pCursor); - } - } - assert( pOp->p2>0 ); - if( u.az.res ){ + if( u.ba.iKey==SMALLEST_INT64 && (pIn3->r<(double)u.ba.iKey || pIn3->r>0) ){ + /* The P3 value is too large in magnitude to be expressed as an + ** integer. */ + u.ba.res = 1; + if( pIn3->r<0 ){ + if( u.ba.oc>=OP_SeekGe ){ assert( u.ba.oc==OP_SeekGe || u.ba.oc==OP_SeekGt ); + rc = sqlite3BtreeFirst(u.ba.pC->pCursor, &u.ba.res); + if( rc!=SQLITE_OK ) goto abort_due_to_error; + } + }else{ + if( u.ba.oc<=OP_SeekLe ){ assert( u.ba.oc==OP_SeekLt || u.ba.oc==OP_SeekLe ); + rc = sqlite3BtreeLast(u.ba.pC->pCursor, &u.ba.res); + if( rc!=SQLITE_OK ) goto abort_due_to_error; + } + } + if( u.ba.res ){ + pc = pOp->p2 - 1; + } + break; + }else if( u.ba.oc==OP_SeekLt || u.ba.oc==OP_SeekGe ){ + /* Use the ceiling() function to convert real->int */ + if( pIn3->r > (double)u.ba.iKey ) u.ba.iKey++; + }else{ + /* Use the floor() function to convert real->int */ + assert( u.ba.oc==OP_SeekLe || u.ba.oc==OP_SeekGt ); + if( pIn3->r < (double)u.ba.iKey ) u.ba.iKey--; + } + } + rc = sqlite3BtreeMovetoUnpacked(u.ba.pC->pCursor, 0, (u64)u.ba.iKey, 0, &u.ba.res); + if( rc!=SQLITE_OK ){ + goto abort_due_to_error; + } + if( u.ba.res==0 ){ + u.ba.pC->rowidIsValid = 1; + u.ba.pC->lastRowid = u.ba.iKey; + } + }else{ + u.ba.nField = pOp->p4.i; + assert( pOp->p4type==P4_INT32 ); + assert( u.ba.nField>0 ); + u.ba.r.pKeyInfo = u.ba.pC->pKeyInfo; + u.ba.r.nField = (u16)u.ba.nField; + + /* The next line of code computes as follows, only faster: + ** if( u.ba.oc==OP_SeekGt || u.ba.oc==OP_SeekLe ){ + ** u.ba.r.flags = UNPACKED_INCRKEY; + ** }else{ + ** u.ba.r.flags = 0; + ** } + */ + u.ba.r.flags = (u16)(UNPACKED_INCRKEY * (1 & (u.ba.oc - OP_SeekLt))); + assert( u.ba.oc!=OP_SeekGt || u.ba.r.flags==UNPACKED_INCRKEY ); + assert( u.ba.oc!=OP_SeekLe || u.ba.r.flags==UNPACKED_INCRKEY ); + assert( u.ba.oc!=OP_SeekGe || u.ba.r.flags==0 ); + assert( u.ba.oc!=OP_SeekLt || u.ba.r.flags==0 ); + + u.ba.r.aMem = &aMem[pOp->p3]; +#ifdef SQLITE_DEBUG + { int i; for(i=0; ipCursor, &u.ba.r, 0, 0, &u.ba.res); + if( rc!=SQLITE_OK ){ + goto abort_due_to_error; + } + u.ba.pC->rowidIsValid = 0; + } + u.ba.pC->deferredMoveto = 0; + u.ba.pC->cacheStatus = CACHE_STALE; +#ifdef SQLITE_TEST + sqlite3_search_count++; +#endif + if( u.ba.oc>=OP_SeekGe ){ assert( u.ba.oc==OP_SeekGe || u.ba.oc==OP_SeekGt ); + if( u.ba.res<0 || (u.ba.res==0 && u.ba.oc==OP_SeekGt) ){ + rc = sqlite3BtreeNext(u.ba.pC->pCursor, &u.ba.res); + if( rc!=SQLITE_OK ) goto abort_due_to_error; + u.ba.pC->rowidIsValid = 0; + }else{ + u.ba.res = 0; + } + }else{ + assert( u.ba.oc==OP_SeekLt || u.ba.oc==OP_SeekLe ); + if( u.ba.res>0 || (u.ba.res==0 && u.ba.oc==OP_SeekLt) ){ + rc = sqlite3BtreePrevious(u.ba.pC->pCursor, &u.ba.res); + if( rc!=SQLITE_OK ) goto abort_due_to_error; + u.ba.pC->rowidIsValid = 0; + }else{ + /* u.ba.res might be negative because the table is empty. Check to + ** see if this is the case. + */ + u.ba.res = sqlite3BtreeEof(u.ba.pC->pCursor); + } + } + assert( pOp->p2>0 ); + if( u.ba.res ){ pc = pOp->p2 - 1; } }else{ /* This happens when attempting to open the sqlite3_master table ** for read access returns SQLITE_EMPTY. In this case always @@ -66244,24 +67064,24 @@ ** This is actually a deferred seek. Nothing actually happens until ** the cursor is used to read a record. That way, if no reads ** occur, no unnecessary I/O happens. */ case OP_Seek: { /* in2 */ -#if 0 /* local variables moved into u.ba */ +#if 0 /* local variables moved into u.bb */ VdbeCursor *pC; -#endif /* local variables moved into u.ba */ +#endif /* local variables moved into u.bb */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.ba.pC = p->apCsr[pOp->p1]; - assert( u.ba.pC!=0 ); - if( ALWAYS(u.ba.pC->pCursor!=0) ){ - assert( u.ba.pC->isTable ); - u.ba.pC->nullRow = 0; + u.bb.pC = p->apCsr[pOp->p1]; + assert( u.bb.pC!=0 ); + if( ALWAYS(u.bb.pC->pCursor!=0) ){ + assert( u.bb.pC->isTable ); + u.bb.pC->nullRow = 0; pIn2 = &aMem[pOp->p2]; - u.ba.pC->movetoTarget = sqlite3VdbeIntValue(pIn2); - u.ba.pC->rowidIsValid = 0; - u.ba.pC->deferredMoveto = 1; + u.bb.pC->movetoTarget = sqlite3VdbeIntValue(pIn2); + u.bb.pC->rowidIsValid = 0; + u.bb.pC->deferredMoveto = 1; } break; } @@ -66289,66 +67109,67 @@ ** ** See also: Found, NotExists, IsUnique */ case OP_NotFound: /* jump, in3 */ case OP_Found: { /* jump, in3 */ -#if 0 /* local variables moved into u.bb */ +#if 0 /* local variables moved into u.bc */ int alreadyExists; VdbeCursor *pC; int res; + char *pFree; UnpackedRecord *pIdxKey; UnpackedRecord r; char aTempRec[ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*3 + 7]; -#endif /* local variables moved into u.bb */ +#endif /* local variables moved into u.bc */ #ifdef SQLITE_TEST sqlite3_found_count++; #endif - u.bb.alreadyExists = 0; + u.bc.alreadyExists = 0; assert( pOp->p1>=0 && pOp->p1nCursor ); assert( pOp->p4type==P4_INT32 ); - u.bb.pC = p->apCsr[pOp->p1]; - assert( u.bb.pC!=0 ); + u.bc.pC = p->apCsr[pOp->p1]; + assert( u.bc.pC!=0 ); pIn3 = &aMem[pOp->p3]; - if( ALWAYS(u.bb.pC->pCursor!=0) ){ + if( ALWAYS(u.bc.pC->pCursor!=0) ){ - assert( u.bb.pC->isTable==0 ); + assert( u.bc.pC->isTable==0 ); if( pOp->p4.i>0 ){ - u.bb.r.pKeyInfo = u.bb.pC->pKeyInfo; - u.bb.r.nField = (u16)pOp->p4.i; - u.bb.r.aMem = pIn3; + u.bc.r.pKeyInfo = u.bc.pC->pKeyInfo; + u.bc.r.nField = (u16)pOp->p4.i; + u.bc.r.aMem = pIn3; #ifdef SQLITE_DEBUG - { int i; for(i=0; ipKeyInfo, u.bc.aTempRec, sizeof(u.bc.aTempRec), &u.bc.pFree + ); + if( u.bc.pIdxKey==0 ) goto no_mem; assert( pIn3->flags & MEM_Blob ); assert( (pIn3->flags & MEM_Zero)==0 ); /* zeroblobs already expanded */ - u.bb.pIdxKey = sqlite3VdbeRecordUnpack(u.bb.pC->pKeyInfo, pIn3->n, pIn3->z, - u.bb.aTempRec, sizeof(u.bb.aTempRec)); - if( u.bb.pIdxKey==0 ){ - goto no_mem; - } - u.bb.pIdxKey->flags |= UNPACKED_PREFIX_MATCH; - } - rc = sqlite3BtreeMovetoUnpacked(u.bb.pC->pCursor, u.bb.pIdxKey, 0, 0, &u.bb.res); + sqlite3VdbeRecordUnpack(u.bc.pC->pKeyInfo, pIn3->n, pIn3->z, u.bc.pIdxKey); + u.bc.pIdxKey->flags |= UNPACKED_PREFIX_MATCH; + } + rc = sqlite3BtreeMovetoUnpacked(u.bc.pC->pCursor, u.bc.pIdxKey, 0, 0, &u.bc.res); if( pOp->p4.i==0 ){ - sqlite3VdbeDeleteUnpackedRecord(u.bb.pIdxKey); + sqlite3DbFree(db, u.bc.pFree); } if( rc!=SQLITE_OK ){ break; } - u.bb.alreadyExists = (u.bb.res==0); - u.bb.pC->deferredMoveto = 0; - u.bb.pC->cacheStatus = CACHE_STALE; + u.bc.alreadyExists = (u.bc.res==0); + u.bc.pC->deferredMoveto = 0; + u.bc.pC->cacheStatus = CACHE_STALE; } if( pOp->opcode==OP_Found ){ - if( u.bb.alreadyExists ) pc = pOp->p2 - 1; + if( u.bc.alreadyExists ) pc = pOp->p2 - 1; }else{ - if( !u.bb.alreadyExists ) pc = pOp->p2 - 1; + if( !u.bc.alreadyExists ) pc = pOp->p2 - 1; } break; } /* Opcode: IsUnique P1 P2 P3 P4 * @@ -66376,67 +67197,67 @@ ** instruction. ** ** See also: NotFound, NotExists, Found */ case OP_IsUnique: { /* jump, in3 */ -#if 0 /* local variables moved into u.bc */ +#if 0 /* local variables moved into u.bd */ u16 ii; VdbeCursor *pCx; BtCursor *pCrsr; u16 nField; Mem *aMx; UnpackedRecord r; /* B-Tree index search key */ i64 R; /* Rowid stored in register P3 */ -#endif /* local variables moved into u.bc */ +#endif /* local variables moved into u.bd */ pIn3 = &aMem[pOp->p3]; - u.bc.aMx = &aMem[pOp->p4.i]; + u.bd.aMx = &aMem[pOp->p4.i]; /* Assert that the values of parameters P1 and P4 are in range. */ assert( pOp->p4type==P4_INT32 ); assert( pOp->p4.i>0 && pOp->p4.i<=p->nMem ); assert( pOp->p1>=0 && pOp->p1nCursor ); /* Find the index cursor. */ - u.bc.pCx = p->apCsr[pOp->p1]; - assert( u.bc.pCx->deferredMoveto==0 ); - u.bc.pCx->seekResult = 0; - u.bc.pCx->cacheStatus = CACHE_STALE; - u.bc.pCrsr = u.bc.pCx->pCursor; + u.bd.pCx = p->apCsr[pOp->p1]; + assert( u.bd.pCx->deferredMoveto==0 ); + u.bd.pCx->seekResult = 0; + u.bd.pCx->cacheStatus = CACHE_STALE; + u.bd.pCrsr = u.bd.pCx->pCursor; /* If any of the values are NULL, take the jump. */ - u.bc.nField = u.bc.pCx->pKeyInfo->nField; - for(u.bc.ii=0; u.bc.iipKeyInfo->nField; + for(u.bd.ii=0; u.bd.iip2 - 1; - u.bc.pCrsr = 0; + u.bd.pCrsr = 0; break; } } - assert( (u.bc.aMx[u.bc.nField].flags & MEM_Null)==0 ); + assert( (u.bd.aMx[u.bd.nField].flags & MEM_Null)==0 ); - if( u.bc.pCrsr!=0 ){ + if( u.bd.pCrsr!=0 ){ /* Populate the index search key. */ - u.bc.r.pKeyInfo = u.bc.pCx->pKeyInfo; - u.bc.r.nField = u.bc.nField + 1; - u.bc.r.flags = UNPACKED_PREFIX_SEARCH; - u.bc.r.aMem = u.bc.aMx; + u.bd.r.pKeyInfo = u.bd.pCx->pKeyInfo; + u.bd.r.nField = u.bd.nField + 1; + u.bd.r.flags = UNPACKED_PREFIX_SEARCH; + u.bd.r.aMem = u.bd.aMx; #ifdef SQLITE_DEBUG - { int i; for(i=0; iu.i; + u.bd.R = pIn3->u.i; /* Search the B-Tree index. If no conflicting record is found, jump ** to P2. Otherwise, copy the rowid of the conflicting record to ** register P3 and fall through to the next instruction. */ - rc = sqlite3BtreeMovetoUnpacked(u.bc.pCrsr, &u.bc.r, 0, 0, &u.bc.pCx->seekResult); - if( (u.bc.r.flags & UNPACKED_PREFIX_SEARCH) || u.bc.r.rowid==u.bc.R ){ + rc = sqlite3BtreeMovetoUnpacked(u.bd.pCrsr, &u.bd.r, 0, 0, &u.bd.pCx->seekResult); + if( (u.bd.r.flags & UNPACKED_PREFIX_SEARCH) || u.bd.r.rowid==u.bd.R ){ pc = pOp->p2 - 1; }else{ - pIn3->u.i = u.bc.r.rowid; + pIn3->u.i = u.bd.r.rowid; } } break; } @@ -66453,46 +67274,46 @@ ** P1 is an index. ** ** See also: Found, NotFound, IsUnique */ case OP_NotExists: { /* jump, in3 */ -#if 0 /* local variables moved into u.bd */ +#if 0 /* local variables moved into u.be */ VdbeCursor *pC; BtCursor *pCrsr; int res; u64 iKey; -#endif /* local variables moved into u.bd */ +#endif /* local variables moved into u.be */ pIn3 = &aMem[pOp->p3]; assert( pIn3->flags & MEM_Int ); assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bd.pC = p->apCsr[pOp->p1]; - assert( u.bd.pC!=0 ); - assert( u.bd.pC->isTable ); - assert( u.bd.pC->pseudoTableReg==0 ); - u.bd.pCrsr = u.bd.pC->pCursor; - if( u.bd.pCrsr!=0 ){ - u.bd.res = 0; - u.bd.iKey = pIn3->u.i; - rc = sqlite3BtreeMovetoUnpacked(u.bd.pCrsr, 0, u.bd.iKey, 0, &u.bd.res); - u.bd.pC->lastRowid = pIn3->u.i; - u.bd.pC->rowidIsValid = u.bd.res==0 ?1:0; - u.bd.pC->nullRow = 0; - u.bd.pC->cacheStatus = CACHE_STALE; - u.bd.pC->deferredMoveto = 0; - if( u.bd.res!=0 ){ + u.be.pC = p->apCsr[pOp->p1]; + assert( u.be.pC!=0 ); + assert( u.be.pC->isTable ); + assert( u.be.pC->pseudoTableReg==0 ); + u.be.pCrsr = u.be.pC->pCursor; + if( ALWAYS(u.be.pCrsr!=0) ){ + u.be.res = 0; + u.be.iKey = pIn3->u.i; + rc = sqlite3BtreeMovetoUnpacked(u.be.pCrsr, 0, u.be.iKey, 0, &u.be.res); + u.be.pC->lastRowid = pIn3->u.i; + u.be.pC->rowidIsValid = u.be.res==0 ?1:0; + u.be.pC->nullRow = 0; + u.be.pC->cacheStatus = CACHE_STALE; + u.be.pC->deferredMoveto = 0; + if( u.be.res!=0 ){ pc = pOp->p2 - 1; - assert( u.bd.pC->rowidIsValid==0 ); + assert( u.be.pC->rowidIsValid==0 ); } - u.bd.pC->seekResult = u.bd.res; + u.be.pC->seekResult = u.be.res; }else{ /* This happens when an attempt to open a read cursor on the ** sqlite_master table returns SQLITE_EMPTY. */ pc = pOp->p2 - 1; - assert( u.bd.pC->rowidIsValid==0 ); - u.bd.pC->seekResult = 0; + assert( u.be.pC->rowidIsValid==0 ); + u.be.pC->seekResult = 0; } break; } /* Opcode: Sequence P1 P2 * * * @@ -66523,25 +67344,25 @@ ** an SQLITE_FULL error is generated. The P3 register is updated with the ' ** generated record number. This P3 mechanism is used to help implement the ** AUTOINCREMENT feature. */ case OP_NewRowid: { /* out2-prerelease */ -#if 0 /* local variables moved into u.be */ +#if 0 /* local variables moved into u.bf */ i64 v; /* The new rowid */ VdbeCursor *pC; /* Cursor of table to get the new rowid */ int res; /* Result of an sqlite3BtreeLast() */ int cnt; /* Counter to limit the number of searches */ Mem *pMem; /* Register holding largest rowid for AUTOINCREMENT */ VdbeFrame *pFrame; /* Root frame of VDBE */ -#endif /* local variables moved into u.be */ +#endif /* local variables moved into u.bf */ - u.be.v = 0; - u.be.res = 0; + u.bf.v = 0; + u.bf.res = 0; assert( pOp->p1>=0 && pOp->p1nCursor ); - u.be.pC = p->apCsr[pOp->p1]; - assert( u.be.pC!=0 ); - if( NEVER(u.be.pC->pCursor==0) ){ + u.bf.pC = p->apCsr[pOp->p1]; + assert( u.bf.pC!=0 ); + if( NEVER(u.bf.pC->pCursor==0) ){ /* The zero initialization above is all that is needed */ }else{ /* The next rowid or record number (different terms for the same ** thing) is obtained in a two-step algorithm. ** @@ -66553,11 +67374,11 @@ ** The second algorithm is to select a rowid at random and see if ** it already exists in the table. If it does not exist, we have ** succeeded. If the random rowid does exist, we select a new one ** and try again, up to 100 times. */ - assert( u.be.pC->isTable ); + assert( u.bf.pC->isTable ); #ifdef SQLITE_32BIT_ROWID # define MAX_ROWID 0x7fffffff #else /* Some compilers complain about constants of the form 0x7fffffffffffffff. @@ -66565,101 +67386,101 @@ ** to provide the constant while making all compilers happy. */ # define MAX_ROWID (i64)( (((u64)0x7fffffff)<<32) | (u64)0xffffffff ) #endif - if( !u.be.pC->useRandomRowid ){ - u.be.v = sqlite3BtreeGetCachedRowid(u.be.pC->pCursor); - if( u.be.v==0 ){ - rc = sqlite3BtreeLast(u.be.pC->pCursor, &u.be.res); + if( !u.bf.pC->useRandomRowid ){ + u.bf.v = sqlite3BtreeGetCachedRowid(u.bf.pC->pCursor); + if( u.bf.v==0 ){ + rc = sqlite3BtreeLast(u.bf.pC->pCursor, &u.bf.res); if( rc!=SQLITE_OK ){ goto abort_due_to_error; } - if( u.be.res ){ - u.be.v = 1; /* IMP: R-61914-48074 */ + if( u.bf.res ){ + u.bf.v = 1; /* IMP: R-61914-48074 */ }else{ - assert( sqlite3BtreeCursorIsValid(u.be.pC->pCursor) ); - rc = sqlite3BtreeKeySize(u.be.pC->pCursor, &u.be.v); + assert( sqlite3BtreeCursorIsValid(u.bf.pC->pCursor) ); + rc = sqlite3BtreeKeySize(u.bf.pC->pCursor, &u.bf.v); assert( rc==SQLITE_OK ); /* Cannot fail following BtreeLast() */ - if( u.be.v==MAX_ROWID ){ - u.be.pC->useRandomRowid = 1; + if( u.bf.v==MAX_ROWID ){ + u.bf.pC->useRandomRowid = 1; }else{ - u.be.v++; /* IMP: R-29538-34987 */ + u.bf.v++; /* IMP: R-29538-34987 */ } } } #ifndef SQLITE_OMIT_AUTOINCREMENT if( pOp->p3 ){ /* Assert that P3 is a valid memory cell. */ assert( pOp->p3>0 ); if( p->pFrame ){ - for(u.be.pFrame=p->pFrame; u.be.pFrame->pParent; u.be.pFrame=u.be.pFrame->pParent); + for(u.bf.pFrame=p->pFrame; u.bf.pFrame->pParent; u.bf.pFrame=u.bf.pFrame->pParent); /* Assert that P3 is a valid memory cell. */ - assert( pOp->p3<=u.be.pFrame->nMem ); - u.be.pMem = &u.be.pFrame->aMem[pOp->p3]; + assert( pOp->p3<=u.bf.pFrame->nMem ); + u.bf.pMem = &u.bf.pFrame->aMem[pOp->p3]; }else{ /* Assert that P3 is a valid memory cell. */ assert( pOp->p3<=p->nMem ); - u.be.pMem = &aMem[pOp->p3]; - memAboutToChange(p, u.be.pMem); - } - assert( memIsValid(u.be.pMem) ); - - REGISTER_TRACE(pOp->p3, u.be.pMem); - sqlite3VdbeMemIntegerify(u.be.pMem); - assert( (u.be.pMem->flags & MEM_Int)!=0 ); /* mem(P3) holds an integer */ - if( u.be.pMem->u.i==MAX_ROWID || u.be.pC->useRandomRowid ){ + u.bf.pMem = &aMem[pOp->p3]; + memAboutToChange(p, u.bf.pMem); + } + assert( memIsValid(u.bf.pMem) ); + + REGISTER_TRACE(pOp->p3, u.bf.pMem); + sqlite3VdbeMemIntegerify(u.bf.pMem); + assert( (u.bf.pMem->flags & MEM_Int)!=0 ); /* mem(P3) holds an integer */ + if( u.bf.pMem->u.i==MAX_ROWID || u.bf.pC->useRandomRowid ){ rc = SQLITE_FULL; /* IMP: R-12275-61338 */ goto abort_due_to_error; } - if( u.be.vu.i+1 ){ - u.be.v = u.be.pMem->u.i + 1; + if( u.bf.vu.i+1 ){ + u.bf.v = u.bf.pMem->u.i + 1; } - u.be.pMem->u.i = u.be.v; + u.bf.pMem->u.i = u.bf.v; } #endif - sqlite3BtreeSetCachedRowid(u.be.pC->pCursor, u.be.vpCursor, u.bf.vuseRandomRowid ){ + if( u.bf.pC->useRandomRowid ){ /* IMPLEMENTATION-OF: R-07677-41881 If the largest ROWID is equal to the ** largest possible integer (9223372036854775807) then the database ** engine starts picking positive candidate ROWIDs at random until ** it finds one that is not previously used. */ assert( pOp->p3==0 ); /* We cannot be in random rowid mode if this is ** an AUTOINCREMENT table. */ /* on the first attempt, simply do one more than previous */ - u.be.v = lastRowid; - u.be.v &= (MAX_ROWID>>1); /* ensure doesn't go negative */ - u.be.v++; /* ensure non-zero */ - u.be.cnt = 0; - while( ((rc = sqlite3BtreeMovetoUnpacked(u.be.pC->pCursor, 0, (u64)u.be.v, - 0, &u.be.res))==SQLITE_OK) - && (u.be.res==0) - && (++u.be.cnt<100)){ + u.bf.v = lastRowid; + u.bf.v &= (MAX_ROWID>>1); /* ensure doesn't go negative */ + u.bf.v++; /* ensure non-zero */ + u.bf.cnt = 0; + while( ((rc = sqlite3BtreeMovetoUnpacked(u.bf.pC->pCursor, 0, (u64)u.bf.v, + 0, &u.bf.res))==SQLITE_OK) + && (u.bf.res==0) + && (++u.bf.cnt<100)){ /* collision - try another random rowid */ - sqlite3_randomness(sizeof(u.be.v), &u.be.v); - if( u.be.cnt<5 ){ + sqlite3_randomness(sizeof(u.bf.v), &u.bf.v); + if( u.bf.cnt<5 ){ /* try "small" random rowids for the initial attempts */ - u.be.v &= 0xffffff; + u.bf.v &= 0xffffff; }else{ - u.be.v &= (MAX_ROWID>>1); /* ensure doesn't go negative */ + u.bf.v &= (MAX_ROWID>>1); /* ensure doesn't go negative */ } - u.be.v++; /* ensure non-zero */ + u.bf.v++; /* ensure non-zero */ } - if( rc==SQLITE_OK && u.be.res==0 ){ + if( rc==SQLITE_OK && u.bf.res==0 ){ rc = SQLITE_FULL; /* IMP: R-38219-53002 */ goto abort_due_to_error; } - assert( u.be.v>0 ); /* EV: R-40812-03570 */ + assert( u.bf.v>0 ); /* EV: R-40812-03570 */ } - u.be.pC->rowidIsValid = 0; - u.be.pC->deferredMoveto = 0; - u.be.pC->cacheStatus = CACHE_STALE; + u.bf.pC->rowidIsValid = 0; + u.bf.pC->deferredMoveto = 0; + u.bf.pC->cacheStatus = CACHE_STALE; } - pOut->u.i = u.be.v; + pOut->u.i = u.bf.v; break; } /* Opcode: Insert P1 P2 P3 P4 P5 ** @@ -66705,74 +67526,74 @@ ** This works exactly like OP_Insert except that the key is the ** integer value P3, not the value of the integer stored in register P3. */ case OP_Insert: case OP_InsertInt: { -#if 0 /* local variables moved into u.bf */ +#if 0 /* local variables moved into u.bg */ Mem *pData; /* MEM cell holding data for the record to be inserted */ Mem *pKey; /* MEM cell holding key for the record */ i64 iKey; /* The integer ROWID or key for the record to be inserted */ VdbeCursor *pC; /* Cursor to table into which insert is written */ int nZero; /* Number of zero-bytes to append */ int seekResult; /* Result of prior seek or 0 if no USESEEKRESULT flag */ const char *zDb; /* database name - used by the update hook */ const char *zTbl; /* Table name - used by the opdate hook */ int op; /* Opcode for update hook: SQLITE_UPDATE or SQLITE_INSERT */ -#endif /* local variables moved into u.bf */ +#endif /* local variables moved into u.bg */ - u.bf.pData = &aMem[pOp->p2]; + u.bg.pData = &aMem[pOp->p2]; assert( pOp->p1>=0 && pOp->p1nCursor ); - assert( memIsValid(u.bf.pData) ); - u.bf.pC = p->apCsr[pOp->p1]; - assert( u.bf.pC!=0 ); - assert( u.bf.pC->pCursor!=0 ); - assert( u.bf.pC->pseudoTableReg==0 ); - assert( u.bf.pC->isTable ); - REGISTER_TRACE(pOp->p2, u.bf.pData); + assert( memIsValid(u.bg.pData) ); + u.bg.pC = p->apCsr[pOp->p1]; + assert( u.bg.pC!=0 ); + assert( u.bg.pC->pCursor!=0 ); + assert( u.bg.pC->pseudoTableReg==0 ); + assert( u.bg.pC->isTable ); + REGISTER_TRACE(pOp->p2, u.bg.pData); if( pOp->opcode==OP_Insert ){ - u.bf.pKey = &aMem[pOp->p3]; - assert( u.bf.pKey->flags & MEM_Int ); - assert( memIsValid(u.bf.pKey) ); - REGISTER_TRACE(pOp->p3, u.bf.pKey); - u.bf.iKey = u.bf.pKey->u.i; + u.bg.pKey = &aMem[pOp->p3]; + assert( u.bg.pKey->flags & MEM_Int ); + assert( memIsValid(u.bg.pKey) ); + REGISTER_TRACE(pOp->p3, u.bg.pKey); + u.bg.iKey = u.bg.pKey->u.i; }else{ assert( pOp->opcode==OP_InsertInt ); - u.bf.iKey = pOp->p3; + u.bg.iKey = pOp->p3; } if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++; - if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = lastRowid = u.bf.iKey; - if( u.bf.pData->flags & MEM_Null ){ - u.bf.pData->z = 0; - u.bf.pData->n = 0; - }else{ - assert( u.bf.pData->flags & (MEM_Blob|MEM_Str) ); - } - u.bf.seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? u.bf.pC->seekResult : 0); - if( u.bf.pData->flags & MEM_Zero ){ - u.bf.nZero = u.bf.pData->u.nZero; - }else{ - u.bf.nZero = 0; - } - sqlite3BtreeSetCachedRowid(u.bf.pC->pCursor, 0); - rc = sqlite3BtreeInsert(u.bf.pC->pCursor, 0, u.bf.iKey, - u.bf.pData->z, u.bf.pData->n, u.bf.nZero, - pOp->p5 & OPFLAG_APPEND, u.bf.seekResult + if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = lastRowid = u.bg.iKey; + if( u.bg.pData->flags & MEM_Null ){ + u.bg.pData->z = 0; + u.bg.pData->n = 0; + }else{ + assert( u.bg.pData->flags & (MEM_Blob|MEM_Str) ); + } + u.bg.seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? u.bg.pC->seekResult : 0); + if( u.bg.pData->flags & MEM_Zero ){ + u.bg.nZero = u.bg.pData->u.nZero; + }else{ + u.bg.nZero = 0; + } + sqlite3BtreeSetCachedRowid(u.bg.pC->pCursor, 0); + rc = sqlite3BtreeInsert(u.bg.pC->pCursor, 0, u.bg.iKey, + u.bg.pData->z, u.bg.pData->n, u.bg.nZero, + pOp->p5 & OPFLAG_APPEND, u.bg.seekResult ); - u.bf.pC->rowidIsValid = 0; - u.bf.pC->deferredMoveto = 0; - u.bf.pC->cacheStatus = CACHE_STALE; + u.bg.pC->rowidIsValid = 0; + u.bg.pC->deferredMoveto = 0; + u.bg.pC->cacheStatus = CACHE_STALE; /* Invoke the update-hook if required. */ if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p4.z ){ - u.bf.zDb = db->aDb[u.bf.pC->iDb].zName; - u.bf.zTbl = pOp->p4.z; - u.bf.op = ((pOp->p5 & OPFLAG_ISUPDATE) ? SQLITE_UPDATE : SQLITE_INSERT); - assert( u.bf.pC->isTable ); - db->xUpdateCallback(db->pUpdateArg, u.bf.op, u.bf.zDb, u.bf.zTbl, u.bf.iKey); - assert( u.bf.pC->iDb>=0 ); + u.bg.zDb = db->aDb[u.bg.pC->iDb].zName; + u.bg.zTbl = pOp->p4.z; + u.bg.op = ((pOp->p5 & OPFLAG_ISUPDATE) ? SQLITE_UPDATE : SQLITE_INSERT); + assert( u.bg.pC->isTable ); + db->xUpdateCallback(db->pUpdateArg, u.bg.op, u.bg.zDb, u.bg.zTbl, u.bg.iKey); + assert( u.bg.pC->iDb>=0 ); } break; } /* Opcode: Delete P1 P2 * P4 * @@ -66794,51 +67615,51 @@ ** pointing to. The update hook will be invoked, if it exists. ** If P4 is not NULL then the P1 cursor must have been positioned ** using OP_NotFound prior to invoking this opcode. */ case OP_Delete: { -#if 0 /* local variables moved into u.bg */ +#if 0 /* local variables moved into u.bh */ i64 iKey; VdbeCursor *pC; -#endif /* local variables moved into u.bg */ +#endif /* local variables moved into u.bh */ - u.bg.iKey = 0; + u.bh.iKey = 0; assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bg.pC = p->apCsr[pOp->p1]; - assert( u.bg.pC!=0 ); - assert( u.bg.pC->pCursor!=0 ); /* Only valid for real tables, no pseudotables */ + u.bh.pC = p->apCsr[pOp->p1]; + assert( u.bh.pC!=0 ); + assert( u.bh.pC->pCursor!=0 ); /* Only valid for real tables, no pseudotables */ - /* If the update-hook will be invoked, set u.bg.iKey to the rowid of the + /* If the update-hook will be invoked, set u.bh.iKey to the rowid of the ** row being deleted. */ if( db->xUpdateCallback && pOp->p4.z ){ - assert( u.bg.pC->isTable ); - assert( u.bg.pC->rowidIsValid ); /* lastRowid set by previous OP_NotFound */ - u.bg.iKey = u.bg.pC->lastRowid; + assert( u.bh.pC->isTable ); + assert( u.bh.pC->rowidIsValid ); /* lastRowid set by previous OP_NotFound */ + u.bh.iKey = u.bh.pC->lastRowid; } /* The OP_Delete opcode always follows an OP_NotExists or OP_Last or ** OP_Column on the same table without any intervening operations that - ** might move or invalidate the cursor. Hence cursor u.bg.pC is always pointing + ** might move or invalidate the cursor. Hence cursor u.bh.pC is always pointing ** to the row to be deleted and the sqlite3VdbeCursorMoveto() operation ** below is always a no-op and cannot fail. We will run it anyhow, though, ** to guard against future changes to the code generator. **/ - assert( u.bg.pC->deferredMoveto==0 ); - rc = sqlite3VdbeCursorMoveto(u.bg.pC); + assert( u.bh.pC->deferredMoveto==0 ); + rc = sqlite3VdbeCursorMoveto(u.bh.pC); if( NEVER(rc!=SQLITE_OK) ) goto abort_due_to_error; - sqlite3BtreeSetCachedRowid(u.bg.pC->pCursor, 0); - rc = sqlite3BtreeDelete(u.bg.pC->pCursor); - u.bg.pC->cacheStatus = CACHE_STALE; + sqlite3BtreeSetCachedRowid(u.bh.pC->pCursor, 0); + rc = sqlite3BtreeDelete(u.bh.pC->pCursor); + u.bh.pC->cacheStatus = CACHE_STALE; /* Invoke the update-hook if required. */ if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p4.z ){ - const char *zDb = db->aDb[u.bg.pC->iDb].zName; + const char *zDb = db->aDb[u.bh.pC->iDb].zName; const char *zTbl = pOp->p4.z; - db->xUpdateCallback(db->pUpdateArg, SQLITE_DELETE, zDb, zTbl, u.bg.iKey); - assert( u.bg.pC->iDb>=0 ); + db->xUpdateCallback(db->pUpdateArg, SQLITE_DELETE, zDb, zTbl, u.bh.iKey); + assert( u.bh.pC->iDb>=0 ); } if( pOp->p2 & OPFLAG_NCHANGE ) p->nChange++; break; } /* Opcode: ResetCount * * * * * @@ -66851,10 +67672,53 @@ case OP_ResetCount: { sqlite3VdbeSetChanges(db, p->nChange); p->nChange = 0; break; } + +/* Opcode: SorterCompare P1 P2 P3 +** +** P1 is a sorter cursor. This instruction compares the record blob in +** register P3 with the entry that the sorter cursor currently points to. +** If, excluding the rowid fields at the end, the two records are a match, +** fall through to the next instruction. Otherwise, jump to instruction P2. +*/ +case OP_SorterCompare: { +#if 0 /* local variables moved into u.bi */ + VdbeCursor *pC; + int res; +#endif /* local variables moved into u.bi */ + + u.bi.pC = p->apCsr[pOp->p1]; + assert( isSorter(u.bi.pC) ); + pIn3 = &aMem[pOp->p3]; + rc = sqlite3VdbeSorterCompare(u.bi.pC, pIn3, &u.bi.res); + if( u.bi.res ){ + pc = pOp->p2-1; + } + break; +}; + +/* Opcode: SorterData P1 P2 * * * +** +** Write into register P2 the current sorter data for sorter cursor P1. +*/ +case OP_SorterData: { +#if 0 /* local variables moved into u.bj */ + VdbeCursor *pC; +#endif /* local variables moved into u.bj */ +#ifndef SQLITE_OMIT_MERGE_SORT + pOut = &aMem[pOp->p2]; + u.bj.pC = p->apCsr[pOp->p1]; + assert( u.bj.pC->isSorter ); + rc = sqlite3VdbeSorterRowkey(u.bj.pC, pOut); +#else + pOp->opcode = OP_RowKey; + pc--; +#endif + break; +} /* Opcode: RowData P1 P2 * * * ** ** Write into register P2 the complete row data for cursor P1. ** There is no interpretation of the data. @@ -66874,65 +67738,67 @@ ** If the P1 cursor must be pointing to a valid row (not a NULL row) ** of a real table, not a pseudo-table. */ case OP_RowKey: case OP_RowData: { -#if 0 /* local variables moved into u.bh */ +#if 0 /* local variables moved into u.bk */ VdbeCursor *pC; BtCursor *pCrsr; u32 n; i64 n64; -#endif /* local variables moved into u.bh */ +#endif /* local variables moved into u.bk */ pOut = &aMem[pOp->p2]; memAboutToChange(p, pOut); /* Note that RowKey and RowData are really exactly the same instruction */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bh.pC = p->apCsr[pOp->p1]; - assert( u.bh.pC->isTable || pOp->opcode==OP_RowKey ); - assert( u.bh.pC->isIndex || pOp->opcode==OP_RowData ); - assert( u.bh.pC!=0 ); - assert( u.bh.pC->nullRow==0 ); - assert( u.bh.pC->pseudoTableReg==0 ); - assert( u.bh.pC->pCursor!=0 ); - u.bh.pCrsr = u.bh.pC->pCursor; - assert( sqlite3BtreeCursorIsValid(u.bh.pCrsr) ); + u.bk.pC = p->apCsr[pOp->p1]; + assert( u.bk.pC->isSorter==0 ); + assert( u.bk.pC->isTable || pOp->opcode!=OP_RowData ); + assert( u.bk.pC->isIndex || pOp->opcode==OP_RowData ); + assert( u.bk.pC!=0 ); + assert( u.bk.pC->nullRow==0 ); + assert( u.bk.pC->pseudoTableReg==0 ); + assert( !u.bk.pC->isSorter ); + assert( u.bk.pC->pCursor!=0 ); + u.bk.pCrsr = u.bk.pC->pCursor; + assert( sqlite3BtreeCursorIsValid(u.bk.pCrsr) ); /* The OP_RowKey and OP_RowData opcodes always follow OP_NotExists or ** OP_Rewind/Op_Next with no intervening instructions that might invalidate ** the cursor. Hence the following sqlite3VdbeCursorMoveto() call is always ** a no-op and can never fail. But we leave it in place as a safety. */ - assert( u.bh.pC->deferredMoveto==0 ); - rc = sqlite3VdbeCursorMoveto(u.bh.pC); - if( NEVER(rc!=SQLITE_OK) ) goto abort_due_to_error; - - if( u.bh.pC->isIndex ){ - assert( !u.bh.pC->isTable ); - rc = sqlite3BtreeKeySize(u.bh.pCrsr, &u.bh.n64); - assert( rc==SQLITE_OK ); /* True because of CursorMoveto() call above */ - if( u.bh.n64>db->aLimit[SQLITE_LIMIT_LENGTH] ){ - goto too_big; - } - u.bh.n = (u32)u.bh.n64; - }else{ - rc = sqlite3BtreeDataSize(u.bh.pCrsr, &u.bh.n); - assert( rc==SQLITE_OK ); /* DataSize() cannot fail */ - if( u.bh.n>(u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){ - goto too_big; - } - } - if( sqlite3VdbeMemGrow(pOut, u.bh.n, 0) ){ - goto no_mem; - } - pOut->n = u.bh.n; - MemSetTypeFlag(pOut, MEM_Blob); - if( u.bh.pC->isIndex ){ - rc = sqlite3BtreeKey(u.bh.pCrsr, 0, u.bh.n, pOut->z); - }else{ - rc = sqlite3BtreeData(u.bh.pCrsr, 0, u.bh.n, pOut->z); + assert( u.bk.pC->deferredMoveto==0 ); + rc = sqlite3VdbeCursorMoveto(u.bk.pC); + if( NEVER(rc!=SQLITE_OK) ) goto abort_due_to_error; + + if( u.bk.pC->isIndex ){ + assert( !u.bk.pC->isTable ); + rc = sqlite3BtreeKeySize(u.bk.pCrsr, &u.bk.n64); + assert( rc==SQLITE_OK ); /* True because of CursorMoveto() call above */ + if( u.bk.n64>db->aLimit[SQLITE_LIMIT_LENGTH] ){ + goto too_big; + } + u.bk.n = (u32)u.bk.n64; + }else{ + rc = sqlite3BtreeDataSize(u.bk.pCrsr, &u.bk.n); + assert( rc==SQLITE_OK ); /* DataSize() cannot fail */ + if( u.bk.n>(u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){ + goto too_big; + } + } + if( sqlite3VdbeMemGrow(pOut, u.bk.n, 0) ){ + goto no_mem; + } + pOut->n = u.bk.n; + MemSetTypeFlag(pOut, MEM_Blob); + if( u.bk.pC->isIndex ){ + rc = sqlite3BtreeKey(u.bk.pCrsr, 0, u.bk.n, pOut->z); + }else{ + rc = sqlite3BtreeData(u.bk.pCrsr, 0, u.bk.n, pOut->z); } pOut->enc = SQLITE_UTF8; /* In case the blob is ever cast to text */ UPDATE_MAX_BLOBSIZE(pOut); break; } @@ -66945,46 +67811,46 @@ ** P1 can be either an ordinary table or a virtual table. There used to ** be a separate OP_VRowid opcode for use with virtual tables, but this ** one opcode now works for both table types. */ case OP_Rowid: { /* out2-prerelease */ -#if 0 /* local variables moved into u.bi */ +#if 0 /* local variables moved into u.bl */ VdbeCursor *pC; i64 v; sqlite3_vtab *pVtab; const sqlite3_module *pModule; -#endif /* local variables moved into u.bi */ +#endif /* local variables moved into u.bl */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bi.pC = p->apCsr[pOp->p1]; - assert( u.bi.pC!=0 ); - assert( u.bi.pC->pseudoTableReg==0 ); - if( u.bi.pC->nullRow ){ + u.bl.pC = p->apCsr[pOp->p1]; + assert( u.bl.pC!=0 ); + assert( u.bl.pC->pseudoTableReg==0 ); + if( u.bl.pC->nullRow ){ pOut->flags = MEM_Null; break; - }else if( u.bi.pC->deferredMoveto ){ - u.bi.v = u.bi.pC->movetoTarget; + }else if( u.bl.pC->deferredMoveto ){ + u.bl.v = u.bl.pC->movetoTarget; #ifndef SQLITE_OMIT_VIRTUALTABLE - }else if( u.bi.pC->pVtabCursor ){ - u.bi.pVtab = u.bi.pC->pVtabCursor->pVtab; - u.bi.pModule = u.bi.pVtab->pModule; - assert( u.bi.pModule->xRowid ); - rc = u.bi.pModule->xRowid(u.bi.pC->pVtabCursor, &u.bi.v); - importVtabErrMsg(p, u.bi.pVtab); + }else if( u.bl.pC->pVtabCursor ){ + u.bl.pVtab = u.bl.pC->pVtabCursor->pVtab; + u.bl.pModule = u.bl.pVtab->pModule; + assert( u.bl.pModule->xRowid ); + rc = u.bl.pModule->xRowid(u.bl.pC->pVtabCursor, &u.bl.v); + importVtabErrMsg(p, u.bl.pVtab); #endif /* SQLITE_OMIT_VIRTUALTABLE */ }else{ - assert( u.bi.pC->pCursor!=0 ); - rc = sqlite3VdbeCursorMoveto(u.bi.pC); + assert( u.bl.pC->pCursor!=0 ); + rc = sqlite3VdbeCursorMoveto(u.bl.pC); if( rc ) goto abort_due_to_error; - if( u.bi.pC->rowidIsValid ){ - u.bi.v = u.bi.pC->lastRowid; + if( u.bl.pC->rowidIsValid ){ + u.bl.v = u.bl.pC->lastRowid; }else{ - rc = sqlite3BtreeKeySize(u.bi.pC->pCursor, &u.bi.v); + rc = sqlite3BtreeKeySize(u.bl.pC->pCursor, &u.bl.v); assert( rc==SQLITE_OK ); /* Always so because of CursorMoveto() above */ } } - pOut->u.i = u.bi.v; + pOut->u.i = u.bl.v; break; } /* Opcode: NullRow P1 * * * * ** @@ -66991,21 +67857,22 @@ ** Move the cursor P1 to a null row. Any OP_Column operations ** that occur while the cursor is on the null row will always ** write a NULL. */ case OP_NullRow: { -#if 0 /* local variables moved into u.bj */ +#if 0 /* local variables moved into u.bm */ VdbeCursor *pC; -#endif /* local variables moved into u.bj */ +#endif /* local variables moved into u.bm */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bj.pC = p->apCsr[pOp->p1]; - assert( u.bj.pC!=0 ); - u.bj.pC->nullRow = 1; - u.bj.pC->rowidIsValid = 0; - if( u.bj.pC->pCursor ){ - sqlite3BtreeClearCursor(u.bj.pC->pCursor); + u.bm.pC = p->apCsr[pOp->p1]; + assert( u.bm.pC!=0 ); + u.bm.pC->nullRow = 1; + u.bm.pC->rowidIsValid = 0; + assert( u.bm.pC->pCursor || u.bm.pC->pVtabCursor ); + if( u.bm.pC->pCursor ){ + sqlite3BtreeClearCursor(u.bm.pC->pCursor); } break; } /* Opcode: Last P1 P2 * * * @@ -67015,30 +67882,30 @@ ** If the table or index is empty and P2>0, then jump immediately to P2. ** If P2 is 0 or if the table or index is not empty, fall through ** to the following instruction. */ case OP_Last: { /* jump */ -#if 0 /* local variables moved into u.bk */ +#if 0 /* local variables moved into u.bn */ VdbeCursor *pC; BtCursor *pCrsr; int res; -#endif /* local variables moved into u.bk */ +#endif /* local variables moved into u.bn */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bk.pC = p->apCsr[pOp->p1]; - assert( u.bk.pC!=0 ); - u.bk.pCrsr = u.bk.pC->pCursor; - if( u.bk.pCrsr==0 ){ - u.bk.res = 1; + u.bn.pC = p->apCsr[pOp->p1]; + assert( u.bn.pC!=0 ); + u.bn.pCrsr = u.bn.pC->pCursor; + if( NEVER(u.bn.pCrsr==0) ){ + u.bn.res = 1; }else{ - rc = sqlite3BtreeLast(u.bk.pCrsr, &u.bk.res); + rc = sqlite3BtreeLast(u.bn.pCrsr, &u.bn.res); } - u.bk.pC->nullRow = (u8)u.bk.res; - u.bk.pC->deferredMoveto = 0; - u.bk.pC->rowidIsValid = 0; - u.bk.pC->cacheStatus = CACHE_STALE; - if( pOp->p2>0 && u.bk.res ){ + u.bn.pC->nullRow = (u8)u.bn.res; + u.bn.pC->deferredMoveto = 0; + u.bn.pC->rowidIsValid = 0; + u.bn.pC->cacheStatus = CACHE_STALE; + if( pOp->p2>0 && u.bn.res ){ pc = pOp->p2 - 1; } break; } @@ -67053,10 +67920,14 @@ ** end. We use the OP_Sort opcode instead of OP_Rewind to do the ** rewinding so that the global variable will be incremented and ** regression tests can determine whether or not the optimizer is ** correctly optimizing out sorts. */ +case OP_SorterSort: /* jump */ +#ifdef SQLITE_OMIT_MERGE_SORT + pOp->opcode = OP_Sort; +#endif case OP_Sort: { /* jump */ #ifdef SQLITE_TEST sqlite3_sort_count++; sqlite3_search_count--; #endif @@ -67070,43 +67941,51 @@ ** If the table or index is empty and P2>0, then jump immediately to P2. ** If P2 is 0 or if the table or index is not empty, fall through ** to the following instruction. */ case OP_Rewind: { /* jump */ -#if 0 /* local variables moved into u.bl */ +#if 0 /* local variables moved into u.bo */ VdbeCursor *pC; BtCursor *pCrsr; int res; -#endif /* local variables moved into u.bl */ +#endif /* local variables moved into u.bo */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bl.pC = p->apCsr[pOp->p1]; - assert( u.bl.pC!=0 ); - u.bl.res = 1; - if( (u.bl.pCrsr = u.bl.pC->pCursor)!=0 ){ - rc = sqlite3BtreeFirst(u.bl.pCrsr, &u.bl.res); - u.bl.pC->atFirst = u.bl.res==0 ?1:0; - u.bl.pC->deferredMoveto = 0; - u.bl.pC->cacheStatus = CACHE_STALE; - u.bl.pC->rowidIsValid = 0; - } - u.bl.pC->nullRow = (u8)u.bl.res; + u.bo.pC = p->apCsr[pOp->p1]; + assert( u.bo.pC!=0 ); + assert( u.bo.pC->isSorter==(pOp->opcode==OP_SorterSort) ); + u.bo.res = 1; + if( isSorter(u.bo.pC) ){ + rc = sqlite3VdbeSorterRewind(db, u.bo.pC, &u.bo.res); + }else{ + u.bo.pCrsr = u.bo.pC->pCursor; + assert( u.bo.pCrsr ); + rc = sqlite3BtreeFirst(u.bo.pCrsr, &u.bo.res); + u.bo.pC->atFirst = u.bo.res==0 ?1:0; + u.bo.pC->deferredMoveto = 0; + u.bo.pC->cacheStatus = CACHE_STALE; + u.bo.pC->rowidIsValid = 0; + } + u.bo.pC->nullRow = (u8)u.bo.res; assert( pOp->p2>0 && pOp->p2nOp ); - if( u.bl.res ){ + if( u.bo.res ){ pc = pOp->p2 - 1; } break; } -/* Opcode: Next P1 P2 * * P5 +/* Opcode: Next P1 P2 * P4 P5 ** ** Advance cursor P1 so that it points to the next key/data pair in its ** table or index. If there are no more key/value pairs then fall through ** to the following instruction. But if the cursor advance was successful, ** jump immediately to P2. ** ** The P1 cursor must be for a real table, not a pseudo-table. +** +** P4 is always of type P4_ADVANCE. The function pointer points to +** sqlite3BtreeNext(). ** ** If P5 is positive and the jump is taken, then event counter ** number P5-1 in the prepared statement is incremented. ** ** See also: Prev @@ -67117,48 +67996,57 @@ ** table or index. If there is no previous key/value pairs then fall through ** to the following instruction. But if the cursor backup was successful, ** jump immediately to P2. ** ** The P1 cursor must be for a real table, not a pseudo-table. +** +** P4 is always of type P4_ADVANCE. The function pointer points to +** sqlite3BtreePrevious(). ** ** If P5 is positive and the jump is taken, then event counter ** number P5-1 in the prepared statement is incremented. */ +case OP_SorterNext: /* jump */ +#ifdef SQLITE_OMIT_MERGE_SORT + pOp->opcode = OP_Next; +#endif case OP_Prev: /* jump */ case OP_Next: { /* jump */ -#if 0 /* local variables moved into u.bm */ +#if 0 /* local variables moved into u.bp */ VdbeCursor *pC; - BtCursor *pCrsr; int res; -#endif /* local variables moved into u.bm */ +#endif /* local variables moved into u.bp */ CHECK_FOR_INTERRUPT; assert( pOp->p1>=0 && pOp->p1nCursor ); assert( pOp->p5<=ArraySize(p->aCounter) ); - u.bm.pC = p->apCsr[pOp->p1]; - if( u.bm.pC==0 ){ + u.bp.pC = p->apCsr[pOp->p1]; + if( u.bp.pC==0 ){ break; /* See ticket #2273 */ } - u.bm.pCrsr = u.bm.pC->pCursor; - if( u.bm.pCrsr==0 ){ - u.bm.pC->nullRow = 1; - break; - } - u.bm.res = 1; - assert( u.bm.pC->deferredMoveto==0 ); - rc = pOp->opcode==OP_Next ? sqlite3BtreeNext(u.bm.pCrsr, &u.bm.res) : - sqlite3BtreePrevious(u.bm.pCrsr, &u.bm.res); - u.bm.pC->nullRow = (u8)u.bm.res; - u.bm.pC->cacheStatus = CACHE_STALE; - if( u.bm.res==0 ){ + assert( u.bp.pC->isSorter==(pOp->opcode==OP_SorterNext) ); + if( isSorter(u.bp.pC) ){ + assert( pOp->opcode==OP_SorterNext ); + rc = sqlite3VdbeSorterNext(db, u.bp.pC, &u.bp.res); + }else{ + u.bp.res = 1; + assert( u.bp.pC->deferredMoveto==0 ); + assert( u.bp.pC->pCursor ); + assert( pOp->opcode!=OP_Next || pOp->p4.xAdvance==sqlite3BtreeNext ); + assert( pOp->opcode!=OP_Prev || pOp->p4.xAdvance==sqlite3BtreePrevious ); + rc = pOp->p4.xAdvance(u.bp.pC->pCursor, &u.bp.res); + } + u.bp.pC->nullRow = (u8)u.bp.res; + u.bp.pC->cacheStatus = CACHE_STALE; + if( u.bp.res==0 ){ pc = pOp->p2 - 1; if( pOp->p5 ) p->aCounter[pOp->p5-1]++; #ifdef SQLITE_TEST sqlite3_search_count++; #endif } - u.bm.pC->rowidIsValid = 0; + u.bp.pC->rowidIsValid = 0; break; } /* Opcode: IdxInsert P1 P2 P3 * P5 ** @@ -67170,35 +68058,44 @@ ** insert is likely to be an append. ** ** This instruction only works for indices. The equivalent instruction ** for tables is OP_Insert. */ +case OP_SorterInsert: /* in2 */ +#ifdef SQLITE_OMIT_MERGE_SORT + pOp->opcode = OP_IdxInsert; +#endif case OP_IdxInsert: { /* in2 */ -#if 0 /* local variables moved into u.bn */ +#if 0 /* local variables moved into u.bq */ VdbeCursor *pC; BtCursor *pCrsr; int nKey; const char *zKey; -#endif /* local variables moved into u.bn */ +#endif /* local variables moved into u.bq */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bn.pC = p->apCsr[pOp->p1]; - assert( u.bn.pC!=0 ); + u.bq.pC = p->apCsr[pOp->p1]; + assert( u.bq.pC!=0 ); + assert( u.bq.pC->isSorter==(pOp->opcode==OP_SorterInsert) ); pIn2 = &aMem[pOp->p2]; assert( pIn2->flags & MEM_Blob ); - u.bn.pCrsr = u.bn.pC->pCursor; - if( ALWAYS(u.bn.pCrsr!=0) ){ - assert( u.bn.pC->isTable==0 ); + u.bq.pCrsr = u.bq.pC->pCursor; + if( ALWAYS(u.bq.pCrsr!=0) ){ + assert( u.bq.pC->isTable==0 ); rc = ExpandBlob(pIn2); if( rc==SQLITE_OK ){ - u.bn.nKey = pIn2->n; - u.bn.zKey = pIn2->z; - rc = sqlite3BtreeInsert(u.bn.pCrsr, u.bn.zKey, u.bn.nKey, "", 0, 0, pOp->p3, - ((pOp->p5 & OPFLAG_USESEEKRESULT) ? u.bn.pC->seekResult : 0) - ); - assert( u.bn.pC->deferredMoveto==0 ); - u.bn.pC->cacheStatus = CACHE_STALE; + if( isSorter(u.bq.pC) ){ + rc = sqlite3VdbeSorterWrite(db, u.bq.pC, pIn2); + }else{ + u.bq.nKey = pIn2->n; + u.bq.zKey = pIn2->z; + rc = sqlite3BtreeInsert(u.bq.pCrsr, u.bq.zKey, u.bq.nKey, "", 0, 0, pOp->p3, + ((pOp->p5 & OPFLAG_USESEEKRESULT) ? u.bq.pC->seekResult : 0) + ); + assert( u.bq.pC->deferredMoveto==0 ); + u.bq.pC->cacheStatus = CACHE_STALE; + } } } break; } @@ -67207,37 +68104,37 @@ ** The content of P3 registers starting at register P2 form ** an unpacked index key. This opcode removes that entry from the ** index opened by cursor P1. */ case OP_IdxDelete: { -#if 0 /* local variables moved into u.bo */ +#if 0 /* local variables moved into u.br */ VdbeCursor *pC; BtCursor *pCrsr; int res; UnpackedRecord r; -#endif /* local variables moved into u.bo */ +#endif /* local variables moved into u.br */ assert( pOp->p3>0 ); assert( pOp->p2>0 && pOp->p2+pOp->p3<=p->nMem+1 ); assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bo.pC = p->apCsr[pOp->p1]; - assert( u.bo.pC!=0 ); - u.bo.pCrsr = u.bo.pC->pCursor; - if( ALWAYS(u.bo.pCrsr!=0) ){ - u.bo.r.pKeyInfo = u.bo.pC->pKeyInfo; - u.bo.r.nField = (u16)pOp->p3; - u.bo.r.flags = 0; - u.bo.r.aMem = &aMem[pOp->p2]; + u.br.pC = p->apCsr[pOp->p1]; + assert( u.br.pC!=0 ); + u.br.pCrsr = u.br.pC->pCursor; + if( ALWAYS(u.br.pCrsr!=0) ){ + u.br.r.pKeyInfo = u.br.pC->pKeyInfo; + u.br.r.nField = (u16)pOp->p3; + u.br.r.flags = 0; + u.br.r.aMem = &aMem[pOp->p2]; #ifdef SQLITE_DEBUG - { int i; for(i=0; ideferredMoveto==0 ); - u.bo.pC->cacheStatus = CACHE_STALE; + assert( u.br.pC->deferredMoveto==0 ); + u.br.pC->cacheStatus = CACHE_STALE; } break; } /* Opcode: IdxRowid P1 P2 * * * @@ -67247,32 +68144,32 @@ ** the rowid of the table entry to which this index entry points. ** ** See also: Rowid, MakeRecord. */ case OP_IdxRowid: { /* out2-prerelease */ -#if 0 /* local variables moved into u.bp */ +#if 0 /* local variables moved into u.bs */ BtCursor *pCrsr; VdbeCursor *pC; i64 rowid; -#endif /* local variables moved into u.bp */ +#endif /* local variables moved into u.bs */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bp.pC = p->apCsr[pOp->p1]; - assert( u.bp.pC!=0 ); - u.bp.pCrsr = u.bp.pC->pCursor; + u.bs.pC = p->apCsr[pOp->p1]; + assert( u.bs.pC!=0 ); + u.bs.pCrsr = u.bs.pC->pCursor; pOut->flags = MEM_Null; - if( ALWAYS(u.bp.pCrsr!=0) ){ - rc = sqlite3VdbeCursorMoveto(u.bp.pC); + if( ALWAYS(u.bs.pCrsr!=0) ){ + rc = sqlite3VdbeCursorMoveto(u.bs.pC); if( NEVER(rc) ) goto abort_due_to_error; - assert( u.bp.pC->deferredMoveto==0 ); - assert( u.bp.pC->isTable==0 ); - if( !u.bp.pC->nullRow ){ - rc = sqlite3VdbeIdxRowid(db, u.bp.pCrsr, &u.bp.rowid); + assert( u.bs.pC->deferredMoveto==0 ); + assert( u.bs.pC->isTable==0 ); + if( !u.bs.pC->nullRow ){ + rc = sqlite3VdbeIdxRowid(db, u.bs.pCrsr, &u.bs.rowid); if( rc!=SQLITE_OK ){ goto abort_due_to_error; } - pOut->u.i = u.bp.rowid; + pOut->u.i = u.bs.rowid; pOut->flags = MEM_Int; } } break; } @@ -67303,43 +68200,43 @@ ** If P5 is non-zero then the key value is increased by an epsilon prior ** to the comparison. This makes the opcode work like IdxLE. */ case OP_IdxLT: /* jump */ case OP_IdxGE: { /* jump */ -#if 0 /* local variables moved into u.bq */ +#if 0 /* local variables moved into u.bt */ VdbeCursor *pC; int res; UnpackedRecord r; -#endif /* local variables moved into u.bq */ +#endif /* local variables moved into u.bt */ assert( pOp->p1>=0 && pOp->p1nCursor ); - u.bq.pC = p->apCsr[pOp->p1]; - assert( u.bq.pC!=0 ); - assert( u.bq.pC->isOrdered ); - if( ALWAYS(u.bq.pC->pCursor!=0) ){ - assert( u.bq.pC->deferredMoveto==0 ); + u.bt.pC = p->apCsr[pOp->p1]; + assert( u.bt.pC!=0 ); + assert( u.bt.pC->isOrdered ); + if( ALWAYS(u.bt.pC->pCursor!=0) ){ + assert( u.bt.pC->deferredMoveto==0 ); assert( pOp->p5==0 || pOp->p5==1 ); assert( pOp->p4type==P4_INT32 ); - u.bq.r.pKeyInfo = u.bq.pC->pKeyInfo; - u.bq.r.nField = (u16)pOp->p4.i; + u.bt.r.pKeyInfo = u.bt.pC->pKeyInfo; + u.bt.r.nField = (u16)pOp->p4.i; if( pOp->p5 ){ - u.bq.r.flags = UNPACKED_INCRKEY | UNPACKED_IGNORE_ROWID; + u.bt.r.flags = UNPACKED_INCRKEY | UNPACKED_IGNORE_ROWID; }else{ - u.bq.r.flags = UNPACKED_IGNORE_ROWID; + u.bt.r.flags = UNPACKED_IGNORE_ROWID; } - u.bq.r.aMem = &aMem[pOp->p3]; + u.bt.r.aMem = &aMem[pOp->p3]; #ifdef SQLITE_DEBUG - { int i; for(i=0; iopcode==OP_IdxLT ){ - u.bq.res = -u.bq.res; + u.bt.res = -u.bt.res; }else{ assert( pOp->opcode==OP_IdxGE ); - u.bq.res++; + u.bt.res++; } - if( u.bq.res>0 ){ + if( u.bt.res>0 ){ pc = pOp->p2 - 1 ; } } break; } @@ -67363,43 +68260,43 @@ ** If AUTOVACUUM is disabled then a zero is stored in register P2. ** ** See also: Clear */ case OP_Destroy: { /* out2-prerelease */ -#if 0 /* local variables moved into u.br */ +#if 0 /* local variables moved into u.bu */ int iMoved; int iCnt; Vdbe *pVdbe; int iDb; -#endif /* local variables moved into u.br */ +#endif /* local variables moved into u.bu */ #ifndef SQLITE_OMIT_VIRTUALTABLE - u.br.iCnt = 0; - for(u.br.pVdbe=db->pVdbe; u.br.pVdbe; u.br.pVdbe = u.br.pVdbe->pNext){ - if( u.br.pVdbe->magic==VDBE_MAGIC_RUN && u.br.pVdbe->inVtabMethod<2 && u.br.pVdbe->pc>=0 ){ - u.br.iCnt++; + u.bu.iCnt = 0; + for(u.bu.pVdbe=db->pVdbe; u.bu.pVdbe; u.bu.pVdbe = u.bu.pVdbe->pNext){ + if( u.bu.pVdbe->magic==VDBE_MAGIC_RUN && u.bu.pVdbe->inVtabMethod<2 && u.bu.pVdbe->pc>=0 ){ + u.bu.iCnt++; } } #else - u.br.iCnt = db->activeVdbeCnt; + u.bu.iCnt = db->activeVdbeCnt; #endif pOut->flags = MEM_Null; - if( u.br.iCnt>1 ){ + if( u.bu.iCnt>1 ){ rc = SQLITE_LOCKED; p->errorAction = OE_Abort; }else{ - u.br.iDb = pOp->p3; - assert( u.br.iCnt==1 ); - assert( (p->btreeMask & (((yDbMask)1)<aDb[u.br.iDb].pBt, pOp->p1, &u.br.iMoved); + u.bu.iDb = pOp->p3; + assert( u.bu.iCnt==1 ); + assert( (p->btreeMask & (((yDbMask)1)<aDb[u.bu.iDb].pBt, pOp->p1, &u.bu.iMoved); pOut->flags = MEM_Int; - pOut->u.i = u.br.iMoved; + pOut->u.i = u.bu.iMoved; #ifndef SQLITE_OMIT_AUTOVACUUM - if( rc==SQLITE_OK && u.br.iMoved!=0 ){ - sqlite3RootPageMoved(db, u.br.iDb, u.br.iMoved, pOp->p1); + if( rc==SQLITE_OK && u.bu.iMoved!=0 ){ + sqlite3RootPageMoved(db, u.bu.iDb, u.bu.iMoved, pOp->p1); /* All OP_Destroy operations occur on the same btree */ - assert( resetSchemaOnFault==0 || resetSchemaOnFault==u.br.iDb+1 ); - resetSchemaOnFault = u.br.iDb+1; + assert( resetSchemaOnFault==0 || resetSchemaOnFault==u.bu.iDb+1 ); + resetSchemaOnFault = u.bu.iDb+1; } #endif } break; } @@ -67421,25 +68318,25 @@ ** also incremented by the number of rows in the table being cleared. ** ** See also: Destroy */ case OP_Clear: { -#if 0 /* local variables moved into u.bs */ +#if 0 /* local variables moved into u.bv */ int nChange; -#endif /* local variables moved into u.bs */ +#endif /* local variables moved into u.bv */ - u.bs.nChange = 0; + u.bv.nChange = 0; assert( (p->btreeMask & (((yDbMask)1)<p2))!=0 ); rc = sqlite3BtreeClearTable( - db->aDb[pOp->p2].pBt, pOp->p1, (pOp->p3 ? &u.bs.nChange : 0) + db->aDb[pOp->p2].pBt, pOp->p1, (pOp->p3 ? &u.bv.nChange : 0) ); if( pOp->p3 ){ - p->nChange += u.bs.nChange; + p->nChange += u.bv.nChange; if( pOp->p3>0 ){ assert( memIsValid(&aMem[pOp->p3]) ); memAboutToChange(p, &aMem[pOp->p3]); - aMem[pOp->p3].u.i += u.bs.nChange; + aMem[pOp->p3].u.i += u.bv.nChange; } } break; } @@ -67465,29 +68362,29 @@ ** ** See documentation on OP_CreateTable for additional information. */ case OP_CreateIndex: /* out2-prerelease */ case OP_CreateTable: { /* out2-prerelease */ -#if 0 /* local variables moved into u.bt */ +#if 0 /* local variables moved into u.bw */ int pgno; int flags; Db *pDb; -#endif /* local variables moved into u.bt */ +#endif /* local variables moved into u.bw */ - u.bt.pgno = 0; + u.bw.pgno = 0; assert( pOp->p1>=0 && pOp->p1nDb ); assert( (p->btreeMask & (((yDbMask)1)<p1))!=0 ); - u.bt.pDb = &db->aDb[pOp->p1]; - assert( u.bt.pDb->pBt!=0 ); + u.bw.pDb = &db->aDb[pOp->p1]; + assert( u.bw.pDb->pBt!=0 ); if( pOp->opcode==OP_CreateTable ){ - /* u.bt.flags = BTREE_INTKEY; */ - u.bt.flags = BTREE_INTKEY; + /* u.bw.flags = BTREE_INTKEY; */ + u.bw.flags = BTREE_INTKEY; }else{ - u.bt.flags = BTREE_BLOBKEY; + u.bw.flags = BTREE_BLOBKEY; } - rc = sqlite3BtreeCreateTable(u.bt.pDb->pBt, &u.bt.pgno, u.bt.flags); - pOut->u.i = u.bt.pgno; + rc = sqlite3BtreeCreateTable(u.bw.pDb->pBt, &u.bw.pgno, u.bw.flags); + pOut->u.i = u.bw.pgno; break; } /* Opcode: ParseSchema P1 * * P4 * ** @@ -67496,48 +68393,48 @@ ** ** This opcode invokes the parser to create a new virtual machine, ** then runs the new virtual machine. It is thus a re-entrant opcode. */ case OP_ParseSchema: { -#if 0 /* local variables moved into u.bu */ +#if 0 /* local variables moved into u.bx */ int iDb; const char *zMaster; char *zSql; InitData initData; -#endif /* local variables moved into u.bu */ +#endif /* local variables moved into u.bx */ /* Any prepared statement that invokes this opcode will hold mutexes ** on every btree. This is a prerequisite for invoking ** sqlite3InitCallback(). */ #ifdef SQLITE_DEBUG - for(u.bu.iDb=0; u.bu.iDbnDb; u.bu.iDb++){ - assert( u.bu.iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[u.bu.iDb].pBt) ); + for(u.bx.iDb=0; u.bx.iDbnDb; u.bx.iDb++){ + assert( u.bx.iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[u.bx.iDb].pBt) ); } #endif - u.bu.iDb = pOp->p1; - assert( u.bu.iDb>=0 && u.bu.iDbnDb ); - assert( DbHasProperty(db, u.bu.iDb, DB_SchemaLoaded) ); + u.bx.iDb = pOp->p1; + assert( u.bx.iDb>=0 && u.bx.iDbnDb ); + assert( DbHasProperty(db, u.bx.iDb, DB_SchemaLoaded) ); /* Used to be a conditional */ { - u.bu.zMaster = SCHEMA_TABLE(u.bu.iDb); - u.bu.initData.db = db; - u.bu.initData.iDb = pOp->p1; - u.bu.initData.pzErrMsg = &p->zErrMsg; - u.bu.zSql = sqlite3MPrintf(db, + u.bx.zMaster = SCHEMA_TABLE(u.bx.iDb); + u.bx.initData.db = db; + u.bx.initData.iDb = pOp->p1; + u.bx.initData.pzErrMsg = &p->zErrMsg; + u.bx.zSql = sqlite3MPrintf(db, "SELECT name, rootpage, sql FROM '%q'.%s WHERE %s ORDER BY rowid", - db->aDb[u.bu.iDb].zName, u.bu.zMaster, pOp->p4.z); - if( u.bu.zSql==0 ){ + db->aDb[u.bx.iDb].zName, u.bx.zMaster, pOp->p4.z); + if( u.bx.zSql==0 ){ rc = SQLITE_NOMEM; }else{ assert( db->init.busy==0 ); db->init.busy = 1; - u.bu.initData.rc = SQLITE_OK; + u.bx.initData.rc = SQLITE_OK; assert( !db->mallocFailed ); - rc = sqlite3_exec(db, u.bu.zSql, sqlite3InitCallback, &u.bu.initData, 0); - if( rc==SQLITE_OK ) rc = u.bu.initData.rc; - sqlite3DbFree(db, u.bu.zSql); + rc = sqlite3_exec(db, u.bx.zSql, sqlite3InitCallback, &u.bx.initData, 0); + if( rc==SQLITE_OK ) rc = u.bx.initData.rc; + sqlite3DbFree(db, u.bx.zSql); db->init.busy = 0; } } if( rc==SQLITE_NOMEM ){ goto no_mem; @@ -67616,45 +68513,45 @@ ** file, not the main database file. ** ** This opcode is used to implement the integrity_check pragma. */ case OP_IntegrityCk: { -#if 0 /* local variables moved into u.bv */ +#if 0 /* local variables moved into u.by */ int nRoot; /* Number of tables to check. (Number of root pages.) */ int *aRoot; /* Array of rootpage numbers for tables to be checked */ int j; /* Loop counter */ int nErr; /* Number of errors reported */ char *z; /* Text of the error report */ Mem *pnErr; /* Register keeping track of errors remaining */ -#endif /* local variables moved into u.bv */ +#endif /* local variables moved into u.by */ - u.bv.nRoot = pOp->p2; - assert( u.bv.nRoot>0 ); - u.bv.aRoot = sqlite3DbMallocRaw(db, sizeof(int)*(u.bv.nRoot+1) ); - if( u.bv.aRoot==0 ) goto no_mem; + u.by.nRoot = pOp->p2; + assert( u.by.nRoot>0 ); + u.by.aRoot = sqlite3DbMallocRaw(db, sizeof(int)*(u.by.nRoot+1) ); + if( u.by.aRoot==0 ) goto no_mem; assert( pOp->p3>0 && pOp->p3<=p->nMem ); - u.bv.pnErr = &aMem[pOp->p3]; - assert( (u.bv.pnErr->flags & MEM_Int)!=0 ); - assert( (u.bv.pnErr->flags & (MEM_Str|MEM_Blob))==0 ); + u.by.pnErr = &aMem[pOp->p3]; + assert( (u.by.pnErr->flags & MEM_Int)!=0 ); + assert( (u.by.pnErr->flags & (MEM_Str|MEM_Blob))==0 ); pIn1 = &aMem[pOp->p1]; - for(u.bv.j=0; u.bv.jp5nDb ); assert( (p->btreeMask & (((yDbMask)1)<p5))!=0 ); - u.bv.z = sqlite3BtreeIntegrityCheck(db->aDb[pOp->p5].pBt, u.bv.aRoot, u.bv.nRoot, - (int)u.bv.pnErr->u.i, &u.bv.nErr); - sqlite3DbFree(db, u.bv.aRoot); - u.bv.pnErr->u.i -= u.bv.nErr; + u.by.z = sqlite3BtreeIntegrityCheck(db->aDb[pOp->p5].pBt, u.by.aRoot, u.by.nRoot, + (int)u.by.pnErr->u.i, &u.by.nErr); + sqlite3DbFree(db, u.by.aRoot); + u.by.pnErr->u.i -= u.by.nErr; sqlite3VdbeMemSetNull(pIn1); - if( u.bv.nErr==0 ){ - assert( u.bv.z==0 ); - }else if( u.bv.z==0 ){ + if( u.by.nErr==0 ){ + assert( u.by.z==0 ); + }else if( u.by.z==0 ){ goto no_mem; }else{ - sqlite3VdbeMemSetStr(pIn1, u.bv.z, -1, SQLITE_UTF8, sqlite3_free); + sqlite3VdbeMemSetStr(pIn1, u.by.z, -1, SQLITE_UTF8, sqlite3_free); } UPDATE_MAX_BLOBSIZE(pIn1); sqlite3VdbeChangeEncoding(pIn1, encoding); break; } @@ -67684,24 +68581,24 @@ ** Extract the smallest value from boolean index P1 and put that value into ** register P3. Or, if boolean index P1 is initially empty, leave P3 ** unchanged and jump to instruction P2. */ case OP_RowSetRead: { /* jump, in1, out3 */ -#if 0 /* local variables moved into u.bw */ +#if 0 /* local variables moved into u.bz */ i64 val; -#endif /* local variables moved into u.bw */ +#endif /* local variables moved into u.bz */ CHECK_FOR_INTERRUPT; pIn1 = &aMem[pOp->p1]; if( (pIn1->flags & MEM_RowSet)==0 - || sqlite3RowSetNext(pIn1->u.pRowSet, &u.bw.val)==0 + || sqlite3RowSetNext(pIn1->u.pRowSet, &u.bz.val)==0 ){ /* The boolean index is empty */ sqlite3VdbeMemSetNull(pIn1); pc = pOp->p2 - 1; }else{ /* A value was pulled from the index */ - sqlite3VdbeMemSetInt64(&aMem[pOp->p3], u.bw.val); + sqlite3VdbeMemSetInt64(&aMem[pOp->p3], u.bz.val); } break; } /* Opcode: RowSetTest P1 P2 P3 P4 @@ -67726,18 +68623,18 @@ ** inserted, there is no need to search to see if the same value was ** previously inserted as part of set X (only if it was previously ** inserted as part of some other set). */ case OP_RowSetTest: { /* jump, in1, in3 */ -#if 0 /* local variables moved into u.bx */ +#if 0 /* local variables moved into u.ca */ int iSet; int exists; -#endif /* local variables moved into u.bx */ +#endif /* local variables moved into u.ca */ pIn1 = &aMem[pOp->p1]; pIn3 = &aMem[pOp->p3]; - u.bx.iSet = pOp->p4.i; + u.ca.iSet = pOp->p4.i; assert( pIn3->flags&MEM_Int ); /* If there is anything other than a rowset object in memory cell P1, ** delete it now and initialize P1 with an empty rowset */ @@ -67745,21 +68642,21 @@ sqlite3VdbeMemSetRowSet(pIn1); if( (pIn1->flags & MEM_RowSet)==0 ) goto no_mem; } assert( pOp->p4type==P4_INT32 ); - assert( u.bx.iSet==-1 || u.bx.iSet>=0 ); - if( u.bx.iSet ){ - u.bx.exists = sqlite3RowSetTest(pIn1->u.pRowSet, - (u8)(u.bx.iSet>=0 ? u.bx.iSet & 0xf : 0xff), + assert( u.ca.iSet==-1 || u.ca.iSet>=0 ); + if( u.ca.iSet ){ + u.ca.exists = sqlite3RowSetTest(pIn1->u.pRowSet, + (u8)(u.ca.iSet>=0 ? u.ca.iSet & 0xf : 0xff), pIn3->u.i); - if( u.bx.exists ){ + if( u.ca.exists ){ pc = pOp->p2 - 1; break; } } - if( u.bx.iSet>=0 ){ + if( u.ca.iSet>=0 ){ sqlite3RowSetInsert(pIn1->u.pRowSet, pIn3->u.i); } break; } @@ -67778,25 +68675,25 @@ ** memory required by the sub-vdbe at runtime. ** ** P4 is a pointer to the VM containing the trigger program. */ case OP_Program: { /* jump */ -#if 0 /* local variables moved into u.by */ +#if 0 /* local variables moved into u.cb */ int nMem; /* Number of memory registers for sub-program */ int nByte; /* Bytes of runtime space required for sub-program */ Mem *pRt; /* Register to allocate runtime space */ Mem *pMem; /* Used to iterate through memory cells */ Mem *pEnd; /* Last memory cell in new array */ VdbeFrame *pFrame; /* New vdbe frame to execute in */ SubProgram *pProgram; /* Sub-program to execute */ void *t; /* Token identifying trigger */ -#endif /* local variables moved into u.by */ +#endif /* local variables moved into u.cb */ - u.by.pProgram = pOp->p4.pProgram; - u.by.pRt = &aMem[pOp->p3]; - assert( memIsValid(u.by.pRt) ); - assert( u.by.pProgram->nOp>0 ); + u.cb.pProgram = pOp->p4.pProgram; + u.cb.pRt = &aMem[pOp->p3]; + assert( memIsValid(u.cb.pRt) ); + assert( u.cb.pProgram->nOp>0 ); /* If the p5 flag is clear, then recursive invocation of triggers is ** disabled for backwards compatibility (p5 is set if this sub-program ** is really a trigger, not a foreign key action, and the flag set ** and cleared by the "PRAGMA recursive_triggers" command is clear). @@ -67806,79 +68703,79 @@ ** SubProgram (if the trigger may be executed with more than one different ** ON CONFLICT algorithm). SubProgram structures associated with a ** single trigger all have the same value for the SubProgram.token ** variable. */ if( pOp->p5 ){ - u.by.t = u.by.pProgram->token; - for(u.by.pFrame=p->pFrame; u.by.pFrame && u.by.pFrame->token!=u.by.t; u.by.pFrame=u.by.pFrame->pParent); - if( u.by.pFrame ) break; + u.cb.t = u.cb.pProgram->token; + for(u.cb.pFrame=p->pFrame; u.cb.pFrame && u.cb.pFrame->token!=u.cb.t; u.cb.pFrame=u.cb.pFrame->pParent); + if( u.cb.pFrame ) break; } if( p->nFrame>=db->aLimit[SQLITE_LIMIT_TRIGGER_DEPTH] ){ rc = SQLITE_ERROR; sqlite3SetString(&p->zErrMsg, db, "too many levels of trigger recursion"); break; } - /* Register u.by.pRt is used to store the memory required to save the state + /* Register u.cb.pRt is used to store the memory required to save the state ** of the current program, and the memory required at runtime to execute - ** the trigger program. If this trigger has been fired before, then u.by.pRt + ** the trigger program. If this trigger has been fired before, then u.cb.pRt ** is already allocated. Otherwise, it must be initialized. */ - if( (u.by.pRt->flags&MEM_Frame)==0 ){ + if( (u.cb.pRt->flags&MEM_Frame)==0 ){ /* SubProgram.nMem is set to the number of memory cells used by the ** program stored in SubProgram.aOp. As well as these, one memory ** cell is required for each cursor used by the program. Set local - ** variable u.by.nMem (and later, VdbeFrame.nChildMem) to this value. + ** variable u.cb.nMem (and later, VdbeFrame.nChildMem) to this value. */ - u.by.nMem = u.by.pProgram->nMem + u.by.pProgram->nCsr; - u.by.nByte = ROUND8(sizeof(VdbeFrame)) - + u.by.nMem * sizeof(Mem) - + u.by.pProgram->nCsr * sizeof(VdbeCursor *); - u.by.pFrame = sqlite3DbMallocZero(db, u.by.nByte); - if( !u.by.pFrame ){ + u.cb.nMem = u.cb.pProgram->nMem + u.cb.pProgram->nCsr; + u.cb.nByte = ROUND8(sizeof(VdbeFrame)) + + u.cb.nMem * sizeof(Mem) + + u.cb.pProgram->nCsr * sizeof(VdbeCursor *); + u.cb.pFrame = sqlite3DbMallocZero(db, u.cb.nByte); + if( !u.cb.pFrame ){ goto no_mem; } - sqlite3VdbeMemRelease(u.by.pRt); - u.by.pRt->flags = MEM_Frame; - u.by.pRt->u.pFrame = u.by.pFrame; - - u.by.pFrame->v = p; - u.by.pFrame->nChildMem = u.by.nMem; - u.by.pFrame->nChildCsr = u.by.pProgram->nCsr; - u.by.pFrame->pc = pc; - u.by.pFrame->aMem = p->aMem; - u.by.pFrame->nMem = p->nMem; - u.by.pFrame->apCsr = p->apCsr; - u.by.pFrame->nCursor = p->nCursor; - u.by.pFrame->aOp = p->aOp; - u.by.pFrame->nOp = p->nOp; - u.by.pFrame->token = u.by.pProgram->token; - - u.by.pEnd = &VdbeFrameMem(u.by.pFrame)[u.by.pFrame->nChildMem]; - for(u.by.pMem=VdbeFrameMem(u.by.pFrame); u.by.pMem!=u.by.pEnd; u.by.pMem++){ - u.by.pMem->flags = MEM_Null; - u.by.pMem->db = db; + sqlite3VdbeMemRelease(u.cb.pRt); + u.cb.pRt->flags = MEM_Frame; + u.cb.pRt->u.pFrame = u.cb.pFrame; + + u.cb.pFrame->v = p; + u.cb.pFrame->nChildMem = u.cb.nMem; + u.cb.pFrame->nChildCsr = u.cb.pProgram->nCsr; + u.cb.pFrame->pc = pc; + u.cb.pFrame->aMem = p->aMem; + u.cb.pFrame->nMem = p->nMem; + u.cb.pFrame->apCsr = p->apCsr; + u.cb.pFrame->nCursor = p->nCursor; + u.cb.pFrame->aOp = p->aOp; + u.cb.pFrame->nOp = p->nOp; + u.cb.pFrame->token = u.cb.pProgram->token; + + u.cb.pEnd = &VdbeFrameMem(u.cb.pFrame)[u.cb.pFrame->nChildMem]; + for(u.cb.pMem=VdbeFrameMem(u.cb.pFrame); u.cb.pMem!=u.cb.pEnd; u.cb.pMem++){ + u.cb.pMem->flags = MEM_Null; + u.cb.pMem->db = db; } }else{ - u.by.pFrame = u.by.pRt->u.pFrame; - assert( u.by.pProgram->nMem+u.by.pProgram->nCsr==u.by.pFrame->nChildMem ); - assert( u.by.pProgram->nCsr==u.by.pFrame->nChildCsr ); - assert( pc==u.by.pFrame->pc ); + u.cb.pFrame = u.cb.pRt->u.pFrame; + assert( u.cb.pProgram->nMem+u.cb.pProgram->nCsr==u.cb.pFrame->nChildMem ); + assert( u.cb.pProgram->nCsr==u.cb.pFrame->nChildCsr ); + assert( pc==u.cb.pFrame->pc ); } p->nFrame++; - u.by.pFrame->pParent = p->pFrame; - u.by.pFrame->lastRowid = lastRowid; - u.by.pFrame->nChange = p->nChange; + u.cb.pFrame->pParent = p->pFrame; + u.cb.pFrame->lastRowid = lastRowid; + u.cb.pFrame->nChange = p->nChange; p->nChange = 0; - p->pFrame = u.by.pFrame; - p->aMem = aMem = &VdbeFrameMem(u.by.pFrame)[-1]; - p->nMem = u.by.pFrame->nChildMem; - p->nCursor = (u16)u.by.pFrame->nChildCsr; + p->pFrame = u.cb.pFrame; + p->aMem = aMem = &VdbeFrameMem(u.cb.pFrame)[-1]; + p->nMem = u.cb.pFrame->nChildMem; + p->nCursor = (u16)u.cb.pFrame->nChildCsr; p->apCsr = (VdbeCursor **)&aMem[p->nMem+1]; - p->aOp = aOp = u.by.pProgram->aOp; - p->nOp = u.by.pProgram->nOp; + p->aOp = aOp = u.cb.pProgram->aOp; + p->nOp = u.cb.pProgram->nOp; pc = -1; break; } @@ -67893,17 +68790,17 @@ ** The address of the cell in the parent frame is determined by adding ** the value of the P1 argument to the value of the P1 argument to the ** calling OP_Program instruction. */ case OP_Param: { /* out2-prerelease */ -#if 0 /* local variables moved into u.bz */ +#if 0 /* local variables moved into u.cc */ VdbeFrame *pFrame; Mem *pIn; -#endif /* local variables moved into u.bz */ - u.bz.pFrame = p->pFrame; - u.bz.pIn = &u.bz.pFrame->aMem[pOp->p1 + u.bz.pFrame->aOp[u.bz.pFrame->pc].p1]; - sqlite3VdbeMemShallowCopy(pOut, u.bz.pIn, MEM_Ephem); +#endif /* local variables moved into u.cc */ + u.cc.pFrame = p->pFrame; + u.cc.pIn = &u.cc.pFrame->aMem[pOp->p1 + u.cc.pFrame->aOp[u.cc.pFrame->pc].p1]; + sqlite3VdbeMemShallowCopy(pOut, u.cc.pIn, MEM_Ephem); break; } #endif /* #ifndef SQLITE_OMIT_TRIGGER */ @@ -67955,26 +68852,26 @@ ** ** This instruction throws an error if the memory cell is not initially ** an integer. */ case OP_MemMax: { /* in2 */ -#if 0 /* local variables moved into u.ca */ +#if 0 /* local variables moved into u.cd */ Mem *pIn1; VdbeFrame *pFrame; -#endif /* local variables moved into u.ca */ +#endif /* local variables moved into u.cd */ if( p->pFrame ){ - for(u.ca.pFrame=p->pFrame; u.ca.pFrame->pParent; u.ca.pFrame=u.ca.pFrame->pParent); - u.ca.pIn1 = &u.ca.pFrame->aMem[pOp->p1]; + for(u.cd.pFrame=p->pFrame; u.cd.pFrame->pParent; u.cd.pFrame=u.cd.pFrame->pParent); + u.cd.pIn1 = &u.cd.pFrame->aMem[pOp->p1]; }else{ - u.ca.pIn1 = &aMem[pOp->p1]; + u.cd.pIn1 = &aMem[pOp->p1]; } - assert( memIsValid(u.ca.pIn1) ); - sqlite3VdbeMemIntegerify(u.ca.pIn1); + assert( memIsValid(u.cd.pIn1) ); + sqlite3VdbeMemIntegerify(u.cd.pIn1); pIn2 = &aMem[pOp->p2]; sqlite3VdbeMemIntegerify(pIn2); - if( u.ca.pIn1->u.iu.i){ - u.ca.pIn1->u.i = pIn2->u.i; + if( u.cd.pIn1->u.iu.i){ + u.cd.pIn1->u.i = pIn2->u.i; } break; } #endif /* SQLITE_OMIT_AUTOINCREMENT */ @@ -68037,54 +68934,54 @@ ** ** The P5 arguments are taken from register P2 and its ** successors. */ case OP_AggStep: { -#if 0 /* local variables moved into u.cb */ +#if 0 /* local variables moved into u.ce */ int n; int i; Mem *pMem; Mem *pRec; sqlite3_context ctx; sqlite3_value **apVal; -#endif /* local variables moved into u.cb */ - - u.cb.n = pOp->p5; - assert( u.cb.n>=0 ); - u.cb.pRec = &aMem[pOp->p2]; - u.cb.apVal = p->apArg; - assert( u.cb.apVal || u.cb.n==0 ); - for(u.cb.i=0; u.cb.ip4.pFunc; +#endif /* local variables moved into u.ce */ + + u.ce.n = pOp->p5; + assert( u.ce.n>=0 ); + u.ce.pRec = &aMem[pOp->p2]; + u.ce.apVal = p->apArg; + assert( u.ce.apVal || u.ce.n==0 ); + for(u.ce.i=0; u.ce.ip4.pFunc; assert( pOp->p3>0 && pOp->p3<=p->nMem ); - u.cb.ctx.pMem = u.cb.pMem = &aMem[pOp->p3]; - u.cb.pMem->n++; - u.cb.ctx.s.flags = MEM_Null; - u.cb.ctx.s.z = 0; - u.cb.ctx.s.zMalloc = 0; - u.cb.ctx.s.xDel = 0; - u.cb.ctx.s.db = db; - u.cb.ctx.isError = 0; - u.cb.ctx.pColl = 0; - if( u.cb.ctx.pFunc->flags & SQLITE_FUNC_NEEDCOLL ){ + u.ce.ctx.pMem = u.ce.pMem = &aMem[pOp->p3]; + u.ce.pMem->n++; + u.ce.ctx.s.flags = MEM_Null; + u.ce.ctx.s.z = 0; + u.ce.ctx.s.zMalloc = 0; + u.ce.ctx.s.xDel = 0; + u.ce.ctx.s.db = db; + u.ce.ctx.isError = 0; + u.ce.ctx.pColl = 0; + if( u.ce.ctx.pFunc->flags & SQLITE_FUNC_NEEDCOLL ){ assert( pOp>p->aOp ); assert( pOp[-1].p4type==P4_COLLSEQ ); assert( pOp[-1].opcode==OP_CollSeq ); - u.cb.ctx.pColl = pOp[-1].p4.pColl; + u.ce.ctx.pColl = pOp[-1].p4.pColl; } - (u.cb.ctx.pFunc->xStep)(&u.cb.ctx, u.cb.n, u.cb.apVal); /* IMP: R-24505-23230 */ - if( u.cb.ctx.isError ){ - sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(&u.cb.ctx.s)); - rc = u.cb.ctx.isError; + (u.ce.ctx.pFunc->xStep)(&u.ce.ctx, u.ce.n, u.ce.apVal); /* IMP: R-24505-23230 */ + if( u.ce.ctx.isError ){ + sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(&u.ce.ctx.s)); + rc = u.ce.ctx.isError; } - sqlite3VdbeMemRelease(&u.cb.ctx.s); + sqlite3VdbeMemRelease(&u.ce.ctx.s); break; } /* Opcode: AggFinal P1 P2 * P4 * @@ -68098,23 +68995,23 @@ ** functions that can take varying numbers of arguments. The ** P4 argument is only needed for the degenerate case where ** the step function was not previously called. */ case OP_AggFinal: { -#if 0 /* local variables moved into u.cc */ +#if 0 /* local variables moved into u.cf */ Mem *pMem; -#endif /* local variables moved into u.cc */ +#endif /* local variables moved into u.cf */ assert( pOp->p1>0 && pOp->p1<=p->nMem ); - u.cc.pMem = &aMem[pOp->p1]; - assert( (u.cc.pMem->flags & ~(MEM_Null|MEM_Agg))==0 ); - rc = sqlite3VdbeMemFinalize(u.cc.pMem, pOp->p4.pFunc); + u.cf.pMem = &aMem[pOp->p1]; + assert( (u.cf.pMem->flags & ~(MEM_Null|MEM_Agg))==0 ); + rc = sqlite3VdbeMemFinalize(u.cf.pMem, pOp->p4.pFunc); if( rc ){ - sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(u.cc.pMem)); + sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(u.cf.pMem)); } - sqlite3VdbeChangeEncoding(u.cc.pMem, encoding); - UPDATE_MAX_BLOBSIZE(u.cc.pMem); - if( sqlite3VdbeMemTooBig(u.cc.pMem) ){ + sqlite3VdbeChangeEncoding(u.cf.pMem, encoding); + UPDATE_MAX_BLOBSIZE(u.cf.pMem); + if( sqlite3VdbeMemTooBig(u.cf.pMem) ){ goto too_big; } break; } @@ -68129,29 +69026,29 @@ ** in the WAL that have been checkpointed after the checkpoint ** completes into mem[P3+2]. However on an error, mem[P3+1] and ** mem[P3+2] are initialized to -1. */ case OP_Checkpoint: { -#if 0 /* local variables moved into u.cd */ +#if 0 /* local variables moved into u.cg */ int i; /* Loop counter */ int aRes[3]; /* Results */ Mem *pMem; /* Write results here */ -#endif /* local variables moved into u.cd */ +#endif /* local variables moved into u.cg */ - u.cd.aRes[0] = 0; - u.cd.aRes[1] = u.cd.aRes[2] = -1; + u.cg.aRes[0] = 0; + u.cg.aRes[1] = u.cg.aRes[2] = -1; assert( pOp->p2==SQLITE_CHECKPOINT_PASSIVE || pOp->p2==SQLITE_CHECKPOINT_FULL || pOp->p2==SQLITE_CHECKPOINT_RESTART ); - rc = sqlite3Checkpoint(db, pOp->p1, pOp->p2, &u.cd.aRes[1], &u.cd.aRes[2]); + rc = sqlite3Checkpoint(db, pOp->p1, pOp->p2, &u.cg.aRes[1], &u.cg.aRes[2]); if( rc==SQLITE_BUSY ){ rc = SQLITE_OK; - u.cd.aRes[0] = 1; + u.cg.aRes[0] = 1; } - for(u.cd.i=0, u.cd.pMem = &aMem[pOp->p3]; u.cd.i<3; u.cd.i++, u.cd.pMem++){ - sqlite3VdbeMemSetInt64(u.cd.pMem, (i64)u.cd.aRes[u.cd.i]); + for(u.cg.i=0, u.cg.pMem = &aMem[pOp->p3]; u.cg.i<3; u.cg.i++, u.cg.pMem++){ + sqlite3VdbeMemSetInt64(u.cg.pMem, (i64)u.cg.aRes[u.cg.i]); } break; }; #endif @@ -68166,95 +69063,95 @@ ** If changing into or out of WAL mode the procedure is more complicated. ** ** Write a string containing the final journal-mode to register P2. */ case OP_JournalMode: { /* out2-prerelease */ -#if 0 /* local variables moved into u.ce */ +#if 0 /* local variables moved into u.ch */ Btree *pBt; /* Btree to change journal mode of */ Pager *pPager; /* Pager associated with pBt */ int eNew; /* New journal mode */ int eOld; /* The old journal mode */ const char *zFilename; /* Name of database file for pPager */ -#endif /* local variables moved into u.ce */ - - u.ce.eNew = pOp->p3; - assert( u.ce.eNew==PAGER_JOURNALMODE_DELETE - || u.ce.eNew==PAGER_JOURNALMODE_TRUNCATE - || u.ce.eNew==PAGER_JOURNALMODE_PERSIST - || u.ce.eNew==PAGER_JOURNALMODE_OFF - || u.ce.eNew==PAGER_JOURNALMODE_MEMORY - || u.ce.eNew==PAGER_JOURNALMODE_WAL - || u.ce.eNew==PAGER_JOURNALMODE_QUERY +#endif /* local variables moved into u.ch */ + + u.ch.eNew = pOp->p3; + assert( u.ch.eNew==PAGER_JOURNALMODE_DELETE + || u.ch.eNew==PAGER_JOURNALMODE_TRUNCATE + || u.ch.eNew==PAGER_JOURNALMODE_PERSIST + || u.ch.eNew==PAGER_JOURNALMODE_OFF + || u.ch.eNew==PAGER_JOURNALMODE_MEMORY + || u.ch.eNew==PAGER_JOURNALMODE_WAL + || u.ch.eNew==PAGER_JOURNALMODE_QUERY ); assert( pOp->p1>=0 && pOp->p1nDb ); - u.ce.pBt = db->aDb[pOp->p1].pBt; - u.ce.pPager = sqlite3BtreePager(u.ce.pBt); - u.ce.eOld = sqlite3PagerGetJournalMode(u.ce.pPager); - if( u.ce.eNew==PAGER_JOURNALMODE_QUERY ) u.ce.eNew = u.ce.eOld; - if( !sqlite3PagerOkToChangeJournalMode(u.ce.pPager) ) u.ce.eNew = u.ce.eOld; + u.ch.pBt = db->aDb[pOp->p1].pBt; + u.ch.pPager = sqlite3BtreePager(u.ch.pBt); + u.ch.eOld = sqlite3PagerGetJournalMode(u.ch.pPager); + if( u.ch.eNew==PAGER_JOURNALMODE_QUERY ) u.ch.eNew = u.ch.eOld; + if( !sqlite3PagerOkToChangeJournalMode(u.ch.pPager) ) u.ch.eNew = u.ch.eOld; #ifndef SQLITE_OMIT_WAL - u.ce.zFilename = sqlite3PagerFilename(u.ce.pPager); + u.ch.zFilename = sqlite3PagerFilename(u.ch.pPager); /* Do not allow a transition to journal_mode=WAL for a database ** in temporary storage or if the VFS does not support shared memory */ - if( u.ce.eNew==PAGER_JOURNALMODE_WAL - && (u.ce.zFilename[0]==0 /* Temp file */ - || !sqlite3PagerWalSupported(u.ce.pPager)) /* No shared-memory support */ + if( u.ch.eNew==PAGER_JOURNALMODE_WAL + && (u.ch.zFilename[0]==0 /* Temp file */ + || !sqlite3PagerWalSupported(u.ch.pPager)) /* No shared-memory support */ ){ - u.ce.eNew = u.ce.eOld; + u.ch.eNew = u.ch.eOld; } - if( (u.ce.eNew!=u.ce.eOld) - && (u.ce.eOld==PAGER_JOURNALMODE_WAL || u.ce.eNew==PAGER_JOURNALMODE_WAL) + if( (u.ch.eNew!=u.ch.eOld) + && (u.ch.eOld==PAGER_JOURNALMODE_WAL || u.ch.eNew==PAGER_JOURNALMODE_WAL) ){ if( !db->autoCommit || db->activeVdbeCnt>1 ){ rc = SQLITE_ERROR; sqlite3SetString(&p->zErrMsg, db, "cannot change %s wal mode from within a transaction", - (u.ce.eNew==PAGER_JOURNALMODE_WAL ? "into" : "out of") + (u.ch.eNew==PAGER_JOURNALMODE_WAL ? "into" : "out of") ); break; }else{ - if( u.ce.eOld==PAGER_JOURNALMODE_WAL ){ + if( u.ch.eOld==PAGER_JOURNALMODE_WAL ){ /* If leaving WAL mode, close the log file. If successful, the call ** to PagerCloseWal() checkpoints and deletes the write-ahead-log ** file. An EXCLUSIVE lock may still be held on the database file ** after a successful return. */ - rc = sqlite3PagerCloseWal(u.ce.pPager); + rc = sqlite3PagerCloseWal(u.ch.pPager); if( rc==SQLITE_OK ){ - sqlite3PagerSetJournalMode(u.ce.pPager, u.ce.eNew); + sqlite3PagerSetJournalMode(u.ch.pPager, u.ch.eNew); } - }else if( u.ce.eOld==PAGER_JOURNALMODE_MEMORY ){ + }else if( u.ch.eOld==PAGER_JOURNALMODE_MEMORY ){ /* Cannot transition directly from MEMORY to WAL. Use mode OFF ** as an intermediate */ - sqlite3PagerSetJournalMode(u.ce.pPager, PAGER_JOURNALMODE_OFF); + sqlite3PagerSetJournalMode(u.ch.pPager, PAGER_JOURNALMODE_OFF); } /* Open a transaction on the database file. Regardless of the journal ** mode, this transaction always uses a rollback journal. */ - assert( sqlite3BtreeIsInTrans(u.ce.pBt)==0 ); + assert( sqlite3BtreeIsInTrans(u.ch.pBt)==0 ); if( rc==SQLITE_OK ){ - rc = sqlite3BtreeSetVersion(u.ce.pBt, (u.ce.eNew==PAGER_JOURNALMODE_WAL ? 2 : 1)); + rc = sqlite3BtreeSetVersion(u.ch.pBt, (u.ch.eNew==PAGER_JOURNALMODE_WAL ? 2 : 1)); } } } #endif /* ifndef SQLITE_OMIT_WAL */ if( rc ){ - u.ce.eNew = u.ce.eOld; + u.ch.eNew = u.ch.eOld; } - u.ce.eNew = sqlite3PagerSetJournalMode(u.ce.pPager, u.ce.eNew); + u.ch.eNew = sqlite3PagerSetJournalMode(u.ch.pPager, u.ch.eNew); pOut = &aMem[pOp->p2]; pOut->flags = MEM_Str|MEM_Static|MEM_Term; - pOut->z = (char *)sqlite3JournalModename(u.ce.eNew); + pOut->z = (char *)sqlite3JournalModename(u.ch.eNew); pOut->n = sqlite3Strlen30(pOut->z); pOut->enc = SQLITE_UTF8; sqlite3VdbeChangeEncoding(pOut, encoding); break; }; @@ -68279,18 +69176,18 @@ ** Perform a single step of the incremental vacuum procedure on ** the P1 database. If the vacuum has finished, jump to instruction ** P2. Otherwise, fall through to the next instruction. */ case OP_IncrVacuum: { /* jump */ -#if 0 /* local variables moved into u.cf */ +#if 0 /* local variables moved into u.ci */ Btree *pBt; -#endif /* local variables moved into u.cf */ +#endif /* local variables moved into u.ci */ assert( pOp->p1>=0 && pOp->p1nDb ); assert( (p->btreeMask & (((yDbMask)1)<p1))!=0 ); - u.cf.pBt = db->aDb[pOp->p1].pBt; - rc = sqlite3BtreeIncrVacuum(u.cf.pBt); + u.ci.pBt = db->aDb[pOp->p1].pBt; + rc = sqlite3BtreeIncrVacuum(u.ci.pBt); if( rc==SQLITE_DONE ){ pc = pOp->p2 - 1; rc = SQLITE_OK; } break; @@ -68356,16 +69253,16 @@ ** Also, whether or not P4 is set, check that this is not being called from ** within a callback to a virtual table xSync() method. If it is, the error ** code will be set to SQLITE_LOCKED. */ case OP_VBegin: { -#if 0 /* local variables moved into u.cg */ +#if 0 /* local variables moved into u.cj */ VTable *pVTab; -#endif /* local variables moved into u.cg */ - u.cg.pVTab = pOp->p4.pVtab; - rc = sqlite3VtabBegin(db, u.cg.pVTab); - if( u.cg.pVTab ) importVtabErrMsg(p, u.cg.pVTab->pVtab); +#endif /* local variables moved into u.cj */ + u.cj.pVTab = pOp->p4.pVtab; + rc = sqlite3VtabBegin(db, u.cj.pVTab); + if( u.cj.pVTab ) importVtabErrMsg(p, u.cj.pVTab->pVtab); break; } #endif /* SQLITE_OMIT_VIRTUALTABLE */ #ifndef SQLITE_OMIT_VIRTUALTABLE @@ -68400,36 +69297,36 @@ ** P4 is a pointer to a virtual table object, an sqlite3_vtab structure. ** P1 is a cursor number. This opcode opens a cursor to the virtual ** table and stores that cursor in P1. */ case OP_VOpen: { -#if 0 /* local variables moved into u.ch */ +#if 0 /* local variables moved into u.ck */ VdbeCursor *pCur; sqlite3_vtab_cursor *pVtabCursor; sqlite3_vtab *pVtab; sqlite3_module *pModule; -#endif /* local variables moved into u.ch */ - - u.ch.pCur = 0; - u.ch.pVtabCursor = 0; - u.ch.pVtab = pOp->p4.pVtab->pVtab; - u.ch.pModule = (sqlite3_module *)u.ch.pVtab->pModule; - assert(u.ch.pVtab && u.ch.pModule); - rc = u.ch.pModule->xOpen(u.ch.pVtab, &u.ch.pVtabCursor); - importVtabErrMsg(p, u.ch.pVtab); +#endif /* local variables moved into u.ck */ + + u.ck.pCur = 0; + u.ck.pVtabCursor = 0; + u.ck.pVtab = pOp->p4.pVtab->pVtab; + u.ck.pModule = (sqlite3_module *)u.ck.pVtab->pModule; + assert(u.ck.pVtab && u.ck.pModule); + rc = u.ck.pModule->xOpen(u.ck.pVtab, &u.ck.pVtabCursor); + importVtabErrMsg(p, u.ck.pVtab); if( SQLITE_OK==rc ){ /* Initialize sqlite3_vtab_cursor base class */ - u.ch.pVtabCursor->pVtab = u.ch.pVtab; + u.ck.pVtabCursor->pVtab = u.ck.pVtab; /* Initialise vdbe cursor object */ - u.ch.pCur = allocateCursor(p, pOp->p1, 0, -1, 0); - if( u.ch.pCur ){ - u.ch.pCur->pVtabCursor = u.ch.pVtabCursor; - u.ch.pCur->pModule = u.ch.pVtabCursor->pVtab->pModule; + u.ck.pCur = allocateCursor(p, pOp->p1, 0, -1, 0); + if( u.ck.pCur ){ + u.ck.pCur->pVtabCursor = u.ck.pVtabCursor; + u.ck.pCur->pModule = u.ck.pVtabCursor->pVtab->pModule; }else{ db->mallocFailed = 1; - u.ch.pModule->xClose(u.ch.pVtabCursor); + u.ck.pModule->xClose(u.ck.pVtabCursor); } } break; } #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -68452,11 +69349,11 @@ ** xFilter as argv. Register P3+2 becomes argv[0] when passed to xFilter. ** ** A jump is made to P2 if the result set after filtering would be empty. */ case OP_VFilter: { /* jump */ -#if 0 /* local variables moved into u.ci */ +#if 0 /* local variables moved into u.cl */ int nArg; int iQuery; const sqlite3_module *pModule; Mem *pQuery; Mem *pArgc; @@ -68464,49 +69361,49 @@ sqlite3_vtab *pVtab; VdbeCursor *pCur; int res; int i; Mem **apArg; -#endif /* local variables moved into u.ci */ - - u.ci.pQuery = &aMem[pOp->p3]; - u.ci.pArgc = &u.ci.pQuery[1]; - u.ci.pCur = p->apCsr[pOp->p1]; - assert( memIsValid(u.ci.pQuery) ); - REGISTER_TRACE(pOp->p3, u.ci.pQuery); - assert( u.ci.pCur->pVtabCursor ); - u.ci.pVtabCursor = u.ci.pCur->pVtabCursor; - u.ci.pVtab = u.ci.pVtabCursor->pVtab; - u.ci.pModule = u.ci.pVtab->pModule; +#endif /* local variables moved into u.cl */ + + u.cl.pQuery = &aMem[pOp->p3]; + u.cl.pArgc = &u.cl.pQuery[1]; + u.cl.pCur = p->apCsr[pOp->p1]; + assert( memIsValid(u.cl.pQuery) ); + REGISTER_TRACE(pOp->p3, u.cl.pQuery); + assert( u.cl.pCur->pVtabCursor ); + u.cl.pVtabCursor = u.cl.pCur->pVtabCursor; + u.cl.pVtab = u.cl.pVtabCursor->pVtab; + u.cl.pModule = u.cl.pVtab->pModule; /* Grab the index number and argc parameters */ - assert( (u.ci.pQuery->flags&MEM_Int)!=0 && u.ci.pArgc->flags==MEM_Int ); - u.ci.nArg = (int)u.ci.pArgc->u.i; - u.ci.iQuery = (int)u.ci.pQuery->u.i; + assert( (u.cl.pQuery->flags&MEM_Int)!=0 && u.cl.pArgc->flags==MEM_Int ); + u.cl.nArg = (int)u.cl.pArgc->u.i; + u.cl.iQuery = (int)u.cl.pQuery->u.i; /* Invoke the xFilter method */ { - u.ci.res = 0; - u.ci.apArg = p->apArg; - for(u.ci.i = 0; u.ci.iapArg; + for(u.cl.i = 0; u.cl.iinVtabMethod = 1; - rc = u.ci.pModule->xFilter(u.ci.pVtabCursor, u.ci.iQuery, pOp->p4.z, u.ci.nArg, u.ci.apArg); + rc = u.cl.pModule->xFilter(u.cl.pVtabCursor, u.cl.iQuery, pOp->p4.z, u.cl.nArg, u.cl.apArg); p->inVtabMethod = 0; - importVtabErrMsg(p, u.ci.pVtab); + importVtabErrMsg(p, u.cl.pVtab); if( rc==SQLITE_OK ){ - u.ci.res = u.ci.pModule->xEof(u.ci.pVtabCursor); + u.cl.res = u.cl.pModule->xEof(u.cl.pVtabCursor); } - if( u.ci.res ){ + if( u.cl.res ){ pc = pOp->p2 - 1; } } - u.ci.pCur->nullRow = 0; + u.cl.pCur->nullRow = 0; break; } #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -68516,55 +69413,55 @@ ** Store the value of the P2-th column of ** the row of the virtual-table that the ** P1 cursor is pointing to into register P3. */ case OP_VColumn: { -#if 0 /* local variables moved into u.cj */ +#if 0 /* local variables moved into u.cm */ sqlite3_vtab *pVtab; const sqlite3_module *pModule; Mem *pDest; sqlite3_context sContext; -#endif /* local variables moved into u.cj */ +#endif /* local variables moved into u.cm */ VdbeCursor *pCur = p->apCsr[pOp->p1]; assert( pCur->pVtabCursor ); assert( pOp->p3>0 && pOp->p3<=p->nMem ); - u.cj.pDest = &aMem[pOp->p3]; - memAboutToChange(p, u.cj.pDest); + u.cm.pDest = &aMem[pOp->p3]; + memAboutToChange(p, u.cm.pDest); if( pCur->nullRow ){ - sqlite3VdbeMemSetNull(u.cj.pDest); + sqlite3VdbeMemSetNull(u.cm.pDest); break; } - u.cj.pVtab = pCur->pVtabCursor->pVtab; - u.cj.pModule = u.cj.pVtab->pModule; - assert( u.cj.pModule->xColumn ); - memset(&u.cj.sContext, 0, sizeof(u.cj.sContext)); + u.cm.pVtab = pCur->pVtabCursor->pVtab; + u.cm.pModule = u.cm.pVtab->pModule; + assert( u.cm.pModule->xColumn ); + memset(&u.cm.sContext, 0, sizeof(u.cm.sContext)); /* The output cell may already have a buffer allocated. Move - ** the current contents to u.cj.sContext.s so in case the user-function + ** the current contents to u.cm.sContext.s so in case the user-function ** can use the already allocated buffer instead of allocating a ** new one. */ - sqlite3VdbeMemMove(&u.cj.sContext.s, u.cj.pDest); - MemSetTypeFlag(&u.cj.sContext.s, MEM_Null); + sqlite3VdbeMemMove(&u.cm.sContext.s, u.cm.pDest); + MemSetTypeFlag(&u.cm.sContext.s, MEM_Null); - rc = u.cj.pModule->xColumn(pCur->pVtabCursor, &u.cj.sContext, pOp->p2); - importVtabErrMsg(p, u.cj.pVtab); - if( u.cj.sContext.isError ){ - rc = u.cj.sContext.isError; + rc = u.cm.pModule->xColumn(pCur->pVtabCursor, &u.cm.sContext, pOp->p2); + importVtabErrMsg(p, u.cm.pVtab); + if( u.cm.sContext.isError ){ + rc = u.cm.sContext.isError; } /* Copy the result of the function to the P3 register. We ** do this regardless of whether or not an error occurred to ensure any - ** dynamic allocation in u.cj.sContext.s (a Mem struct) is released. + ** dynamic allocation in u.cm.sContext.s (a Mem struct) is released. */ - sqlite3VdbeChangeEncoding(&u.cj.sContext.s, encoding); - sqlite3VdbeMemMove(u.cj.pDest, &u.cj.sContext.s); - REGISTER_TRACE(pOp->p3, u.cj.pDest); - UPDATE_MAX_BLOBSIZE(u.cj.pDest); + sqlite3VdbeChangeEncoding(&u.cm.sContext.s, encoding); + sqlite3VdbeMemMove(u.cm.pDest, &u.cm.sContext.s); + REGISTER_TRACE(pOp->p3, u.cm.pDest); + UPDATE_MAX_BLOBSIZE(u.cm.pDest); - if( sqlite3VdbeMemTooBig(u.cj.pDest) ){ + if( sqlite3VdbeMemTooBig(u.cm.pDest) ){ goto too_big; } break; } #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -68575,42 +69472,42 @@ ** Advance virtual table P1 to the next row in its result set and ** jump to instruction P2. Or, if the virtual table has reached ** the end of its result set, then fall through to the next instruction. */ case OP_VNext: { /* jump */ -#if 0 /* local variables moved into u.ck */ +#if 0 /* local variables moved into u.cn */ sqlite3_vtab *pVtab; const sqlite3_module *pModule; int res; VdbeCursor *pCur; -#endif /* local variables moved into u.ck */ +#endif /* local variables moved into u.cn */ - u.ck.res = 0; - u.ck.pCur = p->apCsr[pOp->p1]; - assert( u.ck.pCur->pVtabCursor ); - if( u.ck.pCur->nullRow ){ + u.cn.res = 0; + u.cn.pCur = p->apCsr[pOp->p1]; + assert( u.cn.pCur->pVtabCursor ); + if( u.cn.pCur->nullRow ){ break; } - u.ck.pVtab = u.ck.pCur->pVtabCursor->pVtab; - u.ck.pModule = u.ck.pVtab->pModule; - assert( u.ck.pModule->xNext ); + u.cn.pVtab = u.cn.pCur->pVtabCursor->pVtab; + u.cn.pModule = u.cn.pVtab->pModule; + assert( u.cn.pModule->xNext ); /* Invoke the xNext() method of the module. There is no way for the ** underlying implementation to return an error if one occurs during ** xNext(). Instead, if an error occurs, true is returned (indicating that ** data is available) and the error code returned when xColumn or ** some other method is next invoked on the save virtual table cursor. */ p->inVtabMethod = 1; - rc = u.ck.pModule->xNext(u.ck.pCur->pVtabCursor); + rc = u.cn.pModule->xNext(u.cn.pCur->pVtabCursor); p->inVtabMethod = 0; - importVtabErrMsg(p, u.ck.pVtab); + importVtabErrMsg(p, u.cn.pVtab); if( rc==SQLITE_OK ){ - u.ck.res = u.ck.pModule->xEof(u.ck.pCur->pVtabCursor); + u.cn.res = u.cn.pModule->xEof(u.cn.pCur->pVtabCursor); } - if( !u.ck.res ){ + if( !u.cn.res ){ /* If there is data, jump to P2 */ pc = pOp->p2 - 1; } break; } @@ -68622,23 +69519,23 @@ ** P4 is a pointer to a virtual table object, an sqlite3_vtab structure. ** This opcode invokes the corresponding xRename method. The value ** in register P1 is passed as the zName argument to the xRename method. */ case OP_VRename: { -#if 0 /* local variables moved into u.cl */ +#if 0 /* local variables moved into u.co */ sqlite3_vtab *pVtab; Mem *pName; -#endif /* local variables moved into u.cl */ - - u.cl.pVtab = pOp->p4.pVtab->pVtab; - u.cl.pName = &aMem[pOp->p1]; - assert( u.cl.pVtab->pModule->xRename ); - assert( memIsValid(u.cl.pName) ); - REGISTER_TRACE(pOp->p1, u.cl.pName); - assert( u.cl.pName->flags & MEM_Str ); - rc = u.cl.pVtab->pModule->xRename(u.cl.pVtab, u.cl.pName->z); - importVtabErrMsg(p, u.cl.pVtab); +#endif /* local variables moved into u.co */ + + u.co.pVtab = pOp->p4.pVtab->pVtab; + u.co.pName = &aMem[pOp->p1]; + assert( u.co.pVtab->pModule->xRename ); + assert( memIsValid(u.co.pName) ); + REGISTER_TRACE(pOp->p1, u.co.pName); + assert( u.co.pName->flags & MEM_Str ); + rc = u.co.pVtab->pModule->xRename(u.co.pVtab, u.co.pName->z); + importVtabErrMsg(p, u.co.pVtab); p->expired = 0; break; } #endif @@ -68666,45 +69563,45 @@ ** P1 is a boolean flag. If it is set to true and the xUpdate call ** is successful, then the value returned by sqlite3_last_insert_rowid() ** is set to the value of the rowid for the row just inserted. */ case OP_VUpdate: { -#if 0 /* local variables moved into u.cm */ +#if 0 /* local variables moved into u.cp */ sqlite3_vtab *pVtab; sqlite3_module *pModule; int nArg; int i; sqlite_int64 rowid; Mem **apArg; Mem *pX; -#endif /* local variables moved into u.cm */ +#endif /* local variables moved into u.cp */ assert( pOp->p2==1 || pOp->p5==OE_Fail || pOp->p5==OE_Rollback || pOp->p5==OE_Abort || pOp->p5==OE_Ignore || pOp->p5==OE_Replace ); - u.cm.pVtab = pOp->p4.pVtab->pVtab; - u.cm.pModule = (sqlite3_module *)u.cm.pVtab->pModule; - u.cm.nArg = pOp->p2; + u.cp.pVtab = pOp->p4.pVtab->pVtab; + u.cp.pModule = (sqlite3_module *)u.cp.pVtab->pModule; + u.cp.nArg = pOp->p2; assert( pOp->p4type==P4_VTAB ); - if( ALWAYS(u.cm.pModule->xUpdate) ){ + if( ALWAYS(u.cp.pModule->xUpdate) ){ u8 vtabOnConflict = db->vtabOnConflict; - u.cm.apArg = p->apArg; - u.cm.pX = &aMem[pOp->p3]; - for(u.cm.i=0; u.cm.iapArg; + u.cp.pX = &aMem[pOp->p3]; + for(u.cp.i=0; u.cp.ivtabOnConflict = pOp->p5; - rc = u.cm.pModule->xUpdate(u.cm.pVtab, u.cm.nArg, u.cm.apArg, &u.cm.rowid); + rc = u.cp.pModule->xUpdate(u.cp.pVtab, u.cp.nArg, u.cp.apArg, &u.cp.rowid); db->vtabOnConflict = vtabOnConflict; - importVtabErrMsg(p, u.cm.pVtab); + importVtabErrMsg(p, u.cp.pVtab); if( rc==SQLITE_OK && pOp->p1 ){ - assert( u.cm.nArg>1 && u.cm.apArg[0] && (u.cm.apArg[0]->flags&MEM_Null) ); - db->lastRowid = lastRowid = u.cm.rowid; + assert( u.cp.nArg>1 && u.cp.apArg[0] && (u.cp.apArg[0]->flags&MEM_Null) ); + db->lastRowid = lastRowid = u.cp.rowid; } if( rc==SQLITE_CONSTRAINT && pOp->p4.pVtab->bConstraint ){ if( pOp->p5==OE_Ignore ){ rc = SQLITE_OK; }else{ @@ -68760,25 +69657,25 @@ ** ** If tracing is enabled (by the sqlite3_trace()) interface, then ** the UTF-8 string contained in P4 is emitted on the trace callback. */ case OP_Trace: { -#if 0 /* local variables moved into u.cn */ +#if 0 /* local variables moved into u.cq */ char *zTrace; char *z; -#endif /* local variables moved into u.cn */ +#endif /* local variables moved into u.cq */ - if( db->xTrace && (u.cn.zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0 ){ - u.cn.z = sqlite3VdbeExpandSql(p, u.cn.zTrace); - db->xTrace(db->pTraceArg, u.cn.z); - sqlite3DbFree(db, u.cn.z); + if( db->xTrace && (u.cq.zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0 ){ + u.cq.z = sqlite3VdbeExpandSql(p, u.cq.zTrace); + db->xTrace(db->pTraceArg, u.cq.z); + sqlite3DbFree(db, u.cq.z); } #ifdef SQLITE_DEBUG if( (db->flags & SQLITE_SqlTrace)!=0 - && (u.cn.zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0 + && (u.cq.zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0 ){ - sqlite3DebugPrintf("SQL-trace: %s\n", u.cn.zTrace); + sqlite3DebugPrintf("SQL-trace: %s\n", u.cq.zTrace); } #endif /* SQLITE_DEBUG */ break; } #endif @@ -69177,21 +70074,21 @@ /* Make sure a mutex is held on the table to be accessed */ sqlite3VdbeUsesBtree(v, iDb); /* Configure the OP_TableLock instruction */ #ifdef SQLITE_OMIT_SHARED_CACHE - sqlite3VdbeChangeToNoop(v, 2, 1); + sqlite3VdbeChangeToNoop(v, 2); #else sqlite3VdbeChangeP1(v, 2, iDb); sqlite3VdbeChangeP2(v, 2, pTab->tnum); sqlite3VdbeChangeP3(v, 2, flags); sqlite3VdbeChangeP4(v, 2, pTab->zName, P4_TRANSIENT); #endif /* Remove either the OP_OpenWrite or OpenRead. Set the P2 ** parameter of the other to pTab->tnum. */ - sqlite3VdbeChangeToNoop(v, 4 - flags, 1); + sqlite3VdbeChangeToNoop(v, 4 - flags); sqlite3VdbeChangeP2(v, 3 + flags, pTab->tnum); sqlite3VdbeChangeP3(v, 3 + flags, iDb); /* Configure the number of columns. Configure the cursor to ** think that the table has one more column than it really @@ -69373,10 +70270,893 @@ } #endif /* #ifndef SQLITE_OMIT_INCRBLOB */ /************** End of vdbeblob.c ********************************************/ +/************** Begin file vdbesort.c ****************************************/ +/* +** 2011 July 9 +** +** The author disclaims copyright to this source code. In place of +** a legal notice, here is a blessing: +** +** May you do good and not evil. +** May you find forgiveness for yourself and forgive others. +** May you share freely, never taking more than you give. +** +************************************************************************* +** This file contains code for the VdbeSorter object, used in concert with +** a VdbeCursor to sort large numbers of keys (as may be required, for +** example, by CREATE INDEX statements on tables too large to fit in main +** memory). +*/ + + +#ifndef SQLITE_OMIT_MERGE_SORT + +typedef struct VdbeSorterIter VdbeSorterIter; +typedef struct SorterRecord SorterRecord; + +/* +** NOTES ON DATA STRUCTURE USED FOR N-WAY MERGES: +** +** As keys are added to the sorter, they are written to disk in a series +** of sorted packed-memory-arrays (PMAs). The size of each PMA is roughly +** the same as the cache-size allowed for temporary databases. In order +** to allow the caller to extract keys from the sorter in sorted order, +** all PMAs currently stored on disk must be merged together. This comment +** describes the data structure used to do so. The structure supports +** merging any number of arrays in a single pass with no redundant comparison +** operations. +** +** The aIter[] array contains an iterator for each of the PMAs being merged. +** An aIter[] iterator either points to a valid key or else is at EOF. For +** the purposes of the paragraphs below, we assume that the array is actually +** N elements in size, where N is the smallest power of 2 greater to or equal +** to the number of iterators being merged. The extra aIter[] elements are +** treated as if they are empty (always at EOF). +** +** The aTree[] array is also N elements in size. The value of N is stored in +** the VdbeSorter.nTree variable. +** +** The final (N/2) elements of aTree[] contain the results of comparing +** pairs of iterator keys together. Element i contains the result of +** comparing aIter[2*i-N] and aIter[2*i-N+1]. Whichever key is smaller, the +** aTree element is set to the index of it. +** +** For the purposes of this comparison, EOF is considered greater than any +** other key value. If the keys are equal (only possible with two EOF +** values), it doesn't matter which index is stored. +** +** The (N/4) elements of aTree[] that preceed the final (N/2) described +** above contains the index of the smallest of each block of 4 iterators. +** And so on. So that aTree[1] contains the index of the iterator that +** currently points to the smallest key value. aTree[0] is unused. +** +** Example: +** +** aIter[0] -> Banana +** aIter[1] -> Feijoa +** aIter[2] -> Elderberry +** aIter[3] -> Currant +** aIter[4] -> Grapefruit +** aIter[5] -> Apple +** aIter[6] -> Durian +** aIter[7] -> EOF +** +** aTree[] = { X, 5 0, 5 0, 3, 5, 6 } +** +** The current element is "Apple" (the value of the key indicated by +** iterator 5). When the Next() operation is invoked, iterator 5 will +** be advanced to the next key in its segment. Say the next key is +** "Eggplant": +** +** aIter[5] -> Eggplant +** +** The contents of aTree[] are updated first by comparing the new iterator +** 5 key to the current key of iterator 4 (still "Grapefruit"). The iterator +** 5 value is still smaller, so aTree[6] is set to 5. And so on up the tree. +** The value of iterator 6 - "Durian" - is now smaller than that of iterator +** 5, so aTree[3] is set to 6. Key 0 is smaller than key 6 (BananaaAlloc); + memset(pIter, 0, sizeof(VdbeSorterIter)); +} + +/* +** Advance iterator pIter to the next key in its PMA. Return SQLITE_OK if +** no error occurs, or an SQLite error code if one does. +*/ +static int vdbeSorterIterNext( + sqlite3 *db, /* Database handle (for sqlite3DbMalloc() ) */ + VdbeSorterIter *pIter /* Iterator to advance */ +){ + int rc; /* Return Code */ + int nRead; /* Number of bytes read */ + int nRec = 0; /* Size of record in bytes */ + int iOff = 0; /* Size of serialized size varint in bytes */ + + assert( pIter->iEof>=pIter->iReadOff ); + if( pIter->iEof-pIter->iReadOff>5 ){ + nRead = 5; + }else{ + nRead = (int)(pIter->iEof - pIter->iReadOff); + } + if( nRead<=0 ){ + /* This is an EOF condition */ + vdbeSorterIterZero(db, pIter); + return SQLITE_OK; + } + + rc = sqlite3OsRead(pIter->pFile, pIter->aAlloc, nRead, pIter->iReadOff); + if( rc==SQLITE_OK ){ + iOff = getVarint32(pIter->aAlloc, nRec); + if( (iOff+nRec)>nRead ){ + int nRead2; /* Number of extra bytes to read */ + if( (iOff+nRec)>pIter->nAlloc ){ + int nNew = pIter->nAlloc*2; + while( (iOff+nRec)>nNew ) nNew = nNew*2; + pIter->aAlloc = sqlite3DbReallocOrFree(db, pIter->aAlloc, nNew); + if( !pIter->aAlloc ) return SQLITE_NOMEM; + pIter->nAlloc = nNew; + } + + nRead2 = iOff + nRec - nRead; + rc = sqlite3OsRead( + pIter->pFile, &pIter->aAlloc[nRead], nRead2, pIter->iReadOff+nRead + ); + } + } + + assert( rc!=SQLITE_OK || nRec>0 ); + pIter->iReadOff += iOff+nRec; + pIter->nKey = nRec; + pIter->aKey = &pIter->aAlloc[iOff]; + return rc; +} + +/* +** Write a single varint, value iVal, to file-descriptor pFile. Return +** SQLITE_OK if successful, or an SQLite error code if some error occurs. +** +** The value of *piOffset when this function is called is used as the byte +** offset in file pFile to write to. Before returning, *piOffset is +** incremented by the number of bytes written. +*/ +static int vdbeSorterWriteVarint( + sqlite3_file *pFile, /* File to write to */ + i64 iVal, /* Value to write as a varint */ + i64 *piOffset /* IN/OUT: Write offset in file pFile */ +){ + u8 aVarint[9]; /* Buffer large enough for a varint */ + int nVarint; /* Number of used bytes in varint */ + int rc; /* Result of write() call */ + + nVarint = sqlite3PutVarint(aVarint, iVal); + rc = sqlite3OsWrite(pFile, aVarint, nVarint, *piOffset); + *piOffset += nVarint; + + return rc; +} + +/* +** Read a single varint from file-descriptor pFile. Return SQLITE_OK if +** successful, or an SQLite error code if some error occurs. +** +** The value of *piOffset when this function is called is used as the +** byte offset in file pFile from whence to read the varint. If successful +** (i.e. if no IO error occurs), then *piOffset is set to the offset of +** the first byte past the end of the varint before returning. *piVal is +** set to the integer value read. If an error occurs, the final values of +** both *piOffset and *piVal are undefined. +*/ +static int vdbeSorterReadVarint( + sqlite3_file *pFile, /* File to read from */ + i64 *piOffset, /* IN/OUT: Read offset in pFile */ + i64 *piVal /* OUT: Value read from file */ +){ + u8 aVarint[9]; /* Buffer large enough for a varint */ + i64 iOff = *piOffset; /* Offset in file to read from */ + int rc; /* Return code */ + + rc = sqlite3OsRead(pFile, aVarint, 9, iOff); + if( rc==SQLITE_OK ){ + *piOffset += getVarint(aVarint, (u64 *)piVal); + } + + return rc; +} + +/* +** Initialize iterator pIter to scan through the PMA stored in file pFile +** starting at offset iStart and ending at offset iEof-1. This function +** leaves the iterator pointing to the first key in the PMA (or EOF if the +** PMA is empty). +*/ +static int vdbeSorterIterInit( + sqlite3 *db, /* Database handle */ + VdbeSorter *pSorter, /* Sorter object */ + i64 iStart, /* Start offset in pFile */ + VdbeSorterIter *pIter, /* Iterator to populate */ + i64 *pnByte /* IN/OUT: Increment this value by PMA size */ +){ + int rc; + + assert( pSorter->iWriteOff>iStart ); + assert( pIter->aAlloc==0 ); + pIter->pFile = pSorter->pTemp1; + pIter->iReadOff = iStart; + pIter->nAlloc = 128; + pIter->aAlloc = (u8 *)sqlite3DbMallocRaw(db, pIter->nAlloc); + if( !pIter->aAlloc ){ + rc = SQLITE_NOMEM; + }else{ + i64 nByte; /* Total size of PMA in bytes */ + rc = vdbeSorterReadVarint(pSorter->pTemp1, &pIter->iReadOff, &nByte); + *pnByte += nByte; + pIter->iEof = pIter->iReadOff + nByte; + } + if( rc==SQLITE_OK ){ + rc = vdbeSorterIterNext(db, pIter); + } + return rc; +} + + +/* +** Compare key1 (buffer pKey1, size nKey1 bytes) with key2 (buffer pKey2, +** size nKey2 bytes). Argument pKeyInfo supplies the collation functions +** used by the comparison. If an error occurs, return an SQLite error code. +** Otherwise, return SQLITE_OK and set *pRes to a negative, zero or positive +** value, depending on whether key1 is smaller, equal to or larger than key2. +** +** If the bOmitRowid argument is non-zero, assume both keys end in a rowid +** field. For the purposes of the comparison, ignore it. Also, if bOmitRowid +** is true and key1 contains even a single NULL value, it is considered to +** be less than key2. Even if key2 also contains NULL values. +** +** If pKey2 is passed a NULL pointer, then it is assumed that the pCsr->aSpace +** has been allocated and contains an unpacked record that is used as key2. +*/ +static void vdbeSorterCompare( + VdbeCursor *pCsr, /* Cursor object (for pKeyInfo) */ + int bOmitRowid, /* Ignore rowid field at end of keys */ + void *pKey1, int nKey1, /* Left side of comparison */ + void *pKey2, int nKey2, /* Right side of comparison */ + int *pRes /* OUT: Result of comparison */ +){ + KeyInfo *pKeyInfo = pCsr->pKeyInfo; + VdbeSorter *pSorter = pCsr->pSorter; + UnpackedRecord *r2 = pSorter->pUnpacked; + int i; + + if( pKey2 ){ + sqlite3VdbeRecordUnpack(pKeyInfo, nKey2, pKey2, r2); + } + + if( bOmitRowid ){ + r2->nField = pKeyInfo->nField; + assert( r2->nField>0 ); + for(i=0; inField; i++){ + if( r2->aMem[i].flags & MEM_Null ){ + *pRes = -1; + return; + } + } + r2->flags |= UNPACKED_PREFIX_MATCH; + } + + *pRes = sqlite3VdbeRecordCompare(nKey1, pKey1, r2); +} + +/* +** This function is called to compare two iterator keys when merging +** multiple b-tree segments. Parameter iOut is the index of the aTree[] +** value to recalculate. +*/ +static int vdbeSorterDoCompare(VdbeCursor *pCsr, int iOut){ + VdbeSorter *pSorter = pCsr->pSorter; + int i1; + int i2; + int iRes; + VdbeSorterIter *p1; + VdbeSorterIter *p2; + + assert( iOutnTree && iOut>0 ); + + if( iOut>=(pSorter->nTree/2) ){ + i1 = (iOut - pSorter->nTree/2) * 2; + i2 = i1 + 1; + }else{ + i1 = pSorter->aTree[iOut*2]; + i2 = pSorter->aTree[iOut*2+1]; + } + + p1 = &pSorter->aIter[i1]; + p2 = &pSorter->aIter[i2]; + + if( p1->pFile==0 ){ + iRes = i2; + }else if( p2->pFile==0 ){ + iRes = i1; + }else{ + int res; + assert( pCsr->pSorter->pUnpacked!=0 ); /* allocated in vdbeSorterMerge() */ + vdbeSorterCompare( + pCsr, 0, p1->aKey, p1->nKey, p2->aKey, p2->nKey, &res + ); + if( res<=0 ){ + iRes = i1; + }else{ + iRes = i2; + } + } + + pSorter->aTree[iOut] = iRes; + return SQLITE_OK; +} + +/* +** Initialize the temporary index cursor just opened as a sorter cursor. +*/ +SQLITE_PRIVATE int sqlite3VdbeSorterInit(sqlite3 *db, VdbeCursor *pCsr){ + int pgsz; /* Page size of main database */ + int mxCache; /* Cache size */ + VdbeSorter *pSorter; /* The new sorter */ + char *d; /* Dummy */ + + assert( pCsr->pKeyInfo && pCsr->pBt==0 ); + pCsr->pSorter = pSorter = sqlite3DbMallocZero(db, sizeof(VdbeSorter)); + if( pSorter==0 ){ + return SQLITE_NOMEM; + } + + pSorter->pUnpacked = sqlite3VdbeAllocUnpackedRecord(pCsr->pKeyInfo, 0, 0, &d); + if( pSorter->pUnpacked==0 ) return SQLITE_NOMEM; + assert( pSorter->pUnpacked==(UnpackedRecord *)d ); + + if( !sqlite3TempInMemory(db) ){ + pgsz = sqlite3BtreeGetPageSize(db->aDb[0].pBt); + pSorter->mnPmaSize = SORTER_MIN_WORKING * pgsz; + mxCache = db->aDb[0].pSchema->cache_size; + if( mxCachemxPmaSize = mxCache * pgsz; + } + + return SQLITE_OK; +} + +/* +** Free the list of sorted records starting at pRecord. +*/ +static void vdbeSorterRecordFree(sqlite3 *db, SorterRecord *pRecord){ + SorterRecord *p; + SorterRecord *pNext; + for(p=pRecord; p; p=pNext){ + pNext = p->pNext; + sqlite3DbFree(db, p); + } +} + +/* +** Free any cursor components allocated by sqlite3VdbeSorterXXX routines. +*/ +SQLITE_PRIVATE void sqlite3VdbeSorterClose(sqlite3 *db, VdbeCursor *pCsr){ + VdbeSorter *pSorter = pCsr->pSorter; + if( pSorter ){ + if( pSorter->aIter ){ + int i; + for(i=0; inTree; i++){ + vdbeSorterIterZero(db, &pSorter->aIter[i]); + } + sqlite3DbFree(db, pSorter->aIter); + } + if( pSorter->pTemp1 ){ + sqlite3OsCloseFree(pSorter->pTemp1); + } + vdbeSorterRecordFree(db, pSorter->pRecord); + sqlite3DbFree(db, pSorter->pUnpacked); + sqlite3DbFree(db, pSorter); + pCsr->pSorter = 0; + } +} + +/* +** Allocate space for a file-handle and open a temporary file. If successful, +** set *ppFile to point to the malloc'd file-handle and return SQLITE_OK. +** Otherwise, set *ppFile to 0 and return an SQLite error code. +*/ +static int vdbeSorterOpenTempFile(sqlite3 *db, sqlite3_file **ppFile){ + int dummy; + return sqlite3OsOpenMalloc(db->pVfs, 0, ppFile, + SQLITE_OPEN_TEMP_JOURNAL | + SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | + SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE, &dummy + ); +} + +/* +** Merge the two sorted lists p1 and p2 into a single list. +** Set *ppOut to the head of the new list. +*/ +static void vdbeSorterMerge( + VdbeCursor *pCsr, /* For pKeyInfo */ + SorterRecord *p1, /* First list to merge */ + SorterRecord *p2, /* Second list to merge */ + SorterRecord **ppOut /* OUT: Head of merged list */ +){ + SorterRecord *pFinal = 0; + SorterRecord **pp = &pFinal; + void *pVal2 = p2 ? p2->pVal : 0; + + while( p1 && p2 ){ + int res; + vdbeSorterCompare(pCsr, 0, p1->pVal, p1->nVal, pVal2, p2->nVal, &res); + if( res<=0 ){ + *pp = p1; + pp = &p1->pNext; + p1 = p1->pNext; + pVal2 = 0; + }else{ + *pp = p2; + pp = &p2->pNext; + p2 = p2->pNext; + if( p2==0 ) break; + pVal2 = p2->pVal; + } + } + *pp = p1 ? p1 : p2; + *ppOut = pFinal; +} + +/* +** Sort the linked list of records headed at pCsr->pRecord. Return SQLITE_OK +** if successful, or an SQLite error code (i.e. SQLITE_NOMEM) if an error +** occurs. +*/ +static int vdbeSorterSort(VdbeCursor *pCsr){ + int i; + SorterRecord **aSlot; + SorterRecord *p; + VdbeSorter *pSorter = pCsr->pSorter; + + aSlot = (SorterRecord **)sqlite3MallocZero(64 * sizeof(SorterRecord *)); + if( !aSlot ){ + return SQLITE_NOMEM; + } + + p = pSorter->pRecord; + while( p ){ + SorterRecord *pNext = p->pNext; + p->pNext = 0; + for(i=0; aSlot[i]; i++){ + vdbeSorterMerge(pCsr, p, aSlot[i], &p); + aSlot[i] = 0; + } + aSlot[i] = p; + p = pNext; + } + + p = 0; + for(i=0; i<64; i++){ + vdbeSorterMerge(pCsr, p, aSlot[i], &p); + } + pSorter->pRecord = p; + + sqlite3_free(aSlot); + return SQLITE_OK; +} + + +/* +** Write the current contents of the in-memory linked-list to a PMA. Return +** SQLITE_OK if successful, or an SQLite error code otherwise. +** +** The format of a PMA is: +** +** * A varint. This varint contains the total number of bytes of content +** in the PMA (not including the varint itself). +** +** * One or more records packed end-to-end in order of ascending keys. +** Each record consists of a varint followed by a blob of data (the +** key). The varint is the number of bytes in the blob of data. +*/ +static int vdbeSorterListToPMA(sqlite3 *db, VdbeCursor *pCsr){ + int rc = SQLITE_OK; /* Return code */ + VdbeSorter *pSorter = pCsr->pSorter; + + if( pSorter->nInMemory==0 ){ + assert( pSorter->pRecord==0 ); + return rc; + } + + rc = vdbeSorterSort(pCsr); + + /* If the first temporary PMA file has not been opened, open it now. */ + if( rc==SQLITE_OK && pSorter->pTemp1==0 ){ + rc = vdbeSorterOpenTempFile(db, &pSorter->pTemp1); + assert( rc!=SQLITE_OK || pSorter->pTemp1 ); + assert( pSorter->iWriteOff==0 ); + assert( pSorter->nPMA==0 ); + } + + if( rc==SQLITE_OK ){ + i64 iOff = pSorter->iWriteOff; + SorterRecord *p; + SorterRecord *pNext = 0; + static const char eightZeros[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + + pSorter->nPMA++; + rc = vdbeSorterWriteVarint(pSorter->pTemp1, pSorter->nInMemory, &iOff); + for(p=pSorter->pRecord; rc==SQLITE_OK && p; p=pNext){ + pNext = p->pNext; + rc = vdbeSorterWriteVarint(pSorter->pTemp1, p->nVal, &iOff); + + if( rc==SQLITE_OK ){ + rc = sqlite3OsWrite(pSorter->pTemp1, p->pVal, p->nVal, iOff); + iOff += p->nVal; + } + + sqlite3DbFree(db, p); + } + + /* This assert verifies that unless an error has occurred, the size of + ** the PMA on disk is the same as the expected size stored in + ** pSorter->nInMemory. */ + assert( rc!=SQLITE_OK || pSorter->nInMemory==( + iOff-pSorter->iWriteOff-sqlite3VarintLen(pSorter->nInMemory) + )); + + pSorter->iWriteOff = iOff; + if( rc==SQLITE_OK ){ + /* Terminate each file with 8 extra bytes so that from any offset + ** in the file we can always read 9 bytes without a SHORT_READ error */ + rc = sqlite3OsWrite(pSorter->pTemp1, eightZeros, 8, iOff); + } + pSorter->pRecord = p; + } + + return rc; +} + +/* +** Add a record to the sorter. +*/ +SQLITE_PRIVATE int sqlite3VdbeSorterWrite( + sqlite3 *db, /* Database handle */ + VdbeCursor *pCsr, /* Sorter cursor */ + Mem *pVal /* Memory cell containing record */ +){ + VdbeSorter *pSorter = pCsr->pSorter; + int rc = SQLITE_OK; /* Return Code */ + SorterRecord *pNew; /* New list element */ + + assert( pSorter ); + pSorter->nInMemory += sqlite3VarintLen(pVal->n) + pVal->n; + + pNew = (SorterRecord *)sqlite3DbMallocRaw(db, pVal->n + sizeof(SorterRecord)); + if( pNew==0 ){ + rc = SQLITE_NOMEM; + }else{ + pNew->pVal = (void *)&pNew[1]; + memcpy(pNew->pVal, pVal->z, pVal->n); + pNew->nVal = pVal->n; + pNew->pNext = pSorter->pRecord; + pSorter->pRecord = pNew; + } + + /* See if the contents of the sorter should now be written out. They + ** are written out when either of the following are true: + ** + ** * The total memory allocated for the in-memory list is greater + ** than (page-size * cache-size), or + ** + ** * The total memory allocated for the in-memory list is greater + ** than (page-size * 10) and sqlite3HeapNearlyFull() returns true. + */ + if( rc==SQLITE_OK && pSorter->mxPmaSize>0 && ( + (pSorter->nInMemory>pSorter->mxPmaSize) + || (pSorter->nInMemory>pSorter->mnPmaSize && sqlite3HeapNearlyFull()) + )){ + rc = vdbeSorterListToPMA(db, pCsr); + pSorter->nInMemory = 0; + } + + return rc; +} + +/* +** Helper function for sqlite3VdbeSorterRewind(). +*/ +static int vdbeSorterInitMerge( + sqlite3 *db, /* Database handle */ + VdbeCursor *pCsr, /* Cursor handle for this sorter */ + i64 *pnByte /* Sum of bytes in all opened PMAs */ +){ + VdbeSorter *pSorter = pCsr->pSorter; + int rc = SQLITE_OK; /* Return code */ + int i; /* Used to iterator through aIter[] */ + i64 nByte = 0; /* Total bytes in all opened PMAs */ + + /* Initialize the iterators. */ + for(i=0; iaIter[i]; + rc = vdbeSorterIterInit(db, pSorter, pSorter->iReadOff, pIter, &nByte); + pSorter->iReadOff = pIter->iEof; + assert( rc!=SQLITE_OK || pSorter->iReadOff<=pSorter->iWriteOff ); + if( rc!=SQLITE_OK || pSorter->iReadOff>=pSorter->iWriteOff ) break; + } + + /* Initialize the aTree[] array. */ + for(i=pSorter->nTree-1; rc==SQLITE_OK && i>0; i--){ + rc = vdbeSorterDoCompare(pCsr, i); + } + + *pnByte = nByte; + return rc; +} + +/* +** Once the sorter has been populated, this function is called to prepare +** for iterating through its contents in sorted order. +*/ +SQLITE_PRIVATE int sqlite3VdbeSorterRewind(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){ + VdbeSorter *pSorter = pCsr->pSorter; + int rc; /* Return code */ + sqlite3_file *pTemp2 = 0; /* Second temp file to use */ + i64 iWrite2 = 0; /* Write offset for pTemp2 */ + int nIter; /* Number of iterators used */ + int nByte; /* Bytes of space required for aIter/aTree */ + int N = 2; /* Power of 2 >= nIter */ + + assert( pSorter ); + + /* If no data has been written to disk, then do not do so now. Instead, + ** sort the VdbeSorter.pRecord list. The vdbe layer will read data directly + ** from the in-memory list. */ + if( pSorter->nPMA==0 ){ + *pbEof = !pSorter->pRecord; + assert( pSorter->aTree==0 ); + return vdbeSorterSort(pCsr); + } + + /* Write the current b-tree to a PMA. Close the b-tree cursor. */ + rc = vdbeSorterListToPMA(db, pCsr); + if( rc!=SQLITE_OK ) return rc; + + /* Allocate space for aIter[] and aTree[]. */ + nIter = pSorter->nPMA; + if( nIter>SORTER_MAX_MERGE_COUNT ) nIter = SORTER_MAX_MERGE_COUNT; + assert( nIter>0 ); + while( NaIter = (VdbeSorterIter *)sqlite3DbMallocZero(db, nByte); + if( !pSorter->aIter ) return SQLITE_NOMEM; + pSorter->aTree = (int *)&pSorter->aIter[N]; + pSorter->nTree = N; + + do { + int iNew; /* Index of new, merged, PMA */ + + for(iNew=0; + rc==SQLITE_OK && iNew*SORTER_MAX_MERGE_COUNTnPMA; + iNew++ + ){ + i64 nWrite; /* Number of bytes in new PMA */ + + /* If there are SORTER_MAX_MERGE_COUNT or less PMAs in file pTemp1, + ** initialize an iterator for each of them and break out of the loop. + ** These iterators will be incrementally merged as the VDBE layer calls + ** sqlite3VdbeSorterNext(). + ** + ** Otherwise, if pTemp1 contains more than SORTER_MAX_MERGE_COUNT PMAs, + ** initialize interators for SORTER_MAX_MERGE_COUNT of them. These PMAs + ** are merged into a single PMA that is written to file pTemp2. + */ + rc = vdbeSorterInitMerge(db, pCsr, &nWrite); + assert( rc!=SQLITE_OK || pSorter->aIter[ pSorter->aTree[1] ].pFile ); + if( rc!=SQLITE_OK || pSorter->nPMA<=SORTER_MAX_MERGE_COUNT ){ + break; + } + + /* Open the second temp file, if it is not already open. */ + if( pTemp2==0 ){ + assert( iWrite2==0 ); + rc = vdbeSorterOpenTempFile(db, &pTemp2); + } + + if( rc==SQLITE_OK ){ + rc = vdbeSorterWriteVarint(pTemp2, nWrite, &iWrite2); + } + + if( rc==SQLITE_OK ){ + int bEof = 0; + while( rc==SQLITE_OK && bEof==0 ){ + int nToWrite; + VdbeSorterIter *pIter = &pSorter->aIter[ pSorter->aTree[1] ]; + assert( pIter->pFile ); + nToWrite = pIter->nKey + sqlite3VarintLen(pIter->nKey); + rc = sqlite3OsWrite(pTemp2, pIter->aAlloc, nToWrite, iWrite2); + iWrite2 += nToWrite; + if( rc==SQLITE_OK ){ + rc = sqlite3VdbeSorterNext(db, pCsr, &bEof); + } + } + } + } + + if( pSorter->nPMA<=SORTER_MAX_MERGE_COUNT ){ + break; + }else{ + sqlite3_file *pTmp = pSorter->pTemp1; + pSorter->nPMA = iNew; + pSorter->pTemp1 = pTemp2; + pTemp2 = pTmp; + pSorter->iWriteOff = iWrite2; + pSorter->iReadOff = 0; + iWrite2 = 0; + } + }while( rc==SQLITE_OK ); + + if( pTemp2 ){ + sqlite3OsCloseFree(pTemp2); + } + *pbEof = (pSorter->aIter[pSorter->aTree[1]].pFile==0); + return rc; +} + +/* +** Advance to the next element in the sorter. +*/ +SQLITE_PRIVATE int sqlite3VdbeSorterNext(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){ + VdbeSorter *pSorter = pCsr->pSorter; + int rc; /* Return code */ + + if( pSorter->aTree ){ + int iPrev = pSorter->aTree[1];/* Index of iterator to advance */ + int i; /* Index of aTree[] to recalculate */ + + rc = vdbeSorterIterNext(db, &pSorter->aIter[iPrev]); + for(i=(pSorter->nTree+iPrev)/2; rc==SQLITE_OK && i>0; i=i/2){ + rc = vdbeSorterDoCompare(pCsr, i); + } + + *pbEof = (pSorter->aIter[pSorter->aTree[1]].pFile==0); + }else{ + SorterRecord *pFree = pSorter->pRecord; + pSorter->pRecord = pFree->pNext; + pFree->pNext = 0; + vdbeSorterRecordFree(db, pFree); + *pbEof = !pSorter->pRecord; + rc = SQLITE_OK; + } + return rc; +} + +/* +** Return a pointer to a buffer owned by the sorter that contains the +** current key. +*/ +static void *vdbeSorterRowkey( + VdbeSorter *pSorter, /* Sorter object */ + int *pnKey /* OUT: Size of current key in bytes */ +){ + void *pKey; + if( pSorter->aTree ){ + VdbeSorterIter *pIter; + pIter = &pSorter->aIter[ pSorter->aTree[1] ]; + *pnKey = pIter->nKey; + pKey = pIter->aKey; + }else{ + *pnKey = pSorter->pRecord->nVal; + pKey = pSorter->pRecord->pVal; + } + return pKey; +} + +/* +** Copy the current sorter key into the memory cell pOut. +*/ +SQLITE_PRIVATE int sqlite3VdbeSorterRowkey(VdbeCursor *pCsr, Mem *pOut){ + VdbeSorter *pSorter = pCsr->pSorter; + void *pKey; int nKey; /* Sorter key to copy into pOut */ + + pKey = vdbeSorterRowkey(pSorter, &nKey); + if( sqlite3VdbeMemGrow(pOut, nKey, 0) ){ + return SQLITE_NOMEM; + } + pOut->n = nKey; + MemSetTypeFlag(pOut, MEM_Blob); + memcpy(pOut->z, pKey, nKey); + + return SQLITE_OK; +} + +/* +** Compare the key in memory cell pVal with the key that the sorter cursor +** passed as the first argument currently points to. For the purposes of +** the comparison, ignore the rowid field at the end of each record. +** +** If an error occurs, return an SQLite error code (i.e. SQLITE_NOMEM). +** Otherwise, set *pRes to a negative, zero or positive value if the +** key in pVal is smaller than, equal to or larger than the current sorter +** key. +*/ +SQLITE_PRIVATE int sqlite3VdbeSorterCompare( + VdbeCursor *pCsr, /* Sorter cursor */ + Mem *pVal, /* Value to compare to current sorter key */ + int *pRes /* OUT: Result of comparison */ +){ + VdbeSorter *pSorter = pCsr->pSorter; + void *pKey; int nKey; /* Sorter key to compare pVal with */ + + pKey = vdbeSorterRowkey(pSorter, &nKey); + vdbeSorterCompare(pCsr, 1, pVal->z, pVal->n, pKey, nKey, pRes); + return SQLITE_OK; +} + +#endif /* #ifndef SQLITE_OMIT_MERGE_SORT */ + +/************** End of vdbesort.c ********************************************/ /************** Begin file journal.c *****************************************/ /* ** 2007 August 22 ** ** The author disclaims copyright to this source code. In place of @@ -69889,10 +71669,12 @@ ** ************************************************************************* ** This file contains routines used for walking the parser tree for ** an SQL statement. */ +/* #include */ +/* #include */ /* ** Walk an expression tree. Invoke the callback once for each node ** of the expression, while decending. (In other words, the callback @@ -70027,10 +71809,12 @@ ** ** This file contains routines used for walking the parser tree and ** resolve all identifiers by associating them with a particular ** table and column. */ +/* #include */ +/* #include */ /* ** Turn the pExpr expression into an alias for the iCol-th column of the ** result set in pEList. ** @@ -71006,15 +72790,29 @@ /* Recursively resolve names in all subqueries */ for(i=0; ipSrc->nSrc; i++){ struct SrcList_item *pItem = &p->pSrc->a[i]; if( pItem->pSelect ){ + NameContext *pNC; /* Used to iterate name contexts */ + int nRef = 0; /* Refcount for pOuterNC and outer contexts */ const char *zSavedContext = pParse->zAuthContext; + + /* Count the total number of references to pOuterNC and all of its + ** parent contexts. After resolving references to expressions in + ** pItem->pSelect, check if this value has changed. If so, then + ** SELECT statement pItem->pSelect must be correlated. Set the + ** pItem->isCorrelated flag if this is the case. */ + for(pNC=pOuterNC; pNC; pNC=pNC->pNext) nRef += pNC->nRef; + if( pItem->zName ) pParse->zAuthContext = pItem->zName; sqlite3ResolveSelectNames(pParse, pItem->pSelect, pOuterNC); pParse->zAuthContext = zSavedContext; if( pParse->nErr || db->mallocFailed ) return WRC_Abort; + + for(pNC=pOuterNC; pNC; pNC=pNC->pNext) nRef -= pNC->nRef; + assert( pItem->isCorrelated==0 && nRef<=0 ); + pItem->isCorrelated = (nRef!=0); } } /* If there are no aggregate functions in the result-set, and no GROUP BY ** expression, do not allow aggregates in any of the other expressions. @@ -72117,11 +73915,13 @@ pNewItem->zDatabase = sqlite3DbStrDup(db, pOldItem->zDatabase); pNewItem->zName = sqlite3DbStrDup(db, pOldItem->zName); pNewItem->zAlias = sqlite3DbStrDup(db, pOldItem->zAlias); pNewItem->jointype = pOldItem->jointype; pNewItem->iCursor = pOldItem->iCursor; - pNewItem->isPopulated = pOldItem->isPopulated; + pNewItem->addrFillSub = pOldItem->addrFillSub; + pNewItem->regReturn = pOldItem->regReturn; + pNewItem->isCorrelated = pOldItem->isCorrelated; pNewItem->zIndex = sqlite3DbStrDup(db, pOldItem->zIndex); pNewItem->notIndexed = pOldItem->notIndexed; pNewItem->pIndex = pOldItem->pIndex; pTab = pNewItem->pTab = pOldItem->pTab; if( pTab ){ @@ -72676,12 +74476,11 @@ assert(v); if( iCol<0 ){ int iMem = ++pParse->nMem; int iAddr; - iAddr = sqlite3VdbeAddOp1(v, OP_If, iMem); - sqlite3VdbeAddOp2(v, OP_Integer, 1, iMem); + iAddr = sqlite3VdbeAddOp1(v, OP_Once, iMem); sqlite3OpenTable(pParse, iTab, iDb, pTab, OP_OpenRead); eType = IN_INDEX_ROWID; sqlite3VdbeJumpHere(v, iAddr); @@ -72708,12 +74507,11 @@ int iMem = ++pParse->nMem; int iAddr; char *pKey; pKey = (char *)sqlite3IndexKeyinfo(pParse, pIdx); - iAddr = sqlite3VdbeAddOp1(v, OP_If, iMem); - sqlite3VdbeAddOp2(v, OP_Integer, 1, iMem); + iAddr = sqlite3VdbeAddOp1(v, OP_Once, iMem); sqlite3VdbeAddOp4(v, OP_OpenRead, iTab, pIdx->tnum, iDb, pKey,P4_KEYINFO_HANDOFF); VdbeComment((v, "%s", pIdx->zName)); eType = IN_INDEX_INDEX; @@ -72790,11 +74588,11 @@ Parse *pParse, /* Parsing context */ Expr *pExpr, /* The IN, SELECT, or EXISTS operator */ int rMayHaveNull, /* Register that records whether NULLs exist in RHS */ int isRowid /* If true, LHS of IN operator is a rowid */ ){ - int testAddr = 0; /* One-time test address */ + int testAddr = -1; /* One-time test address */ int rReg = 0; /* Register storing resulting */ Vdbe *v = sqlite3GetVdbe(pParse); if( NEVER(v==0) ) return 0; sqlite3ExprCachePush(pParse); @@ -72808,19 +74606,17 @@ ** If all of the above are false, then we can run this code just once ** save the results, and reuse the same result on subsequent invocations. */ if( !ExprHasAnyProperty(pExpr, EP_VarSelect) && !pParse->pTriggerTab ){ int mem = ++pParse->nMem; - sqlite3VdbeAddOp1(v, OP_If, mem); - testAddr = sqlite3VdbeAddOp2(v, OP_Integer, 1, mem); - assert( testAddr>0 || pParse->db->mallocFailed ); + testAddr = sqlite3VdbeAddOp1(v, OP_Once, mem); } #ifndef SQLITE_OMIT_EXPLAIN if( pParse->explain==2 ){ char *zMsg = sqlite3MPrintf( - pParse->db, "EXECUTE %s%s SUBQUERY %d", testAddr?"":"CORRELATED ", + pParse->db, "EXECUTE %s%s SUBQUERY %d", testAddr>=0?"":"CORRELATED ", pExpr->op==TK_IN?"LIST":"SCALAR", pParse->iNextSelectId ); sqlite3VdbeAddOp4(v, OP_Explain, pParse->iSelectId, 0, 0, zMsg, P4_DYNAMIC); } #endif @@ -72908,13 +74704,13 @@ /* If the expression is not constant then we will need to ** disable the test that was generated above that makes sure ** this code only executes once. Because for a non-constant ** expression we need to rerun this code each time. */ - if( testAddr && !sqlite3ExprIsConstant(pE2) ){ - sqlite3VdbeChangeToNoop(v, testAddr-1, 2); - testAddr = 0; + if( testAddr>=0 && !sqlite3ExprIsConstant(pE2) ){ + sqlite3VdbeChangeToNoop(v, testAddr); + testAddr = -1; } /* Evaluate the expression and insert it into the temp table */ if( isRowid && sqlite3ExprIsInteger(pE2, &iValToIns) ){ sqlite3VdbeAddOp3(v, OP_InsertInt, pExpr->iTable, r2, iValToIns); @@ -72979,12 +74775,12 @@ ExprSetIrreducible(pExpr); break; } } - if( testAddr ){ - sqlite3VdbeJumpHere(v, testAddr-1); + if( testAddr>=0 ){ + sqlite3VdbeJumpHere(v, testAddr); } sqlite3ExprCachePop(pParse, 1); return rReg; } @@ -73502,11 +75298,11 @@ if( !pAggInfo->directMode ){ assert( pCol->iMem>0 ); inReg = pCol->iMem; break; }else if( pAggInfo->useSortingIdx ){ - sqlite3VdbeAddOp3(v, OP_Column, pAggInfo->sortingIdx, + sqlite3VdbeAddOp3(v, OP_Column, pAggInfo->sortingIdxPTab, pCol->iSorterColumn, target); break; } /* Otherwise, fall thru into the TK_COLUMN case */ } @@ -79008,11 +80804,11 @@ Table *p; int n; const char *z; Token sEnd; DbFixer sFix; - Token *pName; + Token *pName = 0; int iDb; sqlite3 *db = pParse->db; if( pParse->nVar>0 ){ sqlite3ErrorMsg(pParse, "parameters are not allowed in views"); @@ -79313,10 +81109,33 @@ iDestroyed = iLargest; } } #endif } + +/* +** Remove entries from the sqlite_stat1 and sqlite_stat2 tables +** after a DROP INDEX or DROP TABLE command. +*/ +static void sqlite3ClearStatTables( + Parse *pParse, /* The parsing context */ + int iDb, /* The database number */ + const char *zType, /* "idx" or "tbl" */ + const char *zName /* Name of index or table */ +){ + static const char *azStatTab[] = { "sqlite_stat1", "sqlite_stat2" }; + int i; + const char *zDbName = pParse->db->aDb[iDb].zName; + for(i=0; idb, azStatTab[i], zDbName) ){ + sqlite3NestedParse(pParse, + "DELETE FROM %Q.%s WHERE %s=%Q", + zDbName, azStatTab[i], zType, zName + ); + } + } +} /* ** This routine is called to do the work of a DROP TABLE statement. ** pName is the name of the table to be dropped. */ @@ -79453,18 +81272,11 @@ ** database. */ sqlite3NestedParse(pParse, "DELETE FROM %Q.%s WHERE tbl_name=%Q and type!='trigger'", pDb->zName, SCHEMA_TABLE(iDb), pTab->zName); - - /* Drop any statistics from the sqlite_stat1 table, if it exists */ - if( sqlite3FindTable(db, "sqlite_stat1", db->aDb[iDb].zName) ){ - sqlite3NestedParse(pParse, - "DELETE FROM %Q.sqlite_stat1 WHERE tbl=%Q", pDb->zName, pTab->zName - ); - } - + sqlite3ClearStatTables(pParse, iDb, "tbl", pTab->zName); if( !isView && !IsVirtual(pTab) ){ destroyTable(pParse, pTab); } /* Remove the table entry from SQLite's internal schema and modify @@ -79642,11 +81454,13 @@ */ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ Table *pTab = pIndex->pTable; /* The table that is indexed */ int iTab = pParse->nTab++; /* Btree cursor used for pTab */ int iIdx = pParse->nTab++; /* Btree cursor used for pIndex */ + int iSorter = iTab; /* Cursor opened by OpenSorter (if in use) */ int addr1; /* Address of top of loop */ + int addr2; /* Address to jump to for next iteration */ int tnum; /* Root page of index */ Vdbe *v; /* Generate code into this virtual machine */ KeyInfo *pKey; /* KeyInfo for index */ int regIdxKey; /* Registers containing the index key */ int regRecord; /* Register holding assemblied index record */ @@ -79675,14 +81489,45 @@ sqlite3VdbeAddOp4(v, OP_OpenWrite, iIdx, tnum, iDb, (char *)pKey, P4_KEYINFO_HANDOFF); if( memRootPage>=0 ){ sqlite3VdbeChangeP5(v, 1); } + +#ifndef SQLITE_OMIT_MERGE_SORT + /* Open the sorter cursor if we are to use one. */ + iSorter = pParse->nTab++; + sqlite3VdbeAddOp4(v, OP_SorterOpen, iSorter, 0, 0, (char*)pKey, P4_KEYINFO); +#endif + + /* Open the table. Loop through all rows of the table, inserting index + ** records into the sorter. */ sqlite3OpenTable(pParse, iTab, iDb, pTab, OP_OpenRead); addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iTab, 0); + addr2 = addr1 + 1; regRecord = sqlite3GetTempReg(pParse); regIdxKey = sqlite3GenerateIndexKey(pParse, pIndex, iTab, regRecord, 1); + +#ifndef SQLITE_OMIT_MERGE_SORT + sqlite3VdbeAddOp2(v, OP_SorterInsert, iSorter, regRecord); + sqlite3VdbeAddOp2(v, OP_Next, iTab, addr1+1); + sqlite3VdbeJumpHere(v, addr1); + addr1 = sqlite3VdbeAddOp2(v, OP_SorterSort, iSorter, 0); + if( pIndex->onError!=OE_None ){ + int j2 = sqlite3VdbeCurrentAddr(v) + 3; + sqlite3VdbeAddOp2(v, OP_Goto, 0, j2); + addr2 = sqlite3VdbeCurrentAddr(v); + sqlite3VdbeAddOp3(v, OP_SorterCompare, iSorter, j2, regRecord); + sqlite3HaltConstraint( + pParse, OE_Abort, "indexed columns are not unique", P4_STATIC + ); + }else{ + addr2 = sqlite3VdbeCurrentAddr(v); + } + sqlite3VdbeAddOp2(v, OP_SorterData, iSorter, regRecord); + sqlite3VdbeAddOp3(v, OP_IdxInsert, iIdx, regRecord, 1); + sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT); +#else if( pIndex->onError!=OE_None ){ const int regRowid = regIdxKey + pIndex->nColumn; const int j2 = sqlite3VdbeCurrentAddr(v) + 2; void * const pRegKey = SQLITE_INT_TO_PTR(regIdxKey); @@ -79697,17 +81542,20 @@ */ sqlite3VdbeAddOp4(v, OP_IsUnique, iIdx, j2, regRowid, pRegKey, P4_INT32); sqlite3HaltConstraint( pParse, OE_Abort, "indexed columns are not unique", P4_STATIC); } - sqlite3VdbeAddOp2(v, OP_IdxInsert, iIdx, regRecord); + sqlite3VdbeAddOp3(v, OP_IdxInsert, iIdx, regRecord, 0); sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT); +#endif sqlite3ReleaseTempReg(pParse, regRecord); - sqlite3VdbeAddOp2(v, OP_Next, iTab, addr1+1); + sqlite3VdbeAddOp2(v, OP_SorterNext, iSorter, addr2); sqlite3VdbeJumpHere(v, addr1); + sqlite3VdbeAddOp1(v, OP_Close, iTab); sqlite3VdbeAddOp1(v, OP_Close, iIdx); + sqlite3VdbeAddOp1(v, OP_Close, iSorter); } /* ** Create a new index for an SQL table. pName1.pName2 is the name of the index ** and pTblList is the name of the table that is to be indexed. Both will @@ -80125,11 +81973,11 @@ if( pStart ){ assert( pEnd!=0 ); /* A named index with an explicit CREATE INDEX statement */ zStmt = sqlite3MPrintf(db, "CREATE%s INDEX %.*s", onError==OE_None ? "" : " UNIQUE", - pEnd->z - pName->z + 1, + (int)(pEnd->z - pName->z) + 1, pName->z); }else{ /* An automatic index created by a PRIMARY KEY or UNIQUE constraint */ /* zStmt = sqlite3MPrintf(""); */ zStmt = 0; @@ -80283,19 +82131,13 @@ v = sqlite3GetVdbe(pParse); if( v ){ sqlite3BeginWriteOperation(pParse, 1, iDb); sqlite3NestedParse(pParse, "DELETE FROM %Q.%s WHERE name=%Q AND type='index'", - db->aDb[iDb].zName, SCHEMA_TABLE(iDb), - pIndex->zName - ); - if( sqlite3FindTable(db, "sqlite_stat1", db->aDb[iDb].zName) ){ - sqlite3NestedParse(pParse, - "DELETE FROM %Q.sqlite_stat1 WHERE idx=%Q", - db->aDb[iDb].zName, pIndex->zName - ); - } + db->aDb[iDb].zName, SCHEMA_TABLE(iDb), pIndex->zName + ); + sqlite3ClearStatTables(pParse, iDb, "idx", pIndex->zName); sqlite3ChangeCookie(pParse, iDb); destroyRootPage(pParse, pIndex->tnum, iDb); sqlite3VdbeAddOp4(v, OP_DropIndex, iDb, 0, 0, pIndex->zName, 0); } @@ -80663,12 +82505,13 @@ ** The operator is "natural cross join". The A and B operands are stored ** in p->a[0] and p->a[1], respectively. The parser initially stores the ** operator with A. This routine shifts that operator over to B. */ SQLITE_PRIVATE void sqlite3SrcListShiftJoinType(SrcList *p){ - if( p && p->a ){ + if( p ){ int i; + assert( p->a || p->nSrc==0 ); for(i=p->nSrc-1; i>0; i--){ p->a[i].jointype = p->a[i-1].jointype; } p->a[0].jointype = 0; } @@ -81920,11 +83763,13 @@ int regRowid; /* Actual register containing rowids */ /* Collect rowids of every row to be deleted. */ sqlite3VdbeAddOp2(v, OP_Null, 0, iRowSet); - pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere,0,WHERE_DUPLICATES_OK); + pWInfo = sqlite3WhereBegin( + pParse, pTabList, pWhere, 0, 0, WHERE_DUPLICATES_OK + ); if( pWInfo==0 ) goto delete_from_cleanup; regRowid = sqlite3ExprCodeGetColumn(pParse, pTab, -1, iCur, iRowid); sqlite3VdbeAddOp2(v, OP_RowSetAdd, iRowSet, regRowid); if( db->flags & SQLITE_CountRows ){ sqlite3VdbeAddOp2(v, OP_AddImm, memCnt, 1); @@ -82218,10 +84063,12 @@ ** ** There is only one exported symbol in this file - the function ** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** All other code has file scope. */ +/* #include */ +/* #include */ /* ** Return the collating function associated with a function. */ static CollSeq *sqlite3GetFuncCollSeq(sqlite3_context *context){ @@ -84367,11 +86214,11 @@ /* Create VDBE to loop through the entries in pSrc that match the WHERE ** clause. If the constraint is not deferred, throw an exception for ** each row found. Otherwise, for deferred constraints, increment the ** deferred constraint counter by nIncr for each row selected. */ - pWInfo = sqlite3WhereBegin(pParse, pSrc, pWhere, 0, 0); + pWInfo = sqlite3WhereBegin(pParse, pSrc, pWhere, 0, 0, 0); if( nIncr>0 && pFKey->isDeferred==0 ){ sqlite3ParseToplevel(pParse)->mayAbort = 1; } sqlite3VdbeAddOp2(v, OP_FkCounter, pFKey->isDeferred, nIncr); if( pWInfo ){ @@ -84541,11 +86388,28 @@ pTo = sqlite3FindTable(db, pFKey->zTo, zDb); }else{ pTo = sqlite3LocateTable(pParse, 0, pFKey->zTo, zDb); } if( !pTo || locateFkeyIndex(pParse, pTo, pFKey, &pIdx, &aiFree) ){ + assert( isIgnoreErrors==0 || (regOld!=0 && regNew==0) ); if( !isIgnoreErrors || db->mallocFailed ) return; + if( pTo==0 ){ + /* If isIgnoreErrors is true, then a table is being dropped. In this + ** case SQLite runs a "DELETE FROM xxx" on the table being dropped + ** before actually dropping it in order to check FK constraints. + ** If the parent table of an FK constraint on the current table is + ** missing, behave as if it is empty. i.e. decrement the relevant + ** FK counter for each row of the current table with non-NULL keys. + */ + Vdbe *v = sqlite3GetVdbe(pParse); + int iJump = sqlite3VdbeCurrentAddr(v) + pFKey->nCol + 1; + for(i=0; inCol; i++){ + int iReg = pFKey->aCol[i].iFrom + regOld + 1; + sqlite3VdbeAddOp2(v, OP_IsNull, iReg, iJump); + } + sqlite3VdbeAddOp2(v, OP_FkCounter, pFKey->isDeferred, -1); + } continue; } assert( pFKey->nCol==1 || (aiFree && pIdx) ); if( aiFree ){ @@ -87234,10 +89098,13 @@ int (*strnicmp)(const char*,const char*,int); int (*unlock_notify)(sqlite3*,void(*)(void**,int),void*); int (*wal_autocheckpoint)(sqlite3*,int); int (*wal_checkpoint)(sqlite3*,const char*); void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*); + int (*blob_reopen)(sqlite3_blob*,sqlite3_int64); + int (*vtab_config)(sqlite3*,int op,...); + int (*vtab_on_conflict)(sqlite3*); }; /* ** The following macros redefine the API routines so that they are ** redirected throught the global sqlite3_api structure. @@ -87434,19 +89301,23 @@ #define sqlite3_strnicmp sqlite3_api->strnicmp #define sqlite3_unlock_notify sqlite3_api->unlock_notify #define sqlite3_wal_autocheckpoint sqlite3_api->wal_autocheckpoint #define sqlite3_wal_checkpoint sqlite3_api->wal_checkpoint #define sqlite3_wal_hook sqlite3_api->wal_hook +#define sqlite3_blob_reopen sqlite3_api->blob_reopen +#define sqlite3_vtab_config sqlite3_api->vtab_config +#define sqlite3_vtab_on_conflict sqlite3_api->vtab_on_conflict #endif /* SQLITE_CORE */ #define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api = 0; #define SQLITE_EXTENSION_INIT2(v) sqlite3_api = v; #endif /* _SQLITE3EXT_H_ */ /************** End of sqlite3ext.h ******************************************/ /************** Continuing where we left off in loadext.c ********************/ +/* #include */ #ifndef SQLITE_OMIT_LOAD_EXTENSION /* ** Some API routines are omitted when various features are @@ -87508,10 +89379,12 @@ #ifdef SQLITE_OMIT_VIRTUALTABLE # define sqlite3_create_module 0 # define sqlite3_create_module_v2 0 # define sqlite3_declare_vtab 0 +# define sqlite3_vtab_config 0 +# define sqlite3_vtab_on_conflict 0 #endif #ifdef SQLITE_OMIT_SHARED_CACHE # define sqlite3_enable_shared_cache 0 #endif @@ -87531,10 +89404,11 @@ #define sqlite3_blob_bytes 0 #define sqlite3_blob_close 0 #define sqlite3_blob_open 0 #define sqlite3_blob_read 0 #define sqlite3_blob_write 0 +#define sqlite3_blob_reopen 0 #endif /* ** The following structure contains pointers to all SQLite API routines. ** A pointer to this structure is passed into extensions when they are @@ -87796,10 +89670,13 @@ #else 0, 0, 0, #endif + sqlite3_blob_reopen, + sqlite3_vtab_config, + sqlite3_vtab_on_conflict, }; /* ** Attempt to load an SQLite extension library contained in the file ** zFile. The entry point is zProc. zProc may be 0 in which case a @@ -90553,10 +92430,12 @@ pNew->addrOpenEphm[2] = -1; if( db->mallocFailed ) { clearSelect(db, pNew); if( pNew!=&standin ) sqlite3DbFree(db, pNew); pNew = 0; + }else{ + assert( pNew->pSrc!=0 || pParse->nErr>0 ); } return pNew; } /* @@ -90883,16 +92762,22 @@ ){ Vdbe *v = pParse->pVdbe; int nExpr = pOrderBy->nExpr; int regBase = sqlite3GetTempRange(pParse, nExpr+2); int regRecord = sqlite3GetTempReg(pParse); + int op; sqlite3ExprCacheClear(pParse); sqlite3ExprCodeExprList(pParse, pOrderBy, regBase, 0); sqlite3VdbeAddOp2(v, OP_Sequence, pOrderBy->iECursor, regBase+nExpr); sqlite3ExprCodeMove(pParse, regData, regBase+nExpr+1, 1); sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nExpr + 2, regRecord); - sqlite3VdbeAddOp2(v, OP_IdxInsert, pOrderBy->iECursor, regRecord); + if( pSelect->selFlags & SF_UseSorter ){ + op = OP_SorterInsert; + }else{ + op = OP_IdxInsert; + } + sqlite3VdbeAddOp2(v, op, pOrderBy->iECursor, regRecord); sqlite3ReleaseTempReg(pParse, regRecord); sqlite3ReleaseTempRange(pParse, regBase, nExpr+2); if( pSelect->iLimit ){ int addr1, addr2; int iLimit; @@ -91357,13 +93242,24 @@ sqlite3VdbeAddOp3(v, OP_OpenPseudo, pseudoTab, regRow, nColumn); regRowid = 0; }else{ regRowid = sqlite3GetTempReg(pParse); } - addr = 1 + sqlite3VdbeAddOp2(v, OP_Sort, iTab, addrBreak); - codeOffset(v, p, addrContinue); - sqlite3VdbeAddOp3(v, OP_Column, iTab, pOrderBy->nExpr + 1, regRow); + if( p->selFlags & SF_UseSorter ){ + int regSortOut = ++pParse->nMem; + int ptab2 = pParse->nTab++; + sqlite3VdbeAddOp3(v, OP_OpenPseudo, ptab2, regSortOut, pOrderBy->nExpr+2); + addr = 1 + sqlite3VdbeAddOp2(v, OP_SorterSort, iTab, addrBreak); + codeOffset(v, p, addrContinue); + sqlite3VdbeAddOp2(v, OP_SorterData, iTab, regSortOut); + sqlite3VdbeAddOp3(v, OP_Column, ptab2, pOrderBy->nExpr+1, regRow); + sqlite3VdbeChangeP5(v, OPFLAG_CLEARCACHE); + }else{ + addr = 1 + sqlite3VdbeAddOp2(v, OP_Sort, iTab, addrBreak); + codeOffset(v, p, addrContinue); + sqlite3VdbeAddOp3(v, OP_Column, iTab, pOrderBy->nExpr+1, regRow); + } switch( eDest ){ case SRT_Table: case SRT_EphemTab: { testcase( eDest==SRT_Table ); testcase( eDest==SRT_EphemTab ); @@ -91412,11 +93308,15 @@ sqlite3ReleaseTempReg(pParse, regRowid); /* The bottom of the loop */ sqlite3VdbeResolveLabel(v, addrContinue); - sqlite3VdbeAddOp2(v, OP_Next, iTab, addr); + if( p->selFlags & SF_UseSorter ){ + sqlite3VdbeAddOp2(v, OP_SorterNext, iTab, addr); + }else{ + sqlite3VdbeAddOp2(v, OP_Next, iTab, addr); + } sqlite3VdbeResolveLabel(v, addrBreak); if( eDest==SRT_Output || eDest==SRT_Coroutine ){ sqlite3VdbeAddOp2(v, OP_Close, pseudoTab, 0); } } @@ -94185,10 +96085,11 @@ Expr *pHaving; /* The HAVING clause. May be NULL */ int isDistinct; /* True if the DISTINCT keyword is present */ int distinct; /* Table to use for the distinct set */ int rc = 1; /* Value to return from this function */ int addrSortIndex; /* Address of an OP_OpenEphemeral instruction */ + int addrDistinctIndex; /* Address of an OP_OpenEphemeral instruction */ AggInfo sAggInfo; /* Information used by aggregate queries */ int iEnd; /* Address of the end of the query */ sqlite3 *db; /* The database connection */ #ifndef SQLITE_OMIT_EXPLAIN @@ -94243,11 +96144,15 @@ struct SrcList_item *pItem = &pTabList->a[i]; SelectDest dest; Select *pSub = pItem->pSelect; int isAggSub; - if( pSub==0 || pItem->isPopulated ) continue; + if( pSub==0 ) continue; + if( pItem->addrFillSub ){ + sqlite3VdbeAddOp2(v, OP_Gosub, pItem->regReturn, pItem->addrFillSub); + continue; + } /* Increment Parse.nHeight by the height of the largest expression ** tree refered to by this, the parent select. The child select ** may contain expression trees of at most ** (SQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit @@ -94254,25 +96159,48 @@ ** more conservative than necessary, but much easier than enforcing ** an exact limit. */ pParse->nHeight += sqlite3SelectExprHeight(p); - /* Check to see if the subquery can be absorbed into the parent. */ isAggSub = (pSub->selFlags & SF_Aggregate)!=0; if( flattenSubquery(pParse, p, i, isAgg, isAggSub) ){ + /* This subquery can be absorbed into its parent. */ if( isAggSub ){ isAgg = 1; p->selFlags |= SF_Aggregate; } i = -1; }else{ + /* Generate a subroutine that will fill an ephemeral table with + ** the content of this subquery. pItem->addrFillSub will point + ** to the address of the generated subroutine. pItem->regReturn + ** is a register allocated to hold the subroutine return address + */ + int topAddr; + int onceAddr = 0; + int retAddr; + assert( pItem->addrFillSub==0 ); + pItem->regReturn = ++pParse->nMem; + topAddr = sqlite3VdbeAddOp2(v, OP_Integer, 0, pItem->regReturn); + pItem->addrFillSub = topAddr+1; + VdbeNoopComment((v, "materialize %s", pItem->pTab->zName)); + if( pItem->isCorrelated==0 && pParse->pTriggerTab==0 ){ + /* If the subquery is no correlated and if we are not inside of + ** a trigger, then we only need to compute the value of the subquery + ** once. */ + int regOnce = ++pParse->nMem; + onceAddr = sqlite3VdbeAddOp1(v, OP_Once, regOnce); + } sqlite3SelectDestInit(&dest, SRT_EphemTab, pItem->iCursor); - assert( pItem->isPopulated==0 ); explainSetInteger(pItem->iSelectId, (u8)pParse->iNextSelectId); sqlite3Select(pParse, pSub, &dest); - pItem->isPopulated = 1; pItem->pTab->nRowEst = (unsigned)pSub->nSelectRow; + if( onceAddr ) sqlite3VdbeJumpHere(v, onceAddr); + retAddr = sqlite3VdbeAddOp1(v, OP_Return, pItem->regReturn); + VdbeComment((v, "end %s", pItem->pTab->zName)); + sqlite3VdbeChangeP1(v, topAddr, retAddr); + } if( /*pParse->nErr ||*/ db->mallocFailed ){ goto select_end; } pParse->nHeight -= sqlite3SelectExprHeight(p); @@ -94311,20 +96239,10 @@ explainSetInteger(pParse->iSelectId, iRestoreSelectId); return rc; } #endif - /* If possible, rewrite the query to use GROUP BY instead of DISTINCT. - ** GROUP BY might use an index, DISTINCT never does. - */ - assert( p->pGroupBy==0 || (p->selFlags & SF_Aggregate)!=0 ); - if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct ){ - p->pGroupBy = sqlite3ExprListDup(db, p->pEList, 0); - pGroupBy = p->pGroupBy; - p->selFlags &= ~SF_Distinct; - } - /* If there is both a GROUP BY and an ORDER BY clause and they are ** identical, then disable the ORDER BY clause since the GROUP BY ** will cause elements to come out in the correct order. This is ** an optimization - the correct answer should result regardless. ** Use the SQLITE_GroupByOrder flag with SQLITE_TESTCTRL_OPTIMIZER @@ -94332,10 +96250,34 @@ */ if( sqlite3ExprListCompare(p->pGroupBy, pOrderBy)==0 && (db->flags & SQLITE_GroupByOrder)==0 ){ pOrderBy = 0; } + + /* If the query is DISTINCT with an ORDER BY but is not an aggregate, and + ** if the select-list is the same as the ORDER BY list, then this query + ** can be rewritten as a GROUP BY. In other words, this: + ** + ** SELECT DISTINCT xyz FROM ... ORDER BY xyz + ** + ** is transformed to: + ** + ** SELECT xyz FROM ... GROUP BY xyz + ** + ** The second form is preferred as a single index (or temp-table) may be + ** used for both the ORDER BY and DISTINCT processing. As originally + ** written the query must use a temp-table for at least one of the ORDER + ** BY and DISTINCT, and an index or separate temp-table for the other. + */ + if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct + && sqlite3ExprListCompare(pOrderBy, p->pEList)==0 + ){ + p->selFlags &= ~SF_Distinct; + p->pGroupBy = sqlite3ExprListDup(db, p->pEList, 0); + pGroupBy = p->pGroupBy; + pOrderBy = 0; + } /* If there is an ORDER BY clause, then this sorting ** index might end up being unused if the data can be ** extracted in pre-sorted order. If that is the case, then the ** OP_OpenEphemeral instruction will be changed to an OP_Noop once @@ -94363,47 +96305,92 @@ /* Set the limiter. */ iEnd = sqlite3VdbeMakeLabel(v); p->nSelectRow = (double)LARGEST_INT64; computeLimitRegisters(pParse, p, iEnd); + if( p->iLimit==0 && addrSortIndex>=0 ){ + sqlite3VdbeGetOp(v, addrSortIndex)->opcode = OP_SorterOpen; + p->selFlags |= SF_UseSorter; + } /* Open a virtual index to use for the distinct set. */ if( p->selFlags & SF_Distinct ){ KeyInfo *pKeyInfo; - assert( isAgg || pGroupBy ); distinct = pParse->nTab++; pKeyInfo = keyInfoFromExprList(pParse, p->pEList); - sqlite3VdbeAddOp4(v, OP_OpenEphemeral, distinct, 0, 0, - (char*)pKeyInfo, P4_KEYINFO_HANDOFF); + addrDistinctIndex = sqlite3VdbeAddOp4(v, OP_OpenEphemeral, distinct, 0, 0, + (char*)pKeyInfo, P4_KEYINFO_HANDOFF); sqlite3VdbeChangeP5(v, BTREE_UNORDERED); }else{ - distinct = -1; + distinct = addrDistinctIndex = -1; } /* Aggregate and non-aggregate queries are handled differently */ if( !isAgg && pGroupBy==0 ){ - /* This case is for non-aggregate queries - ** Begin the database scan - */ - pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pOrderBy, 0); + ExprList *pDist = (isDistinct ? p->pEList : 0); + + /* Begin the database scan. */ + pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pOrderBy, pDist, 0); if( pWInfo==0 ) goto select_end; if( pWInfo->nRowOut < p->nSelectRow ) p->nSelectRow = pWInfo->nRowOut; /* If sorting index that was created by a prior OP_OpenEphemeral ** instruction ended up not being needed, then change the OP_OpenEphemeral ** into an OP_Noop. */ if( addrSortIndex>=0 && pOrderBy==0 ){ - sqlite3VdbeChangeToNoop(v, addrSortIndex, 1); + sqlite3VdbeChangeToNoop(v, addrSortIndex); p->addrOpenEphm[2] = -1; } - /* Use the standard inner loop - */ - assert(!isDistinct); - selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, -1, pDest, + if( pWInfo->eDistinct ){ + VdbeOp *pOp; /* No longer required OpenEphemeral instr. */ + + assert( addrDistinctIndex>=0 ); + pOp = sqlite3VdbeGetOp(v, addrDistinctIndex); + + assert( isDistinct ); + assert( pWInfo->eDistinct==WHERE_DISTINCT_ORDERED + || pWInfo->eDistinct==WHERE_DISTINCT_UNIQUE + ); + distinct = -1; + if( pWInfo->eDistinct==WHERE_DISTINCT_ORDERED ){ + int iJump; + int iExpr; + int iFlag = ++pParse->nMem; + int iBase = pParse->nMem+1; + int iBase2 = iBase + pEList->nExpr; + pParse->nMem += (pEList->nExpr*2); + + /* Change the OP_OpenEphemeral coded earlier to an OP_Integer. The + ** OP_Integer initializes the "first row" flag. */ + pOp->opcode = OP_Integer; + pOp->p1 = 1; + pOp->p2 = iFlag; + + sqlite3ExprCodeExprList(pParse, pEList, iBase, 1); + iJump = sqlite3VdbeCurrentAddr(v) + 1 + pEList->nExpr + 1 + 1; + sqlite3VdbeAddOp2(v, OP_If, iFlag, iJump-1); + for(iExpr=0; iExprnExpr; iExpr++){ + CollSeq *pColl = sqlite3ExprCollSeq(pParse, pEList->a[iExpr].pExpr); + sqlite3VdbeAddOp3(v, OP_Ne, iBase+iExpr, iJump, iBase2+iExpr); + sqlite3VdbeChangeP4(v, -1, (const char *)pColl, P4_COLLSEQ); + sqlite3VdbeChangeP5(v, SQLITE_NULLEQ); + } + sqlite3VdbeAddOp2(v, OP_Goto, 0, pWInfo->iContinue); + + sqlite3VdbeAddOp2(v, OP_Integer, 0, iFlag); + assert( sqlite3VdbeCurrentAddr(v)==iJump ); + sqlite3VdbeAddOp3(v, OP_Move, iBase, iBase2, pEList->nExpr); + }else{ + pOp->opcode = OP_Noop; + } + } + + /* Use the standard inner loop. */ + selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, distinct, pDest, pWInfo->iContinue, pWInfo->iBreak); /* End the database scan loop. */ sqlite3WhereEnd(pWInfo); @@ -94416,10 +96403,12 @@ ** one row of the input to the aggregator has been ** processed */ int iAbortFlag; /* Mem address which causes query abort if positive */ int groupBySort; /* Rows come from source in GROUP BY order */ int addrEnd; /* End of processing for this SELECT */ + int sortPTab = 0; /* Pseudotable used to decode sorting results */ + int sortOut = 0; /* Output register from the sorter */ /* Remove any and all aliases between the result set and the ** GROUP BY clause. */ if( pGroupBy ){ @@ -94477,16 +96466,16 @@ int addrReset; /* Subroutine for resetting the accumulator */ int regReset; /* Return address register for reset subroutine */ /* If there is a GROUP BY clause we might need a sorting index to ** implement it. Allocate that sorting index now. If it turns out - ** that we do not need it after all, the OpenEphemeral instruction + ** that we do not need it after all, the OP_SorterOpen instruction ** will be converted into a Noop. */ sAggInfo.sortingIdx = pParse->nTab++; pKeyInfo = keyInfoFromExprList(pParse, pGroupBy); - addrSortingIdx = sqlite3VdbeAddOp4(v, OP_OpenEphemeral, + addrSortingIdx = sqlite3VdbeAddOp4(v, OP_SorterOpen, sAggInfo.sortingIdx, sAggInfo.nSortingColumn, 0, (char*)pKeyInfo, P4_KEYINFO_HANDOFF); /* Initialize memory locations used by GROUP BY aggregate processing */ @@ -94509,11 +96498,11 @@ ** This might involve two separate loops with an OP_Sort in between, or ** it might be a single loop that uses an index to extract information ** in the right order to begin with. */ sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset); - pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pGroupBy, 0); + pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pGroupBy, 0, 0); if( pWInfo==0 ) goto select_end; if( pGroupBy==0 ){ /* The optimizer is able to deliver rows in group by order so ** we do not have to sort. The OP_OpenEphemeral table will be ** cancelled later because we still need to use the pKeyInfo @@ -94563,15 +96552,18 @@ j++; } } regRecord = sqlite3GetTempReg(pParse); sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nCol, regRecord); - sqlite3VdbeAddOp2(v, OP_IdxInsert, sAggInfo.sortingIdx, regRecord); + sqlite3VdbeAddOp2(v, OP_SorterInsert, sAggInfo.sortingIdx, regRecord); sqlite3ReleaseTempReg(pParse, regRecord); sqlite3ReleaseTempRange(pParse, regBase, nCol); sqlite3WhereEnd(pWInfo); - sqlite3VdbeAddOp2(v, OP_Sort, sAggInfo.sortingIdx, addrEnd); + sAggInfo.sortingIdxPTab = sortPTab = pParse->nTab++; + sortOut = sqlite3GetTempReg(pParse); + sqlite3VdbeAddOp3(v, OP_OpenPseudo, sortPTab, sortOut, nCol); + sqlite3VdbeAddOp2(v, OP_SorterSort, sAggInfo.sortingIdx, addrEnd); VdbeComment((v, "GROUP BY sort")); sAggInfo.useSortingIdx = 1; sqlite3ExprCacheClear(pParse); } @@ -94580,13 +96572,17 @@ ** Then compare the current GROUP BY terms against the GROUP BY terms ** from the previous row currently stored in a0, a1, a2... */ addrTopOfLoop = sqlite3VdbeCurrentAddr(v); sqlite3ExprCacheClear(pParse); + if( groupBySort ){ + sqlite3VdbeAddOp2(v, OP_SorterData, sAggInfo.sortingIdx, sortOut); + } for(j=0; jnExpr; j++){ if( groupBySort ){ - sqlite3VdbeAddOp3(v, OP_Column, sAggInfo.sortingIdx, j, iBMem+j); + sqlite3VdbeAddOp3(v, OP_Column, sortPTab, j, iBMem+j); + if( j==0 ) sqlite3VdbeChangeP5(v, OPFLAG_CLEARCACHE); }else{ sAggInfo.directMode = 1; sqlite3ExprCode(pParse, pGroupBy->a[j].pExpr, iBMem+j); } } @@ -94621,14 +96617,14 @@ VdbeComment((v, "indicate data in accumulator")); /* End of the loop */ if( groupBySort ){ - sqlite3VdbeAddOp2(v, OP_Next, sAggInfo.sortingIdx, addrTopOfLoop); + sqlite3VdbeAddOp2(v, OP_SorterNext, sAggInfo.sortingIdx, addrTopOfLoop); }else{ sqlite3WhereEnd(pWInfo); - sqlite3VdbeChangeToNoop(v, addrSortingIdx, 1); + sqlite3VdbeChangeToNoop(v, addrSortingIdx); } /* Output the final row of result */ sqlite3VdbeAddOp2(v, OP_Gosub, regOutputRow, addrOutputRow); @@ -94771,11 +96767,11 @@ /* This case runs if the aggregate has no GROUP BY clause. The ** processing is much simpler since there is only a single row ** of output. */ resetAccumulator(pParse, &sAggInfo); - pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pMinMax, flag); + pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pMinMax, 0, flag); if( pWInfo==0 ){ sqlite3ExprListDelete(db, pDel); goto select_end; } updateAccumulator(pParse, &sAggInfo); @@ -94950,10 +96946,12 @@ ** interface routine of sqlite3_exec(). ** ** These routines are in a separate files so that they will not be linked ** if they are not used. */ +/* #include */ +/* #include */ #ifndef SQLITE_OMIT_GET_TABLE /* ** This structure is used to pass data from sqlite3_get_table() through @@ -95247,19 +97245,32 @@ iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName); if( iDb<0 ){ goto trigger_cleanup; } } + if( !pTableName || db->mallocFailed ){ + goto trigger_cleanup; + } + + /* A long-standing parser bug is that this syntax was allowed: + ** + ** CREATE TRIGGER attached.demo AFTER INSERT ON attached.tab .... + ** ^^^^^^^^ + ** + ** To maintain backwards compatibility, ignore the database + ** name on pTableName if we are reparsing our of SQLITE_MASTER. + */ + if( db->init.busy && iDb!=1 ){ + sqlite3DbFree(db, pTableName->a[0].zDatabase); + pTableName->a[0].zDatabase = 0; + } /* If the trigger name was unqualified, and the table is a temp table, ** then set iDb to 1 to create the trigger in the temporary database. ** If sqlite3SrcListLookup() returns 0, indicating the table does not ** exist, the error is caught by the block below. */ - if( !pTableName || db->mallocFailed ){ - goto trigger_cleanup; - } pTab = sqlite3SrcListLookup(pParse, pTableName); if( db->init.busy==0 && pName2->n==0 && pTab && pTab->pSchema==db->aDb[1].pSchema ){ iDb = 1; } @@ -96553,11 +98564,13 @@ } /* Begin the database scan */ sqlite3VdbeAddOp2(v, OP_Null, 0, regOldRowid); - pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere,0, WHERE_ONEPASS_DESIRED); + pWInfo = sqlite3WhereBegin( + pParse, pTabList, pWhere, 0, 0, WHERE_ONEPASS_DESIRED + ); if( pWInfo==0 ) goto update_cleanup; okOnePass = pWInfo->okOnePass; /* Remember the rowid of every item to be updated. */ @@ -98579,10 +100592,11 @@ #define WHERE_REVERSE 0x02000000 /* Scan in reverse order */ #define WHERE_UNIQUE 0x04000000 /* Selects no more than one row */ #define WHERE_VIRTUALTABLE 0x08000000 /* Use virtual-table processing */ #define WHERE_MULTI_OR 0x10000000 /* OR using multiple indices */ #define WHERE_TEMP_INDEX 0x20000000 /* Uses an ephemeral index */ +#define WHERE_DISTINCT 0x40000000 /* Correct order for DISTINCT */ /* ** Initialize a preallocated WhereClause structure. */ static void whereClauseInit( @@ -98792,15 +100806,23 @@ return mask; } static Bitmask exprSelectTableUsage(WhereMaskSet *pMaskSet, Select *pS){ Bitmask mask = 0; while( pS ){ + SrcList *pSrc = pS->pSrc; mask |= exprListTableUsage(pMaskSet, pS->pEList); mask |= exprListTableUsage(pMaskSet, pS->pGroupBy); mask |= exprListTableUsage(pMaskSet, pS->pOrderBy); mask |= exprTableUsage(pMaskSet, pS->pWhere); mask |= exprTableUsage(pMaskSet, pS->pHaving); + if( ALWAYS(pSrc!=0) ){ + int i; + for(i=0; inSrc; i++){ + mask |= exprSelectTableUsage(pMaskSet, pSrc->a[i].pSelect); + mask |= exprTableUsage(pMaskSet, pSrc->a[i].pOn); + } + } pS = pS->pPrior; } return mask; } @@ -99723,10 +101745,166 @@ } } return 0; } +/* +** This function searches the expression list passed as the second argument +** for an expression of type TK_COLUMN that refers to the same column and +** uses the same collation sequence as the iCol'th column of index pIdx. +** Argument iBase is the cursor number used for the table that pIdx refers +** to. +** +** If such an expression is found, its index in pList->a[] is returned. If +** no expression is found, -1 is returned. +*/ +static int findIndexCol( + Parse *pParse, /* Parse context */ + ExprList *pList, /* Expression list to search */ + int iBase, /* Cursor for table associated with pIdx */ + Index *pIdx, /* Index to match column of */ + int iCol /* Column of index to match */ +){ + int i; + const char *zColl = pIdx->azColl[iCol]; + + for(i=0; inExpr; i++){ + Expr *p = pList->a[i].pExpr; + if( p->op==TK_COLUMN + && p->iColumn==pIdx->aiColumn[iCol] + && p->iTable==iBase + ){ + CollSeq *pColl = sqlite3ExprCollSeq(pParse, p); + if( ALWAYS(pColl) && 0==sqlite3StrICmp(pColl->zName, zColl) ){ + return i; + } + } + } + + return -1; +} + +/* +** This routine determines if pIdx can be used to assist in processing a +** DISTINCT qualifier. In other words, it tests whether or not using this +** index for the outer loop guarantees that rows with equal values for +** all expressions in the pDistinct list are delivered grouped together. +** +** For example, the query +** +** SELECT DISTINCT a, b, c FROM tbl WHERE a = ? +** +** can benefit from any index on columns "b" and "c". +*/ +static int isDistinctIndex( + Parse *pParse, /* Parsing context */ + WhereClause *pWC, /* The WHERE clause */ + Index *pIdx, /* The index being considered */ + int base, /* Cursor number for the table pIdx is on */ + ExprList *pDistinct, /* The DISTINCT expressions */ + int nEqCol /* Number of index columns with == */ +){ + Bitmask mask = 0; /* Mask of unaccounted for pDistinct exprs */ + int i; /* Iterator variable */ + + if( pIdx->zName==0 || pDistinct==0 || pDistinct->nExpr>=BMS ) return 0; + testcase( pDistinct->nExpr==BMS-1 ); + + /* Loop through all the expressions in the distinct list. If any of them + ** are not simple column references, return early. Otherwise, test if the + ** WHERE clause contains a "col=X" clause. If it does, the expression + ** can be ignored. If it does not, and the column does not belong to the + ** same table as index pIdx, return early. Finally, if there is no + ** matching "col=X" expression and the column is on the same table as pIdx, + ** set the corresponding bit in variable mask. + */ + for(i=0; inExpr; i++){ + WhereTerm *pTerm; + Expr *p = pDistinct->a[i].pExpr; + if( p->op!=TK_COLUMN ) return 0; + pTerm = findTerm(pWC, p->iTable, p->iColumn, ~(Bitmask)0, WO_EQ, 0); + if( pTerm ){ + Expr *pX = pTerm->pExpr; + CollSeq *p1 = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pX->pRight); + CollSeq *p2 = sqlite3ExprCollSeq(pParse, p); + if( p1==p2 ) continue; + } + if( p->iTable!=base ) return 0; + mask |= (((Bitmask)1) << i); + } + + for(i=nEqCol; mask && inColumn; i++){ + int iExpr = findIndexCol(pParse, pDistinct, base, pIdx, i); + if( iExpr<0 ) break; + mask &= ~(((Bitmask)1) << iExpr); + } + + return (mask==0); +} + + +/* +** Return true if the DISTINCT expression-list passed as the third argument +** is redundant. A DISTINCT list is redundant if the database contains a +** UNIQUE index that guarantees that the result of the query will be distinct +** anyway. +*/ +static int isDistinctRedundant( + Parse *pParse, + SrcList *pTabList, + WhereClause *pWC, + ExprList *pDistinct +){ + Table *pTab; + Index *pIdx; + int i; + int iBase; + + /* If there is more than one table or sub-select in the FROM clause of + ** this query, then it will not be possible to show that the DISTINCT + ** clause is redundant. */ + if( pTabList->nSrc!=1 ) return 0; + iBase = pTabList->a[0].iCursor; + pTab = pTabList->a[0].pTab; + + /* If any of the expressions is an IPK column on table iBase, then return + ** true. Note: The (p->iTable==iBase) part of this test may be false if the + ** current SELECT is a correlated sub-query. + */ + for(i=0; inExpr; i++){ + Expr *p = pDistinct->a[i].pExpr; + if( p->op==TK_COLUMN && p->iTable==iBase && p->iColumn<0 ) return 1; + } + + /* Loop through all indices on the table, checking each to see if it makes + ** the DISTINCT qualifier redundant. It does so if: + ** + ** 1. The index is itself UNIQUE, and + ** + ** 2. All of the columns in the index are either part of the pDistinct + ** list, or else the WHERE clause contains a term of the form "col=X", + ** where X is a constant value. The collation sequences of the + ** comparison and select-list expressions must match those of the index. + */ + for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){ + if( pIdx->onError==OE_None ) continue; + for(i=0; inColumn; i++){ + int iCol = pIdx->aiColumn[i]; + if( 0==findTerm(pWC, iBase, iCol, ~(Bitmask)0, WO_EQ, pIdx) + && 0>findIndexCol(pParse, pDistinct, iBase, pIdx, i) + ){ + break; + } + } + if( i==pIdx->nColumn ){ + /* This index implies that the DISTINCT qualifier is redundant. */ + return 1; + } + } + + return 0; +} /* ** This routine decides if pIdx can be used to satisfy the ORDER BY ** clause. If it can, it returns 1. If pIdx cannot satisfy the ** ORDER BY clause, this routine returns 0. @@ -99759,11 +101937,14 @@ int sortOrder = 0; /* XOR of index and ORDER BY sort direction */ int nTerm; /* Number of ORDER BY terms */ struct ExprList_item *pTerm; /* A term of the ORDER BY clause */ sqlite3 *db = pParse->db; - assert( pOrderBy!=0 ); + if( !pOrderBy ) return 0; + if( wsFlags & WHERE_COLUMN_IN ) return 0; + if( pIdx->bUnordered ) return 0; + nTerm = pOrderBy->nExpr; assert( nTerm>0 ); /* Argument pIdx must either point to a 'real' named index structure, ** or an index structure allocated on the stack by bestBtreeIndex() to @@ -100072,10 +102253,14 @@ double costTempIdx; /* per-query cost of the transient index */ WhereTerm *pTerm; /* A single term of the WHERE clause */ WhereTerm *pWCEnd; /* End of pWC->a[] */ Table *pTable; /* Table tht might be indexed */ + if( pParse->nQueryLoop<=(double)1 ){ + /* There is no point in building an automatic index for a single scan */ + return; + } if( (pParse->db->flags & SQLITE_AutoIndex)==0 ){ /* Automatic indices are disabled at run-time */ return; } if( (pCost->plan.wsFlags & WHERE_NOT_FULLSCAN)!=0 ){ @@ -100083,10 +102268,14 @@ return; } if( pSrc->notIndexed ){ /* The NOT INDEXED clause appears in the SQL. */ return; + } + if( pSrc->isCorrelated ){ + /* The source is a correlated sub-query. No point in indexing it. */ + return; } assert( pParse->nQueryLoop >= (double)1 ); pTable = pSrc->pTab; nTableRow = pTable->nRowEst; @@ -100152,12 +102341,11 @@ /* Generate code to skip over the creation and initialization of the ** transient index on 2nd and subsequent iterations of the loop. */ v = pParse->pVdbe; assert( v!=0 ); regIsInit = ++pParse->nMem; - addrInit = sqlite3VdbeAddOp1(v, OP_If, regIsInit); - sqlite3VdbeAddOp2(v, OP_Integer, 1, regIsInit); + addrInit = sqlite3VdbeAddOp1(v, OP_Once, regIsInit); /* Count the number of columns that will be added to the index ** and used to match WHERE clause constraints */ nColumn = 0; pTable = pSrc->pTab; @@ -100300,10 +102488,11 @@ if( pTerm->leftCursor != pSrc->iCursor ) continue; assert( (pTerm->eOperator&(pTerm->eOperator-1))==0 ); testcase( pTerm->eOperator==WO_IN ); testcase( pTerm->eOperator==WO_ISNULL ); if( pTerm->eOperator & (WO_IN|WO_ISNULL) ) continue; + if( pTerm->wtFlags & TERM_VNULL ) continue; nTerm++; } /* If the ORDER BY clause contains only columns in the current ** virtual table then allocate space for the aOrderBy part of @@ -100350,10 +102539,11 @@ if( pTerm->leftCursor != pSrc->iCursor ) continue; assert( (pTerm->eOperator&(pTerm->eOperator-1))==0 ); testcase( pTerm->eOperator==WO_IN ); testcase( pTerm->eOperator==WO_ISNULL ); if( pTerm->eOperator & (WO_IN|WO_ISNULL) ) continue; + if( pTerm->wtFlags & TERM_VNULL ) continue; pIdxCons[j].iColumn = pTerm->u.leftColumn; pIdxCons[j].iTermOffset = i; pIdxCons[j].op = (u8)pTerm->eOperator; /* The direct assignment in the previous line is possible only because ** the WO_ and SQLITE_INDEX_CONSTRAINT_ codes are identical. The @@ -101015,10 +103205,11 @@ WhereClause *pWC, /* The WHERE clause */ struct SrcList_item *pSrc, /* The FROM clause term to search */ Bitmask notReady, /* Mask of cursors not available for indexing */ Bitmask notValid, /* Cursors not available for any purpose */ ExprList *pOrderBy, /* The ORDER BY clause */ + ExprList *pDistinct, /* The select-list if query is DISTINCT */ WhereCost *pCost /* Lowest cost query plan */ ){ int iCur = pSrc->iCursor; /* The cursor of the table to be accessed */ Index *pProbe; /* An index we are evaluating */ Index *pIdx; /* Copy of pProbe, or zero for IPK index */ @@ -101155,11 +103346,12 @@ int nEq; /* Number of == or IN terms matching index */ int bInEst = 0; /* True if "x IN (SELECT...)" seen */ int nInMul = 1; /* Number of distinct equalities to lookup */ int estBound = 100; /* Estimated reduction in search space */ int nBound = 0; /* Number of range constraints seen */ - int bSort = 0; /* True if external sort required */ + int bSort = !!pOrderBy; /* True if external sort required */ + int bDist = !!pDistinct; /* True if index cannot help with DISTINCT */ int bLookup = 0; /* True if not a covering index */ WhereTerm *pTerm; /* A single term of the WHERE clause */ #ifdef SQLITE_ENABLE_STAT2 WhereTerm *pFirstTerm = 0; /* First term matching the index */ #endif @@ -101219,21 +103411,24 @@ /* If there is an ORDER BY clause and the index being considered will ** naturally scan rows in the required order, set the appropriate flags ** in wsFlags. Otherwise, if there is an ORDER BY clause but the index ** will scan rows in a different order, set the bSort variable. */ - if( pOrderBy ){ - if( (wsFlags & WHERE_COLUMN_IN)==0 - && pProbe->bUnordered==0 - && isSortingIndex(pParse, pWC->pMaskSet, pProbe, iCur, pOrderBy, - nEq, wsFlags, &rev) - ){ - wsFlags |= WHERE_ROWID_RANGE|WHERE_COLUMN_RANGE|WHERE_ORDERBY; - wsFlags |= (rev ? WHERE_REVERSE : 0); - }else{ - bSort = 1; - } + if( isSortingIndex( + pParse, pWC->pMaskSet, pProbe, iCur, pOrderBy, nEq, wsFlags, &rev) + ){ + bSort = 0; + wsFlags |= WHERE_ROWID_RANGE|WHERE_COLUMN_RANGE|WHERE_ORDERBY; + wsFlags |= (rev ? WHERE_REVERSE : 0); + } + + /* If there is a DISTINCT qualifier and this index will scan rows in + ** order of the DISTINCT expressions, clear bDist and set the appropriate + ** flags in wsFlags. */ + if( isDistinctIndex(pParse, pWC, pProbe, iCur, pDistinct, nEq) ){ + bDist = 0; + wsFlags |= WHERE_ROWID_RANGE|WHERE_COLUMN_RANGE|WHERE_DISTINCT; } /* If currently calculating the cost of using an index (not the IPK ** index), determine if all required column data may be obtained without ** using the main table (i.e. if the index is a covering @@ -101264,16 +103459,17 @@ nRow = aiRowEst[0]/2; nInMul = (int)(nRow / aiRowEst[nEq]); } #ifdef SQLITE_ENABLE_STAT2 - /* If the constraint is of the form x=VALUE and histogram + /* If the constraint is of the form x=VALUE or x IN (E1,E2,...) + ** and we do not think that values of x are unique and if histogram ** data is available for column x, then it might be possible ** to get a better estimate on the number of rows based on ** VALUE and how common that value is according to the histogram. */ - if( nRow>(double)1 && nEq==1 && pFirstTerm!=0 ){ + if( nRow>(double)1 && nEq==1 && pFirstTerm!=0 && aiRowEst[1]>1 ){ if( pFirstTerm->eOperator & (WO_EQ|WO_ISNULL) ){ testcase( pFirstTerm->eOperator==WO_EQ ); testcase( pFirstTerm->eOperator==WO_ISNULL ); whereEqualScanEst(pParse, pProbe, pFirstTerm->pExpr->pRight, &nRow); }else if( pFirstTerm->eOperator==WO_IN && bInEst==0 ){ @@ -101346,10 +103542,13 @@ ** difference and select C of 3.0. */ if( bSort ){ cost += nRow*estLog(nRow)*3; } + if( bDist ){ + cost += nRow*estLog(nRow)*3; + } /**** Cost of using this index has now been computed ****/ /* If there are additional constraints on this table that cannot ** be used with the current index, but which might lower the number @@ -101491,11 +103690,11 @@ } sqlite3DbFree(pParse->db, p); }else #endif { - bestBtreeIndex(pParse, pWC, pSrc, notReady, notValid, pOrderBy, pCost); + bestBtreeIndex(pParse, pWC, pSrc, notReady, notValid, pOrderBy, 0, pCost); } } /* ** Disable a term in the WHERE clause. Except, do not disable the term @@ -102453,11 +104652,11 @@ for(ii=0; iinTerm; ii++){ WhereTerm *pOrTerm = &pOrWc->a[ii]; if( pOrTerm->leftCursor==iCur || pOrTerm->eOperator==WO_AND ){ WhereInfo *pSubWInfo; /* Info for single OR-term scan */ /* Loop through table entries that match term pOrTerm. */ - pSubWInfo = sqlite3WhereBegin(pParse, pOrTab, pOrTerm->pExpr, 0, + pSubWInfo = sqlite3WhereBegin(pParse, pOrTab, pOrTerm->pExpr, 0, 0, WHERE_OMIT_OPEN | WHERE_OMIT_CLOSE | WHERE_FORCE_TABLE | WHERE_ONETABLE_ONLY); if( pSubWInfo ){ explainOneScan( pParse, pOrTab, &pSubWInfo->a[0], iLevel, pLevel->iFrom, 0 @@ -102694,10 +104893,11 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( Parse *pParse, /* The parser context */ SrcList *pTabList, /* A list of all tables to be scanned */ Expr *pWhere, /* The WHERE clause */ ExprList **ppOrderBy, /* An ORDER BY clause, or NULL */ + ExprList *pDistinct, /* The select-list for DISTINCT queries - or NULL */ u16 wctrlFlags /* One of the WHERE_* flags defined in sqliteInt.h */ ){ int i; /* Loop counter */ int nByteWInfo; /* Num. bytes allocated for WhereInfo struct */ int nTabList; /* Number of elements in pTabList */ @@ -102753,10 +104953,14 @@ pWInfo->iBreak = sqlite3VdbeMakeLabel(v); pWInfo->pWC = pWC = (WhereClause *)&((u8 *)pWInfo)[nByteWInfo]; pWInfo->wctrlFlags = wctrlFlags; pWInfo->savedNQueryLoop = pParse->nQueryLoop; pMaskSet = (WhereMaskSet*)&pWC[1]; + + /* Disable the DISTINCT optimization if SQLITE_DistinctOpt is set via + ** sqlite3_test_ctrl(SQLITE_TESTCTRL_OPTIMIZATIONS,...) */ + if( db->flags & SQLITE_DistinctOpt ) pDistinct = 0; /* Split the WHERE clause into separate subexpressions where each ** subexpression is separated by an AND operator. */ initMaskSet(pMaskSet); @@ -102820,10 +105024,19 @@ */ exprAnalyzeAll(pTabList, pWC); if( db->mallocFailed ){ goto whereBeginError; } + + /* Check if the DISTINCT qualifier, if there is one, is redundant. + ** If it is, then set pDistinct to NULL and WhereInfo.eDistinct to + ** WHERE_DISTINCT_UNIQUE to tell the caller to ignore the DISTINCT. + */ + if( pDistinct && isDistinctRedundant(pParse, pTabList, pWC, pDistinct) ){ + pDistinct = 0; + pWInfo->eDistinct = WHERE_DISTINCT_UNIQUE; + } /* Chose the best index to use for each table in the FROM clause. ** ** This loop fills in the following fields: ** @@ -102904,10 +105117,11 @@ Bitmask mask; /* Mask of tables not yet ready */ for(j=iFrom, pTabItem=&pTabList->a[j]; jjointype & (JT_LEFT|JT_CROSS))!=0; if( j!=iFrom && doNotReorder ) break; m = getMask(pMaskSet, pTabItem->iCursor); if( (m & notReady)==0 ){ @@ -102914,10 +105128,11 @@ if( j==iFrom ) iFrom++; continue; } mask = (isOptimal ? m : notReady); pOrderBy = ((i==0 && ppOrderBy )?*ppOrderBy:0); + pDist = (i==0 ? pDistinct : 0); if( pTabItem->pIndex==0 ) nUnconstrained++; WHERETRACE(("=== trying table %d with isOptimal=%d ===\n", j, isOptimal)); assert( pTabItem->pTab ); @@ -102928,11 +105143,11 @@ &sCost, pp); }else #endif { bestBtreeIndex(pParse, pWC, pTabItem, mask, notReady, pOrderBy, - &sCost); + pDist, &sCost); } assert( isOptimal || (sCost.used¬Ready)==0 ); /* If an INDEXED BY clause is present, then the plan must use that ** index if it uses any index at all */ @@ -102988,10 +105203,14 @@ WHERETRACE(("*** Optimizer selects table %d for loop %d" " with cost=%g and nRow=%g\n", bestJ, pLevel-pWInfo->a, bestPlan.rCost, bestPlan.plan.nRow)); if( (bestPlan.plan.wsFlags & WHERE_ORDERBY)!=0 ){ *ppOrderBy = 0; + } + if( (bestPlan.plan.wsFlags & WHERE_DISTINCT)!=0 ){ + assert( pWInfo->eDistinct==0 ); + pWInfo->eDistinct = WHERE_DISTINCT_ORDERED; } andFlags &= bestPlan.plan.wsFlags; pLevel->plan = bestPlan.plan; testcase( bestPlan.plan.wsFlags & WHERE_INDEXED ); testcase( bestPlan.plan.wsFlags & WHERE_TEMP_INDEX ); @@ -103323,10 +105542,11 @@ ** LALR(1) grammar but which are always false in the ** specific grammar used by SQLite. */ /* First off, code is included that follows the "include" declaration ** in the input grammar file. */ +/* #include */ /* ** Disable all error recovery processing in the parser push-down ** automaton. @@ -104183,10 +106403,11 @@ #endif }; typedef struct yyParser yyParser; #ifndef NDEBUG +/* #include */ static FILE *yyTraceFILE = 0; static char *yyTracePrompt = 0; #endif /* NDEBUG */ #ifndef NDEBUG @@ -106758,10 +108979,11 @@ ** ** This file contains C code that splits an SQL input string up into ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. */ +/* #include */ /* ** The charMap() macro maps alphabetic characters into their ** lower-case ASCII equivalent. On ASCII machines, this is just ** an upper-to-lower case map. On EBCDIC machines we also need @@ -108149,10 +110371,20 @@ memcpy(&y, &x, 8); assert( sqlite3IsNaN(y) ); } #endif #endif + + /* Do extra initialization steps requested by the SQLITE_EXTRA_INIT + ** compile-time option. + */ +#ifdef SQLITE_EXTRA_INIT + if( rc==SQLITE_OK && sqlite3GlobalConfig.isInit ){ + int SQLITE_EXTRA_INIT(void); + rc = SQLITE_EXTRA_INIT(); + } +#endif return rc; } /* @@ -111518,11 +113750,17 @@ */ #if defined(SQLITE_ENABLE_FTS4) && !defined(SQLITE_ENABLE_FTS3) # define SQLITE_ENABLE_FTS3 #endif -#ifdef SQLITE_ENABLE_FTS3 +#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) + +/* If not building as part of the core, include sqlite3ext.h. */ +#ifndef SQLITE_CORE +SQLITE_API extern const sqlite3_api_routines *sqlite3_api; +#endif + /************** Include fts3_tokenizer.h in the middle of fts3Int.h **********/ /************** Begin file fts3_tokenizer.h **********************************/ /* ** 2006 July 10 ** @@ -112051,11 +114289,11 @@ sqlite3_int64 iDocid; /* Current docid (if pList!=0) */ int bFreeList; /* True if pList should be sqlite3_free()d */ char *pList; /* Pointer to position list following iDocid */ int nList; /* Length of position list */ -} doclist; +}; /* ** A "phrase" is a sequence of one or more tokens that must match in ** sequence. A single token is the base case and the most common case. ** For a sequence of tokens contained in double-quotes (i.e. "one two three") @@ -112251,23 +114489,12 @@ #endif /* fts3_aux.c */ SQLITE_PRIVATE int sqlite3Fts3InitAux(sqlite3 *db); -SQLITE_PRIVATE int sqlite3Fts3TermSegReaderCursor( - Fts3Cursor *pCsr, /* Virtual table cursor handle */ - const char *zTerm, /* Term to query for */ - int nTerm, /* Size of zTerm in bytes */ - int isPrefix, /* True for a prefix search */ - Fts3MultiSegReader **ppSegcsr /* OUT: Allocated seg-reader cursor */ -); - SQLITE_PRIVATE void sqlite3Fts3EvalPhraseCleanup(Fts3Phrase *); -SQLITE_PRIVATE int sqlite3Fts3EvalStart(Fts3Cursor *, Fts3Expr *, int); -SQLITE_PRIVATE int sqlite3Fts3EvalNext(Fts3Cursor *pCsr); - SQLITE_PRIVATE int sqlite3Fts3MsrIncrStart( Fts3Table*, Fts3MultiSegReader*, int, const char*, int); SQLITE_PRIVATE int sqlite3Fts3MsrIncrNext( Fts3Table *, Fts3MultiSegReader *, sqlite3_int64 *, char **, int *); SQLITE_PRIVATE char *sqlite3Fts3EvalPhrasePoslist(Fts3Cursor *, Fts3Expr *, int iCol); @@ -112274,11 +114501,11 @@ SQLITE_PRIVATE int sqlite3Fts3MsrOvfl(Fts3Cursor *, Fts3MultiSegReader *, int *); SQLITE_PRIVATE int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr); SQLITE_PRIVATE int sqlite3Fts3DeferredTokenList(Fts3DeferredToken *, char **, int *); -#endif /* SQLITE_ENABLE_FTS3 */ +#endif /* !SQLITE_CORE || SQLITE_ENABLE_FTS3 */ #endif /* _FTSINT_H */ /************** End of fts3Int.h *********************************************/ /************** Continuing where we left off in fts3.c ***********************/ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) @@ -112285,15 +114512,26 @@ #if defined(SQLITE_ENABLE_FTS3) && !defined(SQLITE_CORE) # define SQLITE_CORE 1 #endif +/* #include */ +/* #include */ +/* #include */ +/* #include */ +/* #include */ +/* #include */ #ifndef SQLITE_CORE SQLITE_EXTENSION_INIT1 #endif +static int fts3EvalNext(Fts3Cursor *pCsr); +static int fts3EvalStart(Fts3Cursor *pCsr); +static int fts3TermSegReaderCursor( + Fts3Cursor *, const char *, int, int, Fts3MultiSegReader **); + /* ** Write a 64-bit variable-length integer to memory starting at p[0]. ** The length of data written will be between 1 and FTS3_VARINT_MAX bytes. ** The number of bytes written is returned. */ @@ -112798,31 +115036,60 @@ } sqlite3_free(zFree); return zRet; } +/* +** This function interprets the string at (*pp) as a non-negative integer +** value. It reads the integer and sets *pnOut to the value read, then +** sets *pp to point to the byte immediately following the last byte of +** the integer value. +** +** Only decimal digits ('0'..'9') may be part of an integer value. +** +** If *pp does not being with a decimal digit SQLITE_ERROR is returned and +** the output value undefined. Otherwise SQLITE_OK is returned. +** +** This function is used when parsing the "prefix=" FTS4 parameter. +*/ static int fts3GobbleInt(const char **pp, int *pnOut){ - const char *p = *pp; - int nInt = 0; + const char *p = *pp; /* Iterator pointer */ + int nInt = 0; /* Output value */ + for(p=*pp; p[0]>='0' && p[0]<='9'; p++){ nInt = nInt * 10 + (p[0] - '0'); } if( p==*pp ) return SQLITE_ERROR; *pnOut = nInt; *pp = p; return SQLITE_OK; } - +/* +** This function is called to allocate an array of Fts3Index structures +** representing the indexes maintained by the current FTS table. FTS tables +** always maintain the main "terms" index, but may also maintain one or +** more "prefix" indexes, depending on the value of the "prefix=" parameter +** (if any) specified as part of the CREATE VIRTUAL TABLE statement. +** +** Argument zParam is passed the value of the "prefix=" option if one was +** specified, or NULL otherwise. +** +** If no error occurs, SQLITE_OK is returned and *apIndex set to point to +** the allocated array. *pnIndex is set to the number of elements in the +** array. If an error does occur, an SQLite error code is returned. +** +** Regardless of whether or not an error is returned, it is the responsibility +** of the caller to call sqlite3_free() on the output array to free it. +*/ static int fts3PrefixParameter( const char *zParam, /* ABC in prefix=ABC parameter to parse */ int *pnIndex, /* OUT: size of *apIndex[] array */ - struct Fts3Index **apIndex, /* OUT: Array of indexes for this table */ - struct Fts3Index **apFree /* OUT: Free this with sqlite3_free() */ + struct Fts3Index **apIndex /* OUT: Array of indexes for this table */ ){ - struct Fts3Index *aIndex; - int nIndex = 1; + struct Fts3Index *aIndex; /* Allocated array */ + int nIndex = 1; /* Number of entries in array */ if( zParam && zParam[0] ){ const char *p; nIndex++; for(p=zParam; *p; p++){ @@ -112829,11 +115096,11 @@ if( *p==',' ) nIndex++; } } aIndex = sqlite3_malloc(sizeof(struct Fts3Index) * nIndex); - *apIndex = *apFree = aIndex; + *apIndex = aIndex; *pnIndex = nIndex; if( !aIndex ){ return SQLITE_NOMEM; } @@ -112886,12 +115153,11 @@ int isFts4 = (argv[0][3]=='4'); /* True for FTS4, false for FTS3 */ const char **aCol; /* Array of column names */ sqlite3_tokenizer *pTokenizer = 0; /* Tokenizer for this table */ int nIndex; /* Size of aIndex[] array */ - struct Fts3Index *aIndex; /* Array of indexes for this table */ - struct Fts3Index *aFree = 0; /* Free this before returning */ + struct Fts3Index *aIndex = 0; /* Array of indexes for this table */ /* The results of parsing supported FTS4 key=value options: */ int bNoDocsize = 0; /* True to omit %_docsize table */ int bDescIdx = 0; /* True to store descending indexes */ char *zPrefix = 0; /* Prefix parameter value (or NULL) */ @@ -113024,11 +115290,11 @@ rc = sqlite3Fts3InitTokenizer(pHash, "simple", &pTokenizer, pzErr); if( rc!=SQLITE_OK ) goto fts3_init_out; } assert( pTokenizer ); - rc = fts3PrefixParameter(zPrefix, &nIndex, &aIndex, &aFree); + rc = fts3PrefixParameter(zPrefix, &nIndex, &aIndex); if( rc==SQLITE_ERROR ){ assert( zPrefix ); *pzErr = sqlite3_mprintf("error parsing prefix parameter: %s", zPrefix); } if( rc!=SQLITE_OK ) goto fts3_init_out; @@ -113111,11 +115377,11 @@ /* Declare the table schema to SQLite. */ fts3DeclareVtab(&rc, p); fts3_init_out: sqlite3_free(zPrefix); - sqlite3_free(aFree); + sqlite3_free(aIndex); sqlite3_free(zCompress); sqlite3_free(zUncompress); sqlite3_free((void *)aCol); if( rc!=SQLITE_OK ){ if( p ){ @@ -113702,12 +115968,10 @@ *pp1 = p1 + 1; *pp2 = p2 + 1; } /* -** nToken==1 searches for adjacent positions. -** ** This function is used to merge two position lists into one. When it is ** called, *pp1 and *pp2 must both point to position lists. A position-list is ** the part of a doclist that follows each document id. For example, if a row ** contains: ** @@ -113723,10 +115987,12 @@ ** If isSaveLeft is 0, an entry is added to the output position list for ** each position in *pp2 for which there exists one or more positions in ** *pp1 so that (pos(*pp2)>pos(*pp1) && pos(*pp2)-pos(*pp1)<=nToken). i.e. ** when the *pp1 token appears before the *pp2 token, but not more than nToken ** slots before it. +** +** e.g. nToken==1 searches for adjacent positions. */ static int fts3PoslistPhraseMerge( char **pp, /* IN/OUT: Preallocated output buffer */ int nToken, /* Maximum difference in token positions */ int isSaveLeft, /* Save the left position */ @@ -113889,26 +116155,38 @@ return res; } /* -** A pointer to an instance of this structure is used as the context -** argument to sqlite3Fts3SegReaderIterate() +** An instance of this function is used to merge together the (potentially +** large number of) doclists for each term that matches a prefix query. +** See function fts3TermSelectMerge() for details. */ typedef struct TermSelect TermSelect; struct TermSelect { - int isReqPos; - char *aaOutput[16]; /* Malloc'd output buffer */ - int anOutput[16]; /* Size of output in bytes */ + char *aaOutput[16]; /* Malloc'd output buffers */ + int anOutput[16]; /* Size each output buffer in bytes */ }; - +/* +** This function is used to read a single varint from a buffer. Parameter +** pEnd points 1 byte past the end of the buffer. When this function is +** called, if *pp points to pEnd or greater, then the end of the buffer +** has been reached. In this case *pp is set to 0 and the function returns. +** +** If *pp does not point to or past pEnd, then a single varint is read +** from *pp. *pp is then set to point 1 byte past the end of the read varint. +** +** If bDescIdx is false, the value read is added to *pVal before returning. +** If it is true, the value read is subtracted from *pVal before this +** function returns. +*/ static void fts3GetDeltaVarint3( - char **pp, - char *pEnd, - int bDescIdx, - sqlite3_int64 *pVal + char **pp, /* IN/OUT: Point to read varint from */ + char *pEnd, /* End of buffer */ + int bDescIdx, /* True if docids are descending */ + sqlite3_int64 *pVal /* IN/OUT: Integer value */ ){ if( *pp>=pEnd ){ *pp = 0; }else{ sqlite3_int64 iVal; @@ -113919,10 +116197,25 @@ *pVal += iVal; } } } +/* +** This function is used to write a single varint to a buffer. The varint +** is written to *pp. Before returning, *pp is set to point 1 byte past the +** end of the value written. +** +** If *pbFirst is zero when this function is called, the value written to +** the buffer is that of parameter iVal. +** +** If *pbFirst is non-zero when this function is called, then the value +** written is either (iVal-*piPrev) (if bDescIdx is zero) or (*piPrev-iVal) +** (if bDescIdx is non-zero). +** +** Before returning, this function always sets *pbFirst to 1 and *piPrev +** to the value of parameter iVal. +*/ static void fts3PutDeltaVarint3( char **pp, /* IN/OUT: Output pointer */ int bDescIdx, /* True for descending docids */ sqlite3_int64 *piPrev, /* IN/OUT: Previous value written to list */ int *pbFirst, /* IN/OUT: True after first int written */ @@ -113939,14 +116232,38 @@ *pp += sqlite3Fts3PutVarint(*pp, iWrite); *piPrev = iVal; *pbFirst = 1; } -#define COMPARE_DOCID(i1, i2) ((bDescIdx?-1:1) * (i1-i2)) +/* +** This macro is used by various functions that merge doclists. The two +** arguments are 64-bit docid values. If the value of the stack variable +** bDescDoclist is 0 when this macro is invoked, then it returns (i1-i2). +** Otherwise, (i2-i1). +** +** Using this makes it easier to write code that can merge doclists that are +** sorted in either ascending or descending order. +*/ +#define DOCID_CMP(i1, i2) ((bDescDoclist?-1:1) * (i1-i2)) + +/* +** This function does an "OR" merge of two doclists (output contains all +** positions contained in either argument doclist). If the docids in the +** input doclists are sorted in ascending order, parameter bDescDoclist +** should be false. If they are sorted in ascending order, it should be +** passed a non-zero value. +** +** If no error occurs, *paOut is set to point at an sqlite3_malloc'd buffer +** containing the output doclist and SQLITE_OK is returned. In this case +** *pnOut is set to the number of bytes in the output doclist. +** +** If an error occurs, an SQLite error code is returned. The output values +** are undefined in this case. +*/ static int fts3DoclistOrMerge( - int bDescIdx, /* True if arguments are desc */ + int bDescDoclist, /* True if arguments are desc */ char *a1, int n1, /* First doclist */ char *a2, int n2, /* Second doclist */ char **paOut, int *pnOut /* OUT: Malloc'd doclist */ ){ sqlite3_int64 i1 = 0; @@ -113960,42 +116277,85 @@ char *aOut; int bFirstOut = 0; *paOut = 0; *pnOut = 0; - aOut = sqlite3_malloc(n1+n2); + + /* Allocate space for the output. Both the input and output doclists + ** are delta encoded. If they are in ascending order (bDescDoclist==0), + ** then the first docid in each list is simply encoded as a varint. For + ** each subsequent docid, the varint stored is the difference between the + ** current and previous docid (a positive number - since the list is in + ** ascending order). + ** + ** The first docid written to the output is therefore encoded using the + ** same number of bytes as it is in whichever of the input lists it is + ** read from. And each subsequent docid read from the same input list + ** consumes either the same or less bytes as it did in the input (since + ** the difference between it and the previous value in the output must + ** be a positive value less than or equal to the delta value read from + ** the input list). The same argument applies to all but the first docid + ** read from the 'other' list. And to the contents of all position lists + ** that will be copied and merged from the input to the output. + ** + ** However, if the first docid copied to the output is a negative number, + ** then the encoding of the first docid from the 'other' input list may + ** be larger in the output than it was in the input (since the delta value + ** may be a larger positive integer than the actual docid). + ** + ** The space required to store the output is therefore the sum of the + ** sizes of the two inputs, plus enough space for exactly one of the input + ** docids to grow. + ** + ** A symetric argument may be made if the doclists are in descending + ** order. + */ + aOut = sqlite3_malloc(n1+n2+FTS3_VARINT_MAX-1); if( !aOut ) return SQLITE_NOMEM; p = aOut; fts3GetDeltaVarint3(&p1, pEnd1, 0, &i1); fts3GetDeltaVarint3(&p2, pEnd2, 0, &i2); while( p1 || p2 ){ - sqlite3_int64 iDiff = COMPARE_DOCID(i1, i2); + sqlite3_int64 iDiff = DOCID_CMP(i1, i2); if( p2 && p1 && iDiff==0 ){ - fts3PutDeltaVarint3(&p, bDescIdx, &iPrev, &bFirstOut, i1); + fts3PutDeltaVarint3(&p, bDescDoclist, &iPrev, &bFirstOut, i1); fts3PoslistMerge(&p, &p1, &p2); - fts3GetDeltaVarint3(&p1, pEnd1, bDescIdx, &i1); - fts3GetDeltaVarint3(&p2, pEnd2, bDescIdx, &i2); + fts3GetDeltaVarint3(&p1, pEnd1, bDescDoclist, &i1); + fts3GetDeltaVarint3(&p2, pEnd2, bDescDoclist, &i2); }else if( !p2 || (p1 && iDiff<0) ){ - fts3PutDeltaVarint3(&p, bDescIdx, &iPrev, &bFirstOut, i1); + fts3PutDeltaVarint3(&p, bDescDoclist, &iPrev, &bFirstOut, i1); fts3PoslistCopy(&p, &p1); - fts3GetDeltaVarint3(&p1, pEnd1, bDescIdx, &i1); + fts3GetDeltaVarint3(&p1, pEnd1, bDescDoclist, &i1); }else{ - fts3PutDeltaVarint3(&p, bDescIdx, &iPrev, &bFirstOut, i2); + fts3PutDeltaVarint3(&p, bDescDoclist, &iPrev, &bFirstOut, i2); fts3PoslistCopy(&p, &p2); - fts3GetDeltaVarint3(&p2, pEnd2, bDescIdx, &i2); + fts3GetDeltaVarint3(&p2, pEnd2, bDescDoclist, &i2); } } *paOut = aOut; *pnOut = (p-aOut); + assert( *pnOut<=n1+n2+FTS3_VARINT_MAX-1 ); return SQLITE_OK; } +/* +** This function does a "phrase" merge of two doclists. In a phrase merge, +** the output contains a copy of each position from the right-hand input +** doclist for which there is a position in the left-hand input doclist +** exactly nDist tokens before it. +** +** If the docids in the input doclists are sorted in ascending order, +** parameter bDescDoclist should be false. If they are sorted in ascending +** order, it should be passed a non-zero value. +** +** The right-hand input doclist is overwritten by this function. +*/ static void fts3DoclistPhraseMerge( - int bDescIdx, /* True if arguments are desc */ + int bDescDoclist, /* True if arguments are desc */ int nDist, /* Distance from left to right (1=adjacent) */ char *aLeft, int nLeft, /* Left doclist */ char *aRight, int *pnRight /* IN/OUT: Right/output doclist */ ){ sqlite3_int64 i1 = 0; @@ -114014,30 +116374,30 @@ p = aOut; fts3GetDeltaVarint3(&p1, pEnd1, 0, &i1); fts3GetDeltaVarint3(&p2, pEnd2, 0, &i2); while( p1 && p2 ){ - sqlite3_int64 iDiff = COMPARE_DOCID(i1, i2); + sqlite3_int64 iDiff = DOCID_CMP(i1, i2); if( iDiff==0 ){ char *pSave = p; sqlite3_int64 iPrevSave = iPrev; int bFirstOutSave = bFirstOut; - fts3PutDeltaVarint3(&p, bDescIdx, &iPrev, &bFirstOut, i1); + fts3PutDeltaVarint3(&p, bDescDoclist, &iPrev, &bFirstOut, i1); if( 0==fts3PoslistPhraseMerge(&p, nDist, 0, 1, &p1, &p2) ){ p = pSave; iPrev = iPrevSave; bFirstOut = bFirstOutSave; } - fts3GetDeltaVarint3(&p1, pEnd1, bDescIdx, &i1); - fts3GetDeltaVarint3(&p2, pEnd2, bDescIdx, &i2); + fts3GetDeltaVarint3(&p1, pEnd1, bDescDoclist, &i1); + fts3GetDeltaVarint3(&p2, pEnd2, bDescDoclist, &i2); }else if( iDiff<0 ){ fts3PoslistCopy(0, &p1); - fts3GetDeltaVarint3(&p1, pEnd1, bDescIdx, &i1); + fts3GetDeltaVarint3(&p1, pEnd1, bDescDoclist, &i1); }else{ fts3PoslistCopy(0, &p2); - fts3GetDeltaVarint3(&p2, pEnd2, bDescIdx, &i2); + fts3GetDeltaVarint3(&p2, pEnd2, bDescDoclist, &i2); } } *pnRight = p - aOut; } @@ -114050,11 +116410,11 @@ ** ** If an OOM error occurs, return SQLITE_NOMEM. In this case it is ** the responsibility of the caller to free any doclists left in the ** TermSelect.aaOutput[] array. */ -static int fts3TermSelectMerge(Fts3Table *p, TermSelect *pTS){ +static int fts3TermSelectFinishMerge(Fts3Table *p, TermSelect *pTS){ char *aOut = 0; int nOut = 0; int i; /* Loop through the doclists in the aaOutput[] array. Merge them all @@ -114091,28 +116451,29 @@ pTS->anOutput[0] = nOut; return SQLITE_OK; } /* -** This function is used as the sqlite3Fts3SegReaderIterate() callback when -** querying the full-text index for a doclist associated with a term or -** term-prefix. +** Merge the doclist aDoclist/nDoclist into the TermSelect object passed +** as the first argument. The merge is an "OR" merge (see function +** fts3DoclistOrMerge() for details). +** +** This function is called with the doclist for each term that matches +** a queried prefix. It merges all these doclists into one, the doclist +** for the specified prefix. Since there can be a very large number of +** doclists to merge, the merging is done pair-wise using the TermSelect +** object. +** +** This function returns SQLITE_OK if the merge is successful, or an +** SQLite error code (SQLITE_NOMEM) if an error occurs. */ -static int fts3TermSelectCb( - Fts3Table *p, /* Virtual table object */ - void *pContext, /* Pointer to TermSelect structure */ - char *zTerm, - int nTerm, - char *aDoclist, - int nDoclist +static int fts3TermSelectMerge( + Fts3Table *p, /* FTS table handle */ + TermSelect *pTS, /* TermSelect object to merge into */ + char *aDoclist, /* Pointer to doclist */ + int nDoclist /* Size of aDoclist in bytes */ ){ - TermSelect *pTS = (TermSelect *)pContext; - - UNUSED_PARAMETER(p); - UNUSED_PARAMETER(zTerm); - UNUSED_PARAMETER(nTerm); - if( pTS->aaOutput[0]==0 ){ /* If this is the first term selected, copy the doclist to the output ** buffer using memcpy(). */ pTS->aaOutput[0] = sqlite3_malloc(nDoclist); pTS->anOutput[0] = nDoclist; @@ -114179,23 +116540,30 @@ } pCsr->apSegment[pCsr->nSegment++] = pNew; return SQLITE_OK; } +/* +** Add seg-reader objects to the Fts3MultiSegReader object passed as the +** 8th argument. +** +** This function returns SQLITE_OK if successful, or an SQLite error code +** otherwise. +*/ static int fts3SegReaderCursor( Fts3Table *p, /* FTS3 table handle */ int iIndex, /* Index to search (from 0 to p->nIndex-1) */ int iLevel, /* Level of segments to scan */ const char *zTerm, /* Term to query for */ int nTerm, /* Size of zTerm in bytes */ int isPrefix, /* True for a prefix search */ int isScan, /* True to scan from zTerm to EOF */ - Fts3MultiSegReader *pCsr /* Cursor object to populate */ + Fts3MultiSegReader *pCsr /* Cursor object to populate */ ){ - int rc = SQLITE_OK; - int rc2; - sqlite3_stmt *pStmt = 0; + int rc = SQLITE_OK; /* Error code */ + sqlite3_stmt *pStmt = 0; /* Statement to iterate through segments */ + int rc2; /* Result of sqlite3_reset() */ /* If iLevel is less than 0 and this is not a scan, include a seg-reader ** for the pending-terms. If this is a scan, then this call must be being ** made by an fts4aux module, not an FTS table. In this case calling ** Fts3SegReaderPending might segfault, as the data structures used by @@ -114280,28 +116648,46 @@ return fts3SegReaderCursor( p, iIndex, iLevel, zTerm, nTerm, isPrefix, isScan, pCsr ); } +/* +** In addition to its current configuration, have the Fts3MultiSegReader +** passed as the 4th argument also scan the doclist for term zTerm/nTerm. +** +** SQLITE_OK is returned if no error occurs, otherwise an SQLite error code. +*/ static int fts3SegReaderCursorAddZero( - Fts3Table *p, - const char *zTerm, - int nTerm, - Fts3MultiSegReader *pCsr + Fts3Table *p, /* FTS virtual table handle */ + const char *zTerm, /* Term to scan doclist of */ + int nTerm, /* Number of bytes in zTerm */ + Fts3MultiSegReader *pCsr /* Fts3MultiSegReader to modify */ ){ return fts3SegReaderCursor(p, 0, FTS3_SEGCURSOR_ALL, zTerm, nTerm, 0, 0,pCsr); } - -SQLITE_PRIVATE int sqlite3Fts3TermSegReaderCursor( +/* +** Open an Fts3MultiSegReader to scan the doclist for term zTerm/nTerm. Or, +** if isPrefix is true, to scan the doclist for all terms for which +** zTerm/nTerm is a prefix. If successful, return SQLITE_OK and write +** a pointer to the new Fts3MultiSegReader to *ppSegcsr. Otherwise, return +** an SQLite error code. +** +** It is the responsibility of the caller to free this object by eventually +** passing it to fts3SegReaderCursorFree() +** +** SQLITE_OK is returned if no error occurs, otherwise an SQLite error code. +** Output parameter *ppSegcsr is set to 0 if an error occurs. +*/ +static int fts3TermSegReaderCursor( Fts3Cursor *pCsr, /* Virtual table cursor handle */ const char *zTerm, /* Term to query for */ int nTerm, /* Size of zTerm in bytes */ int isPrefix, /* True for a prefix search */ Fts3MultiSegReader **ppSegcsr /* OUT: Allocated seg-reader cursor */ ){ - Fts3MultiSegReader *pSegcsr; /* Object to allocate and return */ + Fts3MultiSegReader *pSegcsr; /* Object to allocate and return */ int rc = SQLITE_NOMEM; /* Return code */ pSegcsr = sqlite3_malloc(sizeof(Fts3MultiSegReader)); if( pSegcsr ){ int i; @@ -114341,62 +116727,53 @@ *ppSegcsr = pSegcsr; return rc; } +/* +** Free an Fts3MultiSegReader allocated by fts3TermSegReaderCursor(). +*/ static void fts3SegReaderCursorFree(Fts3MultiSegReader *pSegcsr){ sqlite3Fts3SegReaderFinish(pSegcsr); sqlite3_free(pSegcsr); } /* ** This function retreives the doclist for the specified term (or term -** prefix) from the database. -** -** The returned doclist may be in one of two formats, depending on the -** value of parameter isReqPos. If isReqPos is zero, then the doclist is -** a sorted list of delta-compressed docids (a bare doclist). If isReqPos -** is non-zero, then the returned list is in the same format as is stored -** in the database without the found length specifier at the start of on-disk -** doclists. +** prefix) from the database. */ static int fts3TermSelect( Fts3Table *p, /* Virtual table handle */ Fts3PhraseToken *pTok, /* Token to query for */ int iColumn, /* Column to query (or -ve for all columns) */ - int isReqPos, /* True to include position lists in output */ int *pnOut, /* OUT: Size of buffer at *ppOut */ char **ppOut /* OUT: Malloced result buffer */ ){ int rc; /* Return code */ - Fts3MultiSegReader *pSegcsr; /* Seg-reader cursor for this term */ - TermSelect tsc; /* Context object for fts3TermSelectCb() */ + Fts3MultiSegReader *pSegcsr; /* Seg-reader cursor for this term */ + TermSelect tsc; /* Object for pair-wise doclist merging */ Fts3SegFilter filter; /* Segment term filter configuration */ pSegcsr = pTok->pSegcsr; memset(&tsc, 0, sizeof(TermSelect)); - tsc.isReqPos = isReqPos; - filter.flags = FTS3_SEGMENT_IGNORE_EMPTY + filter.flags = FTS3_SEGMENT_IGNORE_EMPTY | FTS3_SEGMENT_REQUIRE_POS | (pTok->isPrefix ? FTS3_SEGMENT_PREFIX : 0) - | (isReqPos ? FTS3_SEGMENT_REQUIRE_POS : 0) | (iColumnnColumn ? FTS3_SEGMENT_COLUMN_FILTER : 0); filter.iCol = iColumn; filter.zTerm = pTok->z; filter.nTerm = pTok->n; rc = sqlite3Fts3SegReaderStart(p, pSegcsr, &filter); while( SQLITE_OK==rc && SQLITE_ROW==(rc = sqlite3Fts3SegReaderStep(p, pSegcsr)) ){ - rc = fts3TermSelectCb(p, (void *)&tsc, - pSegcsr->zTerm, pSegcsr->nTerm, pSegcsr->aDoclist, pSegcsr->nDoclist - ); + rc = fts3TermSelectMerge(p, &tsc, pSegcsr->aDoclist, pSegcsr->nDoclist); } if( rc==SQLITE_OK ){ - rc = fts3TermSelectMerge(p, &tsc); + rc = fts3TermSelectFinishMerge(p, &tsc); } if( rc==SQLITE_OK ){ *ppOut = tsc.aaOutput[0]; *pnOut = tsc.anOutput[0]; }else{ @@ -114418,28 +116795,19 @@ ** If the isPoslist argument is true, then it is assumed that the doclist ** contains a position-list following each docid. Otherwise, it is assumed ** that the doclist is simply a list of docids stored as delta encoded ** varints. */ -static int fts3DoclistCountDocids(int isPoslist, char *aList, int nList){ +static int fts3DoclistCountDocids(char *aList, int nList){ int nDoc = 0; /* Return value */ if( aList ){ char *aEnd = &aList[nList]; /* Pointer to one byte after EOF */ char *p = aList; /* Cursor */ - if( !isPoslist ){ - /* The number of docids in the list is the same as the number of - ** varints. In FTS3 a varint consists of a single byte with the 0x80 - ** bit cleared and zero or more bytes with the 0x80 bit set. So to - ** count the varints in the buffer, just count the number of bytes - ** with the 0x80 bit clear. */ - while( piPrevId = sqlite3_column_int64(pCsr->pStmt, 0); rc = SQLITE_OK; } }else{ - rc = sqlite3Fts3EvalNext((Fts3Cursor *)pCursor); + rc = fts3EvalNext((Fts3Cursor *)pCursor); } assert( ((Fts3Table *)pCsr->base.pVtab)->pSegments==0 ); return rc; } @@ -114542,11 +116910,11 @@ } rc = sqlite3Fts3ReadLock(p); if( rc!=SQLITE_OK ) return rc; - rc = sqlite3Fts3EvalStart(pCsr, pCsr->pExpr, 1); + rc = fts3EvalStart(pCsr); sqlite3Fts3SegmentsClose(p); if( rc!=SQLITE_OK ) return rc; pCsr->pNextId = pCsr->aDoclist; pCsr->iPrevId = 0; @@ -114949,26 +117317,43 @@ p->zDb, p->zName, zName ); return rc; } +/* +** The xSavepoint() method. +** +** Flush the contents of the pending-terms table to disk. +*/ static int fts3SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){ UNUSED_PARAMETER(iSavepoint); assert( ((Fts3Table *)pVtab)->inTransaction ); assert( ((Fts3Table *)pVtab)->mxSavepoint < iSavepoint ); TESTONLY( ((Fts3Table *)pVtab)->mxSavepoint = iSavepoint ); return fts3SyncMethod(pVtab); } + +/* +** The xRelease() method. +** +** This is a no-op. +*/ static int fts3ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){ TESTONLY( Fts3Table *p = (Fts3Table*)pVtab ); UNUSED_PARAMETER(iSavepoint); UNUSED_PARAMETER(pVtab); assert( p->inTransaction ); assert( p->mxSavepoint >= iSavepoint ); TESTONLY( p->mxSavepoint = iSavepoint-1 ); return SQLITE_OK; } + +/* +** The xRollbackTo() method. +** +** Discard the contents of the pending terms table. +*/ static int fts3RollbackToMethod(sqlite3_vtab *pVtab, int iSavepoint){ Fts3Table *p = (Fts3Table*)pVtab; UNUSED_PARAMETER(iSavepoint); assert( p->inTransaction ); assert( p->mxSavepoint >= iSavepoint ); @@ -115113,22 +117498,10 @@ sqlite3Fts3HashClear(pHash); sqlite3_free(pHash); } return rc; } - -#if !SQLITE_CORE -SQLITE_API int sqlite3_extension_init( - sqlite3 *db, - char **pzErrMsg, - const sqlite3_api_routines *pApi -){ - SQLITE_EXTENSION_INIT2(pApi) - return sqlite3Fts3Init(db); -} -#endif - /* ** Allocate an Fts3MultiSegReader for each token in the expression headed ** by pExpr. ** @@ -115142,24 +117515,24 @@ ** there exists prefix b-tree of the right length) then it may be traversed ** and merged incrementally. Otherwise, it has to be merged into an in-memory ** doclist and then traversed. */ static void fts3EvalAllocateReaders( - Fts3Cursor *pCsr, - Fts3Expr *pExpr, + Fts3Cursor *pCsr, /* FTS cursor handle */ + Fts3Expr *pExpr, /* Allocate readers for this expression */ int *pnToken, /* OUT: Total number of tokens in phrase. */ int *pnOr, /* OUT: Total number of OR nodes in expr. */ - int *pRc + int *pRc /* IN/OUT: Error code */ ){ if( pExpr && SQLITE_OK==*pRc ){ if( pExpr->eType==FTSQUERY_PHRASE ){ int i; int nToken = pExpr->pPhrase->nToken; *pnToken += nToken; for(i=0; ipPhrase->aToken[i]; - int rc = sqlite3Fts3TermSegReaderCursor(pCsr, + int rc = fts3TermSegReaderCursor(pCsr, pToken->z, pToken->n, pToken->isPrefix, &pToken->pSegcsr ); if( rc!=SQLITE_OK ){ *pRc = rc; return; @@ -115173,16 +117546,24 @@ fts3EvalAllocateReaders(pCsr, pExpr->pRight, pnToken, pnOr, pRc); } } } +/* +** Arguments pList/nList contain the doclist for token iToken of phrase p. +** It is merged into the main doclist stored in p->doclist.aAll/nAll. +** +** This function assumes that pList points to a buffer allocated using +** sqlite3_malloc(). This function takes responsibility for eventually +** freeing the buffer. +*/ static void fts3EvalPhraseMergeToken( - Fts3Table *pTab, - Fts3Phrase *p, - int iToken, - char *pList, - int nList + Fts3Table *pTab, /* FTS Table pointer */ + Fts3Phrase *p, /* Phrase to merge pList/nList into */ + int iToken, /* Token pList/nList corresponds to */ + char *pList, /* Pointer to doclist */ + int nList /* Number of bytes in pList */ ){ assert( iToken!=p->iDoclistToken ); if( pList==0 ){ sqlite3_free(p->doclist.aAll); @@ -115227,13 +117608,19 @@ } if( iToken>p->iDoclistToken ) p->iDoclistToken = iToken; } +/* +** Load the doclist for phrase p into p->doclist.aAll/nAll. The loaded doclist +** does not take deferred tokens into account. +** +** SQLITE_OK is returned if no error occurs, otherwise an SQLite error code. +*/ static int fts3EvalPhraseLoad( - Fts3Cursor *pCsr, - Fts3Phrase *p + Fts3Cursor *pCsr, /* FTS Cursor handle */ + Fts3Phrase *p /* Phrase object */ ){ Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab; int iToken; int rc = SQLITE_OK; @@ -115242,11 +117629,11 @@ assert( pToken->pDeferred==0 || pToken->pSegcsr==0 ); if( pToken->pSegcsr ){ int nThis = 0; char *pThis = 0; - rc = fts3TermSelect(pTab, pToken, p->iColumn, 1, &nThis, &pThis); + rc = fts3TermSelect(pTab, pToken, p->iColumn, &nThis, &pThis); if( rc==SQLITE_OK ){ fts3EvalPhraseMergeToken(pTab, p, iToken, pThis, nThis); } } assert( pToken->pSegcsr==0 ); @@ -115253,18 +117640,26 @@ } return rc; } +/* +** This function is called on each phrase after the position lists for +** any deferred tokens have been loaded into memory. It updates the phrases +** current position list to include only those positions that are really +** instances of the phrase (after considering deferred tokens). If this +** means that the phrase does not appear in the current row, doclist.pList +** and doclist.nList are both zeroed. +** +** SQLITE_OK is returned if no error occurs, otherwise an SQLite error code. +*/ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){ - int iToken; - int rc = SQLITE_OK; - - int nMaxUndeferred = pPhrase->iDoclistToken; - char *aPoslist = 0; - int nPoslist = 0; - int iPrev = -1; + int iToken; /* Used to iterate through phrase tokens */ + int rc = SQLITE_OK; /* Return code */ + char *aPoslist = 0; /* Position list for deferred tokens */ + int nPoslist = 0; /* Number of bytes in aPoslist */ + int iPrev = -1; /* Token number of previous deferred token */ assert( pPhrase->doclist.bFreeList==0 ); for(iToken=0; rc==SQLITE_OK && iTokennToken; iToken++){ Fts3PhraseToken *pToken = &pPhrase->aToken[iToken]; @@ -115306,10 +117701,11 @@ iPrev = iToken; } } if( iPrev>=0 ){ + int nMaxUndeferred = pPhrase->iDoclistToken; if( nMaxUndeferred<0 ){ pPhrase->doclist.pList = aPoslist; pPhrase->doclist.nList = nPoslist; pPhrase->doclist.iDocid = pCsr->iPrevId; pPhrase->doclist.bFreeList = 1; @@ -115354,13 +117750,19 @@ /* ** This function is called for each Fts3Phrase in a full-text query ** expression to initialize the mechanism for returning rows. Once this ** function has been called successfully on an Fts3Phrase, it may be ** used with fts3EvalPhraseNext() to iterate through the matching docids. +** +** If parameter bOptOk is true, then the phrase may (or may not) use the +** incremental loading strategy. Otherwise, the entire doclist is loaded into +** memory within this call. +** +** SQLITE_OK is returned if no error occurs, otherwise an SQLite error code. */ static int fts3EvalPhraseStart(Fts3Cursor *pCsr, int bOptOk, Fts3Phrase *p){ - int rc; + int rc; /* Error code */ Fts3PhraseToken *pFirst = &p->aToken[0]; Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab; if( pCsr->bDesc==pTab->bDescIdx && bOptOk==1 @@ -115384,11 +117786,17 @@ return rc; } /* ** This function is used to iterate backwards (from the end to start) -** through doclists. +** through doclists. It is used by this module to iterate through phrase +** doclists in reverse and by the fts3_write.c module to iterate through +** pending-terms lists when writing to databases with "order=desc". +** +** The doclist may be sorted in ascending (parameter bDescIdx==0) or +** descending (parameter bDescIdx==1) order of docid. Regardless, this +** function iterates from the end of the doclist to the beginning. */ SQLITE_PRIVATE void sqlite3Fts3DoclistPrev( int bDescIdx, /* True if the doclist is desc */ char *aDoclist, /* Pointer to entire doclist */ int nDoclist, /* Length of aDoclist in bytes */ @@ -115449,13 +117857,13 @@ ** If there is no "next" entry and no error occurs, then *pbEof is set to ** 1 before returning. Otherwise, if no error occurs and the iterator is ** successfully advanced, *pbEof is set to 0. */ static int fts3EvalPhraseNext( - Fts3Cursor *pCsr, - Fts3Phrase *p, - u8 *pbEof + Fts3Cursor *pCsr, /* FTS Cursor handle */ + Fts3Phrase *p, /* Phrase object to advance to next docid */ + u8 *pbEof /* OUT: Set to 1 if EOF */ ){ int rc = SQLITE_OK; Fts3Doclist *pDL = &p->doclist; Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab; @@ -115497,14 +117905,14 @@ fts3PoslistCopy(0, &pIter); pDL->nList = (pIter - pDL->pList); /* pIter now points just past the 0x00 that terminates the position- ** list for document pDL->iDocid. However, if this position-list was - ** edited in place by fts3EvalNearTrim2(), then pIter may not actually + ** edited in place by fts3EvalNearTrim(), then pIter may not actually ** point to the start of the next docid value. The following line deals ** with this case by advancing pIter past the zero-padding added by - ** fts3EvalNearTrim2(). */ + ** fts3EvalNearTrim(). */ while( pIterpNextDocid = pIter; assert( pIter>=&pDL->aAll[pDL->nAll] || *pIter ); *pbEof = 0; @@ -115512,15 +117920,31 @@ } return rc; } +/* +** +** If *pRc is not SQLITE_OK when this function is called, it is a no-op. +** Otherwise, fts3EvalPhraseStart() is called on all phrases within the +** expression. Also the Fts3Expr.bDeferred variable is set to true for any +** expressions for which all descendent tokens are deferred. +** +** If parameter bOptOk is zero, then it is guaranteed that the +** Fts3Phrase.doclist.aAll/nAll variables contain the entire doclist for +** each phrase in the expression (subject to deferred token processing). +** Or, if bOptOk is non-zero, then one or more tokens within the expression +** may be loaded incrementally, meaning doclist.aAll/nAll is not available. +** +** If an error occurs within this function, *pRc is set to an SQLite error +** code before returning. +*/ static void fts3EvalStartReaders( - Fts3Cursor *pCsr, - Fts3Expr *pExpr, - int bOptOk, - int *pRc + Fts3Cursor *pCsr, /* FTS Cursor handle */ + Fts3Expr *pExpr, /* Expression to initialize phrases in */ + int bOptOk, /* True to enable incremental loading */ + int *pRc /* IN/OUT: Error code */ ){ if( pExpr && SQLITE_OK==*pRc ){ if( pExpr->eType==FTSQUERY_PHRASE ){ int i; int nToken = pExpr->pPhrase->nToken; @@ -115535,27 +117959,46 @@ pExpr->bDeferred = (pExpr->pLeft->bDeferred && pExpr->pRight->bDeferred); } } } +/* +** An array of the following structures is assembled as part of the process +** of selecting tokens to defer before the query starts executing (as part +** of the xFilter() method). There is one element in the array for each +** token in the FTS expression. +** +** Tokens are divided into AND/NEAR clusters. All tokens in a cluster belong +** to phrases that are connected only by AND and NEAR operators (not OR or +** NOT). When determining tokens to defer, each AND/NEAR cluster is considered +** separately. The root of a tokens AND/NEAR cluster is stored in +** Fts3TokenAndCost.pRoot. +*/ typedef struct Fts3TokenAndCost Fts3TokenAndCost; struct Fts3TokenAndCost { Fts3Phrase *pPhrase; /* The phrase the token belongs to */ int iToken; /* Position of token in phrase */ Fts3PhraseToken *pToken; /* The token itself */ - Fts3Expr *pRoot; - int nOvfl; + Fts3Expr *pRoot; /* Root of NEAR/AND cluster */ + int nOvfl; /* Number of overflow pages to load doclist */ int iCol; /* The column the token must match */ }; +/* +** This function is used to populate an allocated Fts3TokenAndCost array. +** +** If *pRc is not SQLITE_OK when this function is called, it is a no-op. +** Otherwise, if an error occurs during execution, *pRc is set to an +** SQLite error code. +*/ static void fts3EvalTokenCosts( - Fts3Cursor *pCsr, - Fts3Expr *pRoot, - Fts3Expr *pExpr, - Fts3TokenAndCost **ppTC, - Fts3Expr ***ppOr, - int *pRc + Fts3Cursor *pCsr, /* FTS Cursor handle */ + Fts3Expr *pRoot, /* Root of current AND/NEAR cluster */ + Fts3Expr *pExpr, /* Expression to consider */ + Fts3TokenAndCost **ppTC, /* Write new entries to *(*ppTC)++ */ + Fts3Expr ***ppOr, /* Write new OR root to *(*ppOr)++ */ + int *pRc /* IN/OUT: Error code */ ){ if( *pRc==SQLITE_OK && pExpr ){ if( pExpr->eType==FTSQUERY_PHRASE ){ Fts3Phrase *pPhrase = pExpr->pPhrase; int i; @@ -115583,23 +118026,34 @@ fts3EvalTokenCosts(pCsr, pRoot, pExpr->pRight, ppTC, ppOr, pRc); } } } +/* +** Determine the average document (row) size in pages. If successful, +** write this value to *pnPage and return SQLITE_OK. Otherwise, return +** an SQLite error code. +** +** The average document size in pages is calculated by first calculating +** determining the average size in bytes, B. If B is less than the amount +** of data that will fit on a single leaf page of an intkey table in +** this database, then the average docsize is 1. Otherwise, it is 1 plus +** the number of overflow pages consumed by a record B bytes in size. +*/ static int fts3EvalAverageDocsize(Fts3Cursor *pCsr, int *pnPage){ if( pCsr->nRowAvg==0 ){ /* The average document size, which is required to calculate the cost - ** of each doclist, has not yet been determined. Read the required - ** data from the %_stat table to calculate it. - ** - ** Entry 0 of the %_stat table is a blob containing (nCol+1) FTS3 - ** varints, where nCol is the number of columns in the FTS3 table. - ** The first varint is the number of documents currently stored in - ** the table. The following nCol varints contain the total amount of - ** data stored in all rows of each column of the table, from left - ** to right. - */ + ** of each doclist, has not yet been determined. Read the required + ** data from the %_stat table to calculate it. + ** + ** Entry 0 of the %_stat table is a blob containing (nCol+1) FTS3 + ** varints, where nCol is the number of columns in the FTS3 table. + ** The first varint is the number of documents currently stored in + ** the table. The following nCol varints contain the total amount of + ** data stored in all rows of each column of the table, from left + ** to right. + */ int rc; Fts3Table *p = (Fts3Table*)pCsr->base.pVtab; sqlite3_stmt *pStmt; sqlite3_int64 nDoc = 0; sqlite3_int64 nByte = 0; @@ -115630,109 +118084,151 @@ *pnPage = pCsr->nRowAvg; return SQLITE_OK; } +/* +** This function is called to select the tokens (if any) that will be +** deferred. The array aTC[] has already been populated when this is +** called. +** +** This function is called once for each AND/NEAR cluster in the +** expression. Each invocation determines which tokens to defer within +** the cluster with root node pRoot. See comments above the definition +** of struct Fts3TokenAndCost for more details. +** +** If no error occurs, SQLITE_OK is returned and sqlite3Fts3DeferToken() +** called on each token to defer. Otherwise, an SQLite error code is +** returned. +*/ static int fts3EvalSelectDeferred( - Fts3Cursor *pCsr, - Fts3Expr *pRoot, - Fts3TokenAndCost *aTC, - int nTC + Fts3Cursor *pCsr, /* FTS Cursor handle */ + Fts3Expr *pRoot, /* Consider tokens with this root node */ + Fts3TokenAndCost *aTC, /* Array of expression tokens and costs */ + int nTC /* Number of entries in aTC[] */ ){ - int nDocSize = 0; - int nDocEst = 0; - int rc = SQLITE_OK; Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab; - int ii; + int nDocSize = 0; /* Number of pages per doc loaded */ + int rc = SQLITE_OK; /* Return code */ + int ii; /* Iterator variable for various purposes */ + int nOvfl = 0; /* Total overflow pages used by doclists */ + int nToken = 0; /* Total number of tokens in cluster */ - int nOvfl = 0; - int nTerm = 0; + int nMinEst = 0; /* The minimum count for any phrase so far. */ + int nLoad4 = 1; /* (Phrases that will be loaded)^4. */ + /* Count the tokens in this AND/NEAR cluster. If none of the doclists + ** associated with the tokens spill onto overflow pages, or if there is + ** only 1 token, exit early. No tokens to defer in this case. */ for(ii=0; iinOvfl) + assert( rc!=SQLITE_OK || nDocSize>0 ); + + + /* Iterate through all tokens in this AND/NEAR cluster, in ascending order + ** of the number of overflow pages that will be loaded by the pager layer + ** to retrieve the entire doclist for the token from the full-text index. + ** Load the doclists for tokens that are either: + ** + ** a. The cheapest token in the entire query (i.e. the one visited by the + ** first iteration of this loop), or + ** + ** b. Part of a multi-token phrase. + ** + ** After each token doclist is loaded, merge it with the others from the + ** same phrase and count the number of documents that the merged doclist + ** contains. Set variable "nMinEst" to the smallest number of documents in + ** any phrase doclist for which 1 or more token doclists have been loaded. + ** Let nOther be the number of other phrases for which it is certain that + ** one or more tokens will not be deferred. + ** + ** Then, for each token, defer it if loading the doclist would result in + ** loading N or more overflow pages into memory, where N is computed as: + ** + ** (nMinEst + 4^nOther - 1) / (4^nOther) + */ + for(ii=0; iinOvfl) ){ - pTC = &aTC[jj]; + pTC = &aTC[iTC]; } } assert( pTC ); - /* At this point pTC points to the cheapest remaining token. */ - if( ii==0 ){ - if( pTC->nOvfl ){ - nDocEst = (pTC->nOvfl * pTab->nPgsz + pTab->nPgsz) / 10; - }else{ + if( ii && pTC->nOvfl>=((nMinEst+(nLoad4/4)-1)/(nLoad4/4))*nDocSize ){ + /* The number of overflow pages to load for this (and therefore all + ** subsequent) tokens is greater than the estimated number of pages + ** that will be loaded if all subsequent tokens are deferred. + */ + Fts3PhraseToken *pToken = pTC->pToken; + rc = sqlite3Fts3DeferToken(pCsr, pToken, pTC->iCol); + fts3SegReaderCursorFree(pToken->pSegcsr); + pToken->pSegcsr = 0; + }else{ + nLoad4 = nLoad4*4; + if( ii==0 || pTC->pPhrase->nToken>1 ){ + /* Either this is the cheapest token in the entire query, or it is + ** part of a multi-token phrase. Either way, the entire doclist will + ** (eventually) be loaded into memory. It may as well be now. */ Fts3PhraseToken *pToken = pTC->pToken; int nList = 0; char *pList = 0; - rc = fts3TermSelect(pTab, pToken, pTC->iCol, 1, &nList, &pList); + rc = fts3TermSelect(pTab, pToken, pTC->iCol, &nList, &pList); assert( rc==SQLITE_OK || pList==0 ); - if( rc==SQLITE_OK ){ - nDocEst = fts3DoclistCountDocids(1, pList, nList); + int nCount; fts3EvalPhraseMergeToken(pTab, pTC->pPhrase, pTC->iToken,pList,nList); + nCount = fts3DoclistCountDocids( + pTC->pPhrase->doclist.aAll, pTC->pPhrase->doclist.nAll + ); + if( ii==0 || nCountnOvfl>=(nDocEst*nDocSize) ){ - Fts3PhraseToken *pToken = pTC->pToken; - rc = sqlite3Fts3DeferToken(pCsr, pToken, pTC->iCol); - fts3SegReaderCursorFree(pToken->pSegcsr); - pToken->pSegcsr = 0; - } - nDocEst = 1 + (nDocEst/4); } pTC->pToken = 0; } return rc; } -SQLITE_PRIVATE int sqlite3Fts3EvalStart(Fts3Cursor *pCsr, Fts3Expr *pExpr, int bOptOk){ +/* +** This function is called from within the xFilter method. It initializes +** the full-text query currently stored in pCsr->pExpr. To iterate through +** the results of a query, the caller does: +** +** fts3EvalStart(pCsr); +** while( 1 ){ +** fts3EvalNext(pCsr); +** if( pCsr->bEof ) break; +** ... return row pCsr->iPrevId to the caller ... +** } +*/ +static int fts3EvalStart(Fts3Cursor *pCsr){ Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab; int rc = SQLITE_OK; int nToken = 0; int nOr = 0; /* Allocate a MultiSegReader for each token in the expression. */ - fts3EvalAllocateReaders(pCsr, pExpr, &nToken, &nOr, &rc); - - /* Call fts3EvalPhraseStart() on all phrases in the expression. TODO: - ** This call will eventually also be responsible for determining which - ** tokens are 'deferred' until the document text is loaded into memory. - ** - ** Each token in each phrase is dealt with using one of the following - ** three strategies: - ** - ** 1. Entire doclist loaded into memory as part of the - ** fts3EvalStartReaders() call. - ** - ** 2. Doclist loaded into memory incrementally, as part of each - ** sqlite3Fts3EvalNext() call. - ** - ** 3. Token doclist is never loaded. Instead, documents are loaded into - ** memory and scanned for the token as part of the sqlite3Fts3EvalNext() - ** call. This is known as a "deferred" token. - */ - - /* If bOptOk is true, check if there are any tokens that should be deferred. - */ - if( rc==SQLITE_OK && bOptOk && nToken>1 && pTab->bHasStat ){ + fts3EvalAllocateReaders(pCsr, pCsr->pExpr, &nToken, &nOr, &rc); + + /* Determine which, if any, tokens in the expression should be deferred. */ + if( rc==SQLITE_OK && nToken>1 && pTab->bHasStat ){ Fts3TokenAndCost *aTC; Fts3Expr **apOr; aTC = (Fts3TokenAndCost *)sqlite3_malloc( sizeof(Fts3TokenAndCost) * nToken + sizeof(Fts3Expr *) * nOr * 2 @@ -115744,11 +118240,11 @@ }else{ int ii; Fts3TokenAndCost *pTC = aTC; Fts3Expr **ppOr = apOr; - fts3EvalTokenCosts(pCsr, 0, pExpr, &pTC, &ppOr, &rc); + fts3EvalTokenCosts(pCsr, 0, pCsr->pExpr, &pTC, &ppOr, &rc); nToken = pTC-aTC; nOr = ppOr-apOr; if( rc==SQLITE_OK ){ rc = fts3EvalSelectDeferred(pCsr, 0, aTC, nToken); @@ -115759,25 +118255,50 @@ sqlite3_free(aTC); } } - fts3EvalStartReaders(pCsr, pExpr, bOptOk, &rc); + fts3EvalStartReaders(pCsr, pCsr->pExpr, 1, &rc); return rc; } -static void fts3EvalZeroPoslist(Fts3Phrase *pPhrase){ +/* +** Invalidate the current position list for phrase pPhrase. +*/ +static void fts3EvalInvalidatePoslist(Fts3Phrase *pPhrase){ if( pPhrase->doclist.bFreeList ){ sqlite3_free(pPhrase->doclist.pList); } pPhrase->doclist.pList = 0; pPhrase->doclist.nList = 0; pPhrase->doclist.bFreeList = 0; } -static int fts3EvalNearTrim2( - int nNear, +/* +** This function is called to edit the position list associated with +** the phrase object passed as the fifth argument according to a NEAR +** condition. For example: +** +** abc NEAR/5 "def ghi" +** +** Parameter nNear is passed the NEAR distance of the expression (5 in +** the example above). When this function is called, *paPoslist points to +** the position list, and *pnToken is the number of phrase tokens in, the +** phrase on the other side of the NEAR operator to pPhrase. For example, +** if pPhrase refers to the "def ghi" phrase, then *paPoslist points to +** the position list associated with phrase "abc". +** +** All positions in the pPhrase position list that are not sufficiently +** close to a position in the *paPoslist position list are removed. If this +** leaves 0 positions, zero is returned. Otherwise, non-zero. +** +** Before returning, *paPoslist is set to point to the position lsit +** associated with pPhrase. And *pnToken is set to the number of tokens in +** pPhrase. +*/ +static int fts3EvalNearTrim( + int nNear, /* NEAR distance. As in "NEAR/nNear". */ char *aTmp, /* Temporary space to use */ char **paPoslist, /* IN/OUT: Position list */ int *pnToken, /* IN/OUT: Tokens in phrase of *paPoslist */ Fts3Phrase *pPhrase /* The phrase object to trim the doclist of */ ){ @@ -115805,10 +118326,176 @@ } return res; } +/* +** This function is a no-op if *pRc is other than SQLITE_OK when it is called. +** Otherwise, it advances the expression passed as the second argument to +** point to the next matching row in the database. Expressions iterate through +** matching rows in docid order. Ascending order if Fts3Cursor.bDesc is zero, +** or descending if it is non-zero. +** +** If an error occurs, *pRc is set to an SQLite error code. Otherwise, if +** successful, the following variables in pExpr are set: +** +** Fts3Expr.bEof (non-zero if EOF - there is no next row) +** Fts3Expr.iDocid (valid if bEof==0. The docid of the next row) +** +** If the expression is of type FTSQUERY_PHRASE, and the expression is not +** at EOF, then the following variables are populated with the position list +** for the phrase for the visited row: +** +** FTs3Expr.pPhrase->doclist.nList (length of pList in bytes) +** FTs3Expr.pPhrase->doclist.pList (pointer to position list) +** +** It says above that this function advances the expression to the next +** matching row. This is usually true, but there are the following exceptions: +** +** 1. Deferred tokens are not taken into account. If a phrase consists +** entirely of deferred tokens, it is assumed to match every row in +** the db. In this case the position-list is not populated at all. +** +** Or, if a phrase contains one or more deferred tokens and one or +** more non-deferred tokens, then the expression is advanced to the +** next possible match, considering only non-deferred tokens. In other +** words, if the phrase is "A B C", and "B" is deferred, the expression +** is advanced to the next row that contains an instance of "A * C", +** where "*" may match any single token. The position list in this case +** is populated as for "A * C" before returning. +** +** 2. NEAR is treated as AND. If the expression is "x NEAR y", it is +** advanced to point to the next row that matches "x AND y". +** +** See fts3EvalTestDeferredAndNear() for details on testing if a row is +** really a match, taking into account deferred tokens and NEAR operators. +*/ +static void fts3EvalNextRow( + Fts3Cursor *pCsr, /* FTS Cursor handle */ + Fts3Expr *pExpr, /* Expr. to advance to next matching row */ + int *pRc /* IN/OUT: Error code */ +){ + if( *pRc==SQLITE_OK ){ + int bDescDoclist = pCsr->bDesc; /* Used by DOCID_CMP() macro */ + assert( pExpr->bEof==0 ); + pExpr->bStart = 1; + + switch( pExpr->eType ){ + case FTSQUERY_NEAR: + case FTSQUERY_AND: { + Fts3Expr *pLeft = pExpr->pLeft; + Fts3Expr *pRight = pExpr->pRight; + assert( !pLeft->bDeferred || !pRight->bDeferred ); + + if( pLeft->bDeferred ){ + /* LHS is entirely deferred. So we assume it matches every row. + ** Advance the RHS iterator to find the next row visited. */ + fts3EvalNextRow(pCsr, pRight, pRc); + pExpr->iDocid = pRight->iDocid; + pExpr->bEof = pRight->bEof; + }else if( pRight->bDeferred ){ + /* RHS is entirely deferred. So we assume it matches every row. + ** Advance the LHS iterator to find the next row visited. */ + fts3EvalNextRow(pCsr, pLeft, pRc); + pExpr->iDocid = pLeft->iDocid; + pExpr->bEof = pLeft->bEof; + }else{ + /* Neither the RHS or LHS are deferred. */ + fts3EvalNextRow(pCsr, pLeft, pRc); + fts3EvalNextRow(pCsr, pRight, pRc); + while( !pLeft->bEof && !pRight->bEof && *pRc==SQLITE_OK ){ + sqlite3_int64 iDiff = DOCID_CMP(pLeft->iDocid, pRight->iDocid); + if( iDiff==0 ) break; + if( iDiff<0 ){ + fts3EvalNextRow(pCsr, pLeft, pRc); + }else{ + fts3EvalNextRow(pCsr, pRight, pRc); + } + } + pExpr->iDocid = pLeft->iDocid; + pExpr->bEof = (pLeft->bEof || pRight->bEof); + } + break; + } + + case FTSQUERY_OR: { + Fts3Expr *pLeft = pExpr->pLeft; + Fts3Expr *pRight = pExpr->pRight; + sqlite3_int64 iCmp = DOCID_CMP(pLeft->iDocid, pRight->iDocid); + + assert( pLeft->bStart || pLeft->iDocid==pRight->iDocid ); + assert( pRight->bStart || pLeft->iDocid==pRight->iDocid ); + + if( pRight->bEof || (pLeft->bEof==0 && iCmp<0) ){ + fts3EvalNextRow(pCsr, pLeft, pRc); + }else if( pLeft->bEof || (pRight->bEof==0 && iCmp>0) ){ + fts3EvalNextRow(pCsr, pRight, pRc); + }else{ + fts3EvalNextRow(pCsr, pLeft, pRc); + fts3EvalNextRow(pCsr, pRight, pRc); + } + + pExpr->bEof = (pLeft->bEof && pRight->bEof); + iCmp = DOCID_CMP(pLeft->iDocid, pRight->iDocid); + if( pRight->bEof || (pLeft->bEof==0 && iCmp<0) ){ + pExpr->iDocid = pLeft->iDocid; + }else{ + pExpr->iDocid = pRight->iDocid; + } + + break; + } + + case FTSQUERY_NOT: { + Fts3Expr *pLeft = pExpr->pLeft; + Fts3Expr *pRight = pExpr->pRight; + + if( pRight->bStart==0 ){ + fts3EvalNextRow(pCsr, pRight, pRc); + assert( *pRc!=SQLITE_OK || pRight->bStart ); + } + + fts3EvalNextRow(pCsr, pLeft, pRc); + if( pLeft->bEof==0 ){ + while( !*pRc + && !pRight->bEof + && DOCID_CMP(pLeft->iDocid, pRight->iDocid)>0 + ){ + fts3EvalNextRow(pCsr, pRight, pRc); + } + } + pExpr->iDocid = pLeft->iDocid; + pExpr->bEof = pLeft->bEof; + break; + } + + default: { + Fts3Phrase *pPhrase = pExpr->pPhrase; + fts3EvalInvalidatePoslist(pPhrase); + *pRc = fts3EvalPhraseNext(pCsr, pPhrase, &pExpr->bEof); + pExpr->iDocid = pPhrase->doclist.iDocid; + break; + } + } + } +} + +/* +** If *pRc is not SQLITE_OK, or if pExpr is not the root node of a NEAR +** cluster, then this function returns 1 immediately. +** +** Otherwise, it checks if the current row really does match the NEAR +** expression, using the data currently stored in the position lists +** (Fts3Expr->pPhrase.doclist.pList/nList) for each phrase in the expression. +** +** If the current row is a match, the position list associated with each +** phrase in the NEAR expression is edited in place to contain only those +** phrase instances sufficiently close to their peers to satisfy all NEAR +** constraints. In this case it returns 1. If the NEAR expression does not +** match the current row, 0 is returned. The position lists may or may not +** be edited if 0 is returned. +*/ static int fts3EvalNearTest(Fts3Expr *pExpr, int *pRc){ int res = 1; /* The following block runs if pExpr is the root of a NEAR query. ** For example, the query: @@ -115826,11 +118513,11 @@ ** | | ** "w" "x" ** ** The right-hand child of a NEAR node is always a phrase. The ** left-hand child may be either a phrase or a NEAR node. There are - ** no exceptions to this. + ** no exceptions to this - it's the way the parser in fts3_expr.c works. */ if( *pRc==SQLITE_OK && pExpr->eType==FTSQUERY_NEAR && pExpr->bEof==0 && (pExpr->pParent==0 || pExpr->pParent->eType!=FTSQUERY_NEAR) @@ -115853,21 +118540,21 @@ int nToken = p->pPhrase->nToken; for(p=p->pParent;res && p && p->eType==FTSQUERY_NEAR; p=p->pParent){ Fts3Phrase *pPhrase = p->pRight->pPhrase; int nNear = p->nNear; - res = fts3EvalNearTrim2(nNear, aTmp, &aPoslist, &nToken, pPhrase); + res = fts3EvalNearTrim(nNear, aTmp, &aPoslist, &nToken, pPhrase); } aPoslist = pExpr->pRight->pPhrase->doclist.pList; nToken = pExpr->pRight->pPhrase->nToken; for(p=pExpr->pLeft; p && res; p=p->pLeft){ int nNear = p->pParent->nNear; Fts3Phrase *pPhrase = ( p->eType==FTSQUERY_NEAR ? p->pRight->pPhrase : p->pPhrase ); - res = fts3EvalNearTrim2(nNear, aTmp, &aPoslist, &nToken, pPhrase); + res = fts3EvalNearTrim(nNear, aTmp, &aPoslist, &nToken, pPhrase); } } sqlite3_free(aTmp); } @@ -115874,132 +118561,33 @@ return res; } /* -** This macro is used by the fts3EvalNext() function. The two arguments are -** 64-bit docid values. If the current query is "ORDER BY docid ASC", then -** the macro returns (i1 - i2). Or if it is "ORDER BY docid DESC", then -** it returns (i2 - i1). This allows the same code to be used for merging -** doclists in ascending or descending order. +** This function is a helper function for fts3EvalTestDeferredAndNear(). +** Assuming no error occurs or has occurred, It returns non-zero if the +** expression passed as the second argument matches the row that pCsr +** currently points to, or zero if it does not. +** +** If *pRc is not SQLITE_OK when this function is called, it is a no-op. +** If an error occurs during execution of this function, *pRc is set to +** the appropriate SQLite error code. In this case the returned value is +** undefined. */ -#define DOCID_CMP(i1, i2) ((pCsr->bDesc?-1:1) * (i1-i2)) - -static void fts3EvalNext( - Fts3Cursor *pCsr, - Fts3Expr *pExpr, - int *pRc -){ - if( *pRc==SQLITE_OK ){ - assert( pExpr->bEof==0 ); - pExpr->bStart = 1; - - switch( pExpr->eType ){ - case FTSQUERY_NEAR: - case FTSQUERY_AND: { - Fts3Expr *pLeft = pExpr->pLeft; - Fts3Expr *pRight = pExpr->pRight; - assert( !pLeft->bDeferred || !pRight->bDeferred ); - if( pLeft->bDeferred ){ - fts3EvalNext(pCsr, pRight, pRc); - pExpr->iDocid = pRight->iDocid; - pExpr->bEof = pRight->bEof; - }else if( pRight->bDeferred ){ - fts3EvalNext(pCsr, pLeft, pRc); - pExpr->iDocid = pLeft->iDocid; - pExpr->bEof = pLeft->bEof; - }else{ - fts3EvalNext(pCsr, pLeft, pRc); - fts3EvalNext(pCsr, pRight, pRc); - - while( !pLeft->bEof && !pRight->bEof && *pRc==SQLITE_OK ){ - sqlite3_int64 iDiff = DOCID_CMP(pLeft->iDocid, pRight->iDocid); - if( iDiff==0 ) break; - if( iDiff<0 ){ - fts3EvalNext(pCsr, pLeft, pRc); - }else{ - fts3EvalNext(pCsr, pRight, pRc); - } - } - - pExpr->iDocid = pLeft->iDocid; - pExpr->bEof = (pLeft->bEof || pRight->bEof); - } - break; - } - - case FTSQUERY_OR: { - Fts3Expr *pLeft = pExpr->pLeft; - Fts3Expr *pRight = pExpr->pRight; - sqlite3_int64 iCmp = DOCID_CMP(pLeft->iDocid, pRight->iDocid); - - assert( pLeft->bStart || pLeft->iDocid==pRight->iDocid ); - assert( pRight->bStart || pLeft->iDocid==pRight->iDocid ); - - if( pRight->bEof || (pLeft->bEof==0 && iCmp<0) ){ - fts3EvalNext(pCsr, pLeft, pRc); - }else if( pLeft->bEof || (pRight->bEof==0 && iCmp>0) ){ - fts3EvalNext(pCsr, pRight, pRc); - }else{ - fts3EvalNext(pCsr, pLeft, pRc); - fts3EvalNext(pCsr, pRight, pRc); - } - - pExpr->bEof = (pLeft->bEof && pRight->bEof); - iCmp = DOCID_CMP(pLeft->iDocid, pRight->iDocid); - if( pRight->bEof || (pLeft->bEof==0 && iCmp<0) ){ - pExpr->iDocid = pLeft->iDocid; - }else{ - pExpr->iDocid = pRight->iDocid; - } - - break; - } - - case FTSQUERY_NOT: { - Fts3Expr *pLeft = pExpr->pLeft; - Fts3Expr *pRight = pExpr->pRight; - - if( pRight->bStart==0 ){ - fts3EvalNext(pCsr, pRight, pRc); - assert( *pRc!=SQLITE_OK || pRight->bStart ); - } - - fts3EvalNext(pCsr, pLeft, pRc); - if( pLeft->bEof==0 ){ - while( !*pRc - && !pRight->bEof - && DOCID_CMP(pLeft->iDocid, pRight->iDocid)>0 - ){ - fts3EvalNext(pCsr, pRight, pRc); - } - } - pExpr->iDocid = pLeft->iDocid; - pExpr->bEof = pLeft->bEof; - break; - } - - default: { - Fts3Phrase *pPhrase = pExpr->pPhrase; - fts3EvalZeroPoslist(pPhrase); - *pRc = fts3EvalPhraseNext(pCsr, pPhrase, &pExpr->bEof); - pExpr->iDocid = pPhrase->doclist.iDocid; - break; - } - } - } -} - -static int fts3EvalDeferredTest(Fts3Cursor *pCsr, Fts3Expr *pExpr, int *pRc){ - int bHit = 1; +static int fts3EvalTestExpr( + Fts3Cursor *pCsr, /* FTS cursor handle */ + Fts3Expr *pExpr, /* Expr to test. May or may not be root. */ + int *pRc /* IN/OUT: Error code */ +){ + int bHit = 1; /* Return value */ if( *pRc==SQLITE_OK ){ switch( pExpr->eType ){ case FTSQUERY_NEAR: case FTSQUERY_AND: bHit = ( - fts3EvalDeferredTest(pCsr, pExpr->pLeft, pRc) - && fts3EvalDeferredTest(pCsr, pExpr->pRight, pRc) + fts3EvalTestExpr(pCsr, pExpr->pLeft, pRc) + && fts3EvalTestExpr(pCsr, pExpr->pRight, pRc) && fts3EvalNearTest(pExpr, pRc) ); /* If the NEAR expression does not match any rows, zero the doclist for ** all phrases involved in the NEAR. This is because the snippet(), @@ -116021,31 +118609,31 @@ && (pExpr->pParent==0 || pExpr->pParent->eType!=FTSQUERY_NEAR) ){ Fts3Expr *p; for(p=pExpr; p->pPhrase==0; p=p->pLeft){ if( p->pRight->iDocid==pCsr->iPrevId ){ - fts3EvalZeroPoslist(p->pRight->pPhrase); + fts3EvalInvalidatePoslist(p->pRight->pPhrase); } } if( p->iDocid==pCsr->iPrevId ){ - fts3EvalZeroPoslist(p->pPhrase); + fts3EvalInvalidatePoslist(p->pPhrase); } } break; case FTSQUERY_OR: { - int bHit1 = fts3EvalDeferredTest(pCsr, pExpr->pLeft, pRc); - int bHit2 = fts3EvalDeferredTest(pCsr, pExpr->pRight, pRc); + int bHit1 = fts3EvalTestExpr(pCsr, pExpr->pLeft, pRc); + int bHit2 = fts3EvalTestExpr(pCsr, pExpr->pRight, pRc); bHit = bHit1 || bHit2; break; } case FTSQUERY_NOT: bHit = ( - fts3EvalDeferredTest(pCsr, pExpr->pLeft, pRc) - && !fts3EvalDeferredTest(pCsr, pExpr->pRight, pRc) + fts3EvalTestExpr(pCsr, pExpr->pLeft, pRc) + && !fts3EvalTestExpr(pCsr, pExpr->pRight, pRc) ); break; default: { if( pCsr->pDeferred @@ -116052,11 +118640,11 @@ && (pExpr->iDocid==pCsr->iPrevId || pExpr->bDeferred) ){ Fts3Phrase *pPhrase = pExpr->pPhrase; assert( pExpr->bDeferred || pPhrase->doclist.bFreeList==0 ); if( pExpr->bDeferred ){ - fts3EvalZeroPoslist(pPhrase); + fts3EvalInvalidatePoslist(pPhrase); } *pRc = fts3EvalDeferredPhrase(pCsr, pPhrase); bHit = (pPhrase->doclist.pList!=0); pExpr->iDocid = pCsr->iPrevId; }else{ @@ -116068,31 +118656,53 @@ } return bHit; } /* -** Return 1 if both of the following are true: +** This function is called as the second part of each xNext operation when +** iterating through the results of a full-text query. At this point the +** cursor points to a row that matches the query expression, with the +** following caveats: +** +** * Up until this point, "NEAR" operators in the expression have been +** treated as "AND". +** +** * Deferred tokens have not yet been considered. +** +** If *pRc is not SQLITE_OK when this function is called, it immediately +** returns 0. Otherwise, it tests whether or not after considering NEAR +** operators and deferred tokens the current row is still a match for the +** expression. It returns 1 if both of the following are true: ** ** 1. *pRc is SQLITE_OK when this function returns, and ** ** 2. After scanning the current FTS table row for the deferred tokens, -** it is determined that the row does not match the query. +** it is determined that the row does *not* match the query. ** ** Or, if no error occurs and it seems the current row does match the FTS ** query, return 0. */ -static int fts3EvalLoadDeferred(Fts3Cursor *pCsr, int *pRc){ +static int fts3EvalTestDeferredAndNear(Fts3Cursor *pCsr, int *pRc){ int rc = *pRc; int bMiss = 0; if( rc==SQLITE_OK ){ + + /* If there are one or more deferred tokens, load the current row into + ** memory and scan it to determine the position list for each deferred + ** token. Then, see if this row is really a match, considering deferred + ** tokens and NEAR operators (neither of which were taken into account + ** earlier, by fts3EvalNextRow()). + */ if( pCsr->pDeferred ){ rc = fts3CursorSeek(0, pCsr); if( rc==SQLITE_OK ){ rc = sqlite3Fts3CacheDeferredDoclists(pCsr); } } - bMiss = (0==fts3EvalDeferredTest(pCsr, pCsr->pExpr, &rc)); + bMiss = (0==fts3EvalTestExpr(pCsr, pCsr->pExpr, &rc)); + + /* Free the position-lists accumulated for each deferred token above. */ sqlite3Fts3FreeDeferredDoclists(pCsr); *pRc = rc; } return (rc==SQLITE_OK && bMiss); } @@ -116099,11 +118709,11 @@ /* ** Advance to the next document that matches the FTS expression in ** Fts3Cursor.pExpr. */ -SQLITE_PRIVATE int sqlite3Fts3EvalNext(Fts3Cursor *pCsr){ +static int fts3EvalNext(Fts3Cursor *pCsr){ int rc = SQLITE_OK; /* Return Code */ Fts3Expr *pExpr = pCsr->pExpr; assert( pCsr->isEof==0 ); if( pExpr==0 ){ pCsr->isEof = 1; @@ -116111,23 +118721,23 @@ do { if( pCsr->isRequireSeek==0 ){ sqlite3_reset(pCsr->pStmt); } assert( sqlite3_data_count(pCsr->pStmt)==0 ); - fts3EvalNext(pCsr, pExpr, &rc); + fts3EvalNextRow(pCsr, pExpr, &rc); pCsr->isEof = pExpr->bEof; pCsr->isRequireSeek = 1; pCsr->isMatchinfoNeeded = 1; pCsr->iPrevId = pExpr->iDocid; - }while( pCsr->isEof==0 && fts3EvalLoadDeferred(pCsr, &rc) ); + }while( pCsr->isEof==0 && fts3EvalTestDeferredAndNear(pCsr, &rc) ); } return rc; } /* ** Restart interation for expression pExpr so that the next call to -** sqlite3Fts3EvalNext() visits the first row. Do not allow incremental +** fts3EvalNext() visits the first row. Do not allow incremental ** loading or merging of phrase doclists for this iteration. ** ** If *pRc is other than SQLITE_OK when this function is called, it is ** a no-op. If an error occurs within this function, *pRc is set to an ** SQLite error code before returning. @@ -116139,11 +118749,11 @@ ){ if( pExpr && *pRc==SQLITE_OK ){ Fts3Phrase *pPhrase = pExpr->pPhrase; if( pPhrase ){ - fts3EvalZeroPoslist(pPhrase); + fts3EvalInvalidatePoslist(pPhrase); if( pPhrase->bIncr ){ assert( pPhrase->nToken==1 ); assert( pPhrase->aToken[0].pSegcsr ); sqlite3Fts3MsrIncrRestart(pPhrase->aToken[0].pSegcsr); *pRc = fts3EvalPhraseStart(pCsr, 0, pPhrase); @@ -116255,18 +118865,18 @@ /* Ensure the %_content statement is reset. */ if( pCsr->isRequireSeek==0 ) sqlite3_reset(pCsr->pStmt); assert( sqlite3_data_count(pCsr->pStmt)==0 ); /* Advance to the next document */ - fts3EvalNext(pCsr, pRoot, &rc); + fts3EvalNextRow(pCsr, pRoot, &rc); pCsr->isEof = pRoot->bEof; pCsr->isRequireSeek = 1; pCsr->isMatchinfoNeeded = 1; pCsr->iPrevId = pRoot->iDocid; }while( pCsr->isEof==0 && pRoot->eType==FTSQUERY_NEAR - && fts3EvalLoadDeferred(pCsr, &rc) + && fts3EvalTestDeferredAndNear(pCsr, &rc) ); if( rc==SQLITE_OK && pCsr->isEof==0 ){ fts3EvalUpdateCounts(pRoot); } @@ -116284,14 +118894,14 @@ ** ** do {...} while( pRoot->iDocidbEof==0 ); }while( pRoot->iDocid!=iDocid && rc==SQLITE_OK ); - fts3EvalLoadDeferred(pCsr, &rc); + fts3EvalTestDeferredAndNear(pCsr, &rc); } } return rc; } @@ -116418,18 +119028,32 @@ */ SQLITE_PRIVATE void sqlite3Fts3EvalPhraseCleanup(Fts3Phrase *pPhrase){ if( pPhrase ){ int i; sqlite3_free(pPhrase->doclist.aAll); - fts3EvalZeroPoslist(pPhrase); + fts3EvalInvalidatePoslist(pPhrase); memset(&pPhrase->doclist, 0, sizeof(Fts3Doclist)); for(i=0; inToken; i++){ fts3SegReaderCursorFree(pPhrase->aToken[i].pSegcsr); pPhrase->aToken[i].pSegcsr = 0; } } } + +#if !SQLITE_CORE +/* +** Initialize API pointer table, if required. +*/ +SQLITE_API int sqlite3_extension_init( + sqlite3 *db, + char **pzErrMsg, + const sqlite3_api_routines *pApi +){ + SQLITE_EXTENSION_INIT2(pApi) + return sqlite3Fts3Init(db); +} +#endif #endif /************** End of fts3.c ************************************************/ /************** Begin file fts3_aux.c ****************************************/ @@ -116446,10 +119070,12 @@ ****************************************************************************** ** */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) +/* #include */ +/* #include */ typedef struct Fts3auxTable Fts3auxTable; typedef struct Fts3auxCursor Fts3auxCursor; struct Fts3auxTable { @@ -116984,10 +119610,12 @@ /* ** Default span for NEAR operators. */ #define SQLITE_FTS3_DEFAULT_NEAR_PARAM 10 +/* #include */ +/* #include */ /* ** isNot: ** This variable is used by function getNextNode(). When getNextNode() is ** called, it sets ParseContext.isNot to true if the 'next node' is a @@ -117685,10 +120313,11 @@ ** Everything after this point is just test code. */ #ifdef SQLITE_TEST +/* #include */ /* ** Function to query the hash-table of tokenizers (see README.tokenizers). */ static int queryTestTokenizer( @@ -117895,10 +120524,13 @@ ** * The FTS3 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS3 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) +/* #include */ +/* #include */ +/* #include */ /* ** Malloc and Free functions */ @@ -118275,10 +120907,14 @@ ** * The FTS3 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS3 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) +/* #include */ +/* #include */ +/* #include */ +/* #include */ /* ** Class derived from sqlite3_tokenizer */ @@ -118916,16 +121552,14 @@ ** (in which case SQLITE_CORE is not defined), or ** ** * The FTS3 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS3 is defined). */ -#ifndef SQLITE_CORE - SQLITE_EXTENSION_INIT1 -#endif - #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) +/* #include */ +/* #include */ /* ** Implementation of the SQL scalar function for accessing the underlying ** hash table. This function may be called as follows: ** @@ -119097,10 +121731,12 @@ } #ifdef SQLITE_TEST +/* #include */ +/* #include */ /* ** Implementation of a special SQL scalar function for testing tokenizers ** designed to be used in concert with the Tcl testing framework. This ** function must be called with two arguments: @@ -119408,10 +122044,14 @@ ** * The FTS3 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS3 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) +/* #include */ +/* #include */ +/* #include */ +/* #include */ typedef struct simple_tokenizer { sqlite3_tokenizer base; char delim[128]; /* flag ASCII delimiters */ @@ -119633,10 +122273,13 @@ ** code in fts3.c. */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) +/* #include */ +/* #include */ +/* #include */ /* ** When full-text index nodes are loaded from disk, the buffer that they ** are loaded into has the following number of bytes of padding at the end ** of it. i.e. if a full-text index node is 900 bytes in size, then a buffer @@ -122894,10 +125537,12 @@ ****************************************************************************** */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) +/* #include */ +/* #include */ /* ** Characters that may appear in the second argument to matchinfo(). */ #define FTS3_MATCHINFO_NPHRASE 'p' /* 1 value */ @@ -124481,10 +127126,12 @@ #ifndef SQLITE_CORE SQLITE_EXTENSION_INIT1 #else #endif +/* #include */ +/* #include */ #ifndef SQLITE_AMALGAMATION #include "sqlite3rtree.h" typedef sqlite3_int64 i64; typedef unsigned char u8; @@ -127695,10 +130342,11 @@ #include #include #include #include +/* #include */ #ifndef SQLITE_CORE SQLITE_EXTENSION_INIT1 #else #endif @@ -128174,12 +130822,16 @@ ** This file implements a tokenizer for fts3 based on the ICU library. */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) #ifdef SQLITE_ENABLE_ICU +/* #include */ +/* #include */ #include +/* #include */ +/* #include */ #include typedef struct IcuTokenizer IcuTokenizer; typedef struct IcuCursor IcuCursor; Index: SQLite.Interop/src/core/sqlite3.h ================================================================== --- SQLite.Interop/src/core/sqlite3.h +++ SQLite.Interop/src/core/sqlite3.h @@ -105,13 +105,13 @@ ** ** See also: [sqlite3_libversion()], ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.7.1" -#define SQLITE_VERSION_NUMBER 3007007 -#define SQLITE_SOURCE_ID "2011-06-28 17:39:05 af0d91adf497f5f36ec3813f04235a6e195a605f" +#define SQLITE_VERSION "3.7.8" +#define SQLITE_VERSION_NUMBER 3007008 +#define SQLITE_SOURCE_ID "2011-09-19 14:49:19 3e0da808d2f5b4d12046e05980ca04578f581177" /* ** CAPI3REF: Run-Time Library Version Numbers ** KEYWORDS: sqlite3_version, sqlite3_sourceid ** @@ -739,20 +739,52 @@ ** when [PRAGMA synchronous | PRAGMA synchronous=OFF] is set, but most ** VFSes do not need this signal and should silently ignore this opcode. ** Applications should not call [sqlite3_file_control()] with this ** opcode as doing so may disrupt the operation of the specialized VFSes ** that do require it. +** +** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic +** retry counts and intervals for certain disk I/O operations for the +** windows [VFS] in order to work to provide robustness against +** anti-virus programs. By default, the windows VFS will retry file read, +** file write, and file delete opertions up to 10 times, with a delay +** of 25 milliseconds before the first retry and with the delay increasing +** by an additional 25 milliseconds with each subsequent retry. This +** opcode allows those to values (10 retries and 25 milliseconds of delay) +** to be adjusted. The values are changed for all database connections +** within the same process. The argument is a pointer to an array of two +** integers where the first integer i the new retry count and the second +** integer is the delay. If either integer is negative, then the setting +** is not changed but instead the prior value of that setting is written +** into the array entry, allowing the current retry settings to be +** interrogated. The zDbName parameter is ignored. +** +** ^The [SQLITE_FCNTL_PERSIST_WAL] opcode is used to set or query the +** persistent [WAL | Write AHead Log] setting. By default, the auxiliary +** write ahead log and shared memory files used for transaction control +** are automatically deleted when the latest connection to the database +** closes. Setting persistent WAL mode causes those files to persist after +** close. Persisting the files is useful when other processes that do not +** have write permission on the directory containing the database file want +** to read the database file, as the WAL and shared memory files must exist +** in order for the database to be readable. The fourth parameter to +** [sqlite3_file_control()] for this opcode should be a pointer to an integer. +** That integer is 0 to disable persistent WAL mode or 1 to enable persistent +** WAL mode. If the integer is -1, then it is overwritten with the current +** WAL persistence setting. +** */ #define SQLITE_FCNTL_LOCKSTATE 1 #define SQLITE_GET_LOCKPROXYFILE 2 #define SQLITE_SET_LOCKPROXYFILE 3 #define SQLITE_LAST_ERRNO 4 #define SQLITE_FCNTL_SIZE_HINT 5 #define SQLITE_FCNTL_CHUNK_SIZE 6 #define SQLITE_FCNTL_FILE_POINTER 7 #define SQLITE_FCNTL_SYNC_OMITTED 8 - +#define SQLITE_FCNTL_WIN32_AV_RETRY 9 +#define SQLITE_FCNTL_PERSIST_WAL 10 /* ** CAPI3REF: Mutex Handle ** ** The mutex module within SQLite defines [sqlite3_mutex] to be an @@ -1176,20 +1208,14 @@ ** also used during testing of SQLite in order to specify an alternative ** memory allocator that simulates memory out-of-memory conditions in ** order to verify that SQLite recovers gracefully from such ** conditions. ** -** The xMalloc and xFree methods must work like the -** malloc() and free() functions from the standard C library. -** The xRealloc method must work like realloc() from the standard C library -** with the exception that if the second argument to xRealloc is zero, -** xRealloc must be a no-op - it must not perform any allocation or -** deallocation. ^SQLite guarantees that the second argument to +** The xMalloc, xRealloc, and xFree methods must work like the +** malloc(), realloc() and free() functions from the standard C library. +** ^SQLite guarantees that the second argument to ** xRealloc is always a value returned by a prior call to xRoundup. -** And so in cases where xRoundup always returns a positive number, -** xRealloc can perform exactly as the standard library realloc() and -** still be in compliance with this specification. ** ** xSize should return the allocated size of a memory allocation ** previously obtained from xMalloc or xRealloc. The allocated size ** is always at least as big as the requested size but may be larger. ** Index: SQLite.Interop/src/core/sqlite3ext.h ================================================================== --- SQLite.Interop/src/core/sqlite3ext.h +++ SQLite.Interop/src/core/sqlite3ext.h @@ -210,10 +210,13 @@ int (*strnicmp)(const char*,const char*,int); int (*unlock_notify)(sqlite3*,void(*)(void**,int),void*); int (*wal_autocheckpoint)(sqlite3*,int); int (*wal_checkpoint)(sqlite3*,const char*); void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*); + int (*blob_reopen)(sqlite3_blob*,sqlite3_int64); + int (*vtab_config)(sqlite3*,int op,...); + int (*vtab_on_conflict)(sqlite3*); }; /* ** The following macros redefine the API routines so that they are ** redirected throught the global sqlite3_api structure. @@ -410,11 +413,14 @@ #define sqlite3_strnicmp sqlite3_api->strnicmp #define sqlite3_unlock_notify sqlite3_api->unlock_notify #define sqlite3_wal_autocheckpoint sqlite3_api->wal_autocheckpoint #define sqlite3_wal_checkpoint sqlite3_api->wal_checkpoint #define sqlite3_wal_hook sqlite3_api->wal_hook +#define sqlite3_blob_reopen sqlite3_api->blob_reopen +#define sqlite3_vtab_config sqlite3_api->vtab_config +#define sqlite3_vtab_on_conflict sqlite3_api->vtab_on_conflict #endif /* SQLITE_CORE */ #define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api = 0; #define SQLITE_EXTENSION_INIT2(v) sqlite3_api = v; #endif /* _SQLITE3EXT_H_ */ Index: SQLite.Interop/src/win/crypt.c ================================================================== --- SQLite.Interop/src/win/crypt.c +++ SQLite.Interop/src/win/crypt.c @@ -337,10 +337,12 @@ else // Change the writekey for an already-encrypted database { pBlock->hWriteKey = hKey; } + sqlite3_mutex_enter(db->mutex); + // Start a transaction rc = sqlite3BtreeBeginTrans(pbt, 1); if (!rc) { @@ -403,12 +405,14 @@ // 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_OMIT_DISKIO Index: SQLite.Interop/src/win/interop.c ================================================================== --- SQLite.Interop/src/win/interop.c +++ SQLite.Interop/src/win/interop.c @@ -10,10 +10,37 @@ // 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 *); + +SQLITE_PRIVATE void * sqlite3DbMallocZero_interop(sqlite3 *db, int n) +{ + void *p; + if (db) { + sqlite3_mutex_enter(db->mutex); + } + p = sqlite3DbMallocZero(db,n); + if (db) { + sqlite3_mutex_leave(db->mutex); + } + return p; +} + +SQLITE_PRIVATE void sqlite3DbFree_interop(sqlite3 *db, void *p) +{ + if (db) { + sqlite3_mutex_enter(db->mutex); + } + if (p) { + sqlite3MemdebugSetType(p, MEMTYPE_DB|MEMTYPE_HEAP); + } + sqlite3DbFree(db,p); + if (db) { + sqlite3_mutex_leave(db->mutex); + } +} /* The goal of this version of close is different than that of sqlite3_close(), and is designed to lend itself better to .NET's non-deterministic finalizers and the GC thread. SQLite will not close a database if statements are open on it -- but for our purposes, we'd rather finalize all active statements and forcibly close the database. The reason is simple -- a lot of people don't Dispose() of their objects correctly and let the garbage collector @@ -24,11 +51,11 @@ their memory is freed and can be used for something else. The GC thread could potentially try and call finalize again on the statement after that memory was deallocated. BAD. So, what we need to do is make a copy of each statement, and call finalize() on the copy -- so that the original statement's memory is preserved, and marked as BAD, but we can still manage to finalize everything and forcibly close the database. Later when the GC gets around to calling finalize_interop() on the "bad" statement, we detect that and finish deallocating the pointer. */ -__declspec(dllexport) int WINAPI sqlite3_close_interop(sqlite3 *db) +SQLITE_API int WINAPI sqlite3_close_interop(sqlite3 *db) { int ret; ret = sqlite3_close(db); @@ -35,11 +62,11 @@ if (ret == SQLITE_BUSY && db->pVdbe) { while (db->pVdbe) { // Make a copy of the first prepared statement - Vdbe *p = (Vdbe *)sqlite3_malloc(sizeof(Vdbe)); + Vdbe *p = (Vdbe *)sqlite3DbMallocZero_interop(db, sizeof(Vdbe)); Vdbe *po = db->pVdbe; if (!p) { ret = SQLITE_NOMEM; @@ -68,11 +95,11 @@ } return ret; } -__declspec(dllexport) int WINAPI sqlite3_open_interop(const char*filename, int flags, sqlite3 **ppdb) +SQLITE_API int WINAPI sqlite3_open_interop(const char*filename, int flags, sqlite3 **ppdb) { int ret; //int sharedcache = ((flags & SQLITE_OPEN_SHAREDCACHE) != 0); //flags &= ~SQLITE_OPEN_SHAREDCACHE; @@ -84,11 +111,11 @@ RegisterExtensionFunctions(*ppdb); return ret; } -__declspec(dllexport) int WINAPI sqlite3_open16_interop(const char *filename, int flags, sqlite3 **ppdb) +SQLITE_API int WINAPI sqlite3_open16_interop(const char *filename, int flags, sqlite3 **ppdb) { int ret = sqlite3_open_interop(filename, flags, ppdb); if (!ret) { if(!DbHasProperty(*ppdb, 0, DB_SchemaLoaded)) @@ -95,107 +122,107 @@ ENC(*ppdb) = SQLITE_UTF16NATIVE; } return ret; } -__declspec(dllexport) const char * WINAPI sqlite3_errmsg_interop(sqlite3 *db, int *plen) +SQLITE_API const char * WINAPI sqlite3_errmsg_interop(sqlite3 *db, int *plen) { const char *pval = sqlite3_errmsg(db); *plen = (pval != 0) ? strlen(pval) : 0; return pval; } -__declspec(dllexport) int WINAPI sqlite3_prepare_interop(sqlite3 *db, const char *sql, int nbytes, sqlite3_stmt **ppstmt, const char **pztail, int *plen) +SQLITE_API int WINAPI sqlite3_prepare_interop(sqlite3 *db, const char *sql, int nbytes, sqlite3_stmt **ppstmt, const char **pztail, int *plen) { int n; n = sqlite3_prepare(db, sql, nbytes, ppstmt, pztail); *plen = (*pztail != 0) ? strlen(*pztail) : 0; return n; } -__declspec(dllexport) int WINAPI sqlite3_prepare16_interop(sqlite3 *db, const void *sql, int nchars, sqlite3_stmt **ppstmt, const void **pztail, int *plen) +SQLITE_API int WINAPI sqlite3_prepare16_interop(sqlite3 *db, const void *sql, int nchars, sqlite3_stmt **ppstmt, const void **pztail, int *plen) { int n; n = sqlite3_prepare16(db, sql, nchars * sizeof(wchar_t), ppstmt, pztail); *plen = (*pztail != 0) ? wcslen((wchar_t *)*pztail) * sizeof(wchar_t) : 0; return n; } -__declspec(dllexport) int WINAPI sqlite3_bind_double_interop(sqlite3_stmt *stmt, int iCol, double *val) +SQLITE_API int WINAPI sqlite3_bind_double_interop(sqlite3_stmt *stmt, int iCol, double *val) { return sqlite3_bind_double(stmt,iCol,*val); } -__declspec(dllexport) int WINAPI sqlite3_bind_int64_interop(sqlite3_stmt *stmt, int iCol, sqlite_int64 *val) +SQLITE_API int WINAPI sqlite3_bind_int64_interop(sqlite3_stmt *stmt, int iCol, sqlite_int64 *val) { return sqlite3_bind_int64(stmt,iCol,*val); } -__declspec(dllexport) const char * WINAPI sqlite3_bind_parameter_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const char * WINAPI sqlite3_bind_parameter_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const char *pval = sqlite3_bind_parameter_name(stmt, iCol); *plen = (pval != 0) ? strlen(pval) : 0; return pval; } -__declspec(dllexport) const char * WINAPI sqlite3_column_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const char * WINAPI sqlite3_column_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const char *pval = sqlite3_column_name(stmt, iCol); *plen = (pval != 0) ? strlen(pval) : 0; return pval; } -__declspec(dllexport) const void * WINAPI sqlite3_column_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const void * WINAPI sqlite3_column_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const void *pval = sqlite3_column_name16(stmt, iCol); *plen = (pval != 0) ? wcslen((wchar_t *)pval) * sizeof(wchar_t) : 0; return pval; } -__declspec(dllexport) const char * WINAPI sqlite3_column_decltype_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const char * WINAPI sqlite3_column_decltype_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const char *pval = sqlite3_column_decltype(stmt, iCol); *plen = (pval != 0) ? strlen(pval) : 0; return pval; } -__declspec(dllexport) const void * WINAPI sqlite3_column_decltype16_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const void * WINAPI sqlite3_column_decltype16_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const void *pval = sqlite3_column_decltype16(stmt, iCol); *plen = (pval != 0) ? wcslen((wchar_t *)pval) * sizeof(wchar_t) : 0; return pval; } -__declspec(dllexport) void WINAPI sqlite3_column_double_interop(sqlite3_stmt *stmt, int iCol, double *val) +SQLITE_API void WINAPI sqlite3_column_double_interop(sqlite3_stmt *stmt, int iCol, double *val) { *val = sqlite3_column_double(stmt,iCol); } -__declspec(dllexport) void WINAPI sqlite3_column_int64_interop(sqlite3_stmt *stmt, int iCol, sqlite_int64 *val) +SQLITE_API void WINAPI sqlite3_column_int64_interop(sqlite3_stmt *stmt, int iCol, sqlite_int64 *val) { *val = sqlite3_column_int64(stmt,iCol); } -__declspec(dllexport) const unsigned char * WINAPI sqlite3_column_text_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const unsigned char * WINAPI sqlite3_column_text_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const unsigned char *pval = sqlite3_column_text(stmt, iCol); *plen = (pval != 0) ? strlen((char *)pval) : 0; return pval; } -__declspec(dllexport) const void * WINAPI sqlite3_column_text16_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const void * WINAPI sqlite3_column_text16_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const void *pval = sqlite3_column_text16(stmt, iCol); *plen = (pval != 0) ? wcslen((wchar_t *)pval) * sizeof(wchar_t): 0; return pval; } -__declspec(dllexport) int WINAPI sqlite3_finalize_interop(sqlite3_stmt *stmt) +SQLITE_API int WINAPI sqlite3_finalize_interop(sqlite3_stmt *stmt) { Vdbe *p; sqlite3 *db; int ret; @@ -203,30 +230,30 @@ if (p && p->magic == VDBE_MAGIC_DEAD) { db = p->db; if (db == NULL) { - sqlite3_free(p); + sqlite3DbFree_interop(db, p); ret = SQLITE_OK; } } else ret = sqlite3_finalize(stmt); return ret; } -__declspec(dllexport) int WINAPI sqlite3_reset_interop(sqlite3_stmt *stmt) +SQLITE_API int WINAPI sqlite3_reset_interop(sqlite3_stmt *stmt) { int ret; if (((Vdbe *)stmt)->magic == VDBE_MAGIC_DEAD) return SQLITE_SCHEMA; ret = sqlite3_reset(stmt); return ret; } -__declspec(dllexport) int WINAPI sqlite3_create_function_interop(sqlite3 *psql, const char *zFunctionName, int nArg, int eTextRep, void *pvUser, SQLITEUSERFUNC func, SQLITEUSERFUNC funcstep, SQLITEFUNCFINAL funcfinal, int needCollSeq) +SQLITE_API int WINAPI sqlite3_create_function_interop(sqlite3 *psql, const char *zFunctionName, int nArg, int eTextRep, void *pvUser, SQLITEUSERFUNC func, SQLITEUSERFUNC funcstep, SQLITEFUNCFINAL funcfinal, int needCollSeq) { int n; if (eTextRep == SQLITE_UTF16) eTextRep = SQLITE_UTF16NATIVE; @@ -245,51 +272,51 @@ } return n; } -__declspec(dllexport) void WINAPI sqlite3_value_double_interop(sqlite3_value *pval, double *val) +SQLITE_API void WINAPI sqlite3_value_double_interop(sqlite3_value *pval, double *val) { *val = sqlite3_value_double(pval); } -__declspec(dllexport) void WINAPI sqlite3_value_int64_interop(sqlite3_value *pval, sqlite_int64 *val) +SQLITE_API void WINAPI sqlite3_value_int64_interop(sqlite3_value *pval, sqlite_int64 *val) { *val = sqlite3_value_int64(pval); } -__declspec(dllexport) const unsigned char * WINAPI sqlite3_value_text_interop(sqlite3_value *val, int *plen) +SQLITE_API const unsigned char * WINAPI sqlite3_value_text_interop(sqlite3_value *val, int *plen) { const unsigned char *pval = sqlite3_value_text(val); *plen = (pval != 0) ? strlen((char *)pval) : 0; return pval; } -__declspec(dllexport) const void * WINAPI sqlite3_value_text16_interop(sqlite3_value *val, int *plen) +SQLITE_API const void * WINAPI sqlite3_value_text16_interop(sqlite3_value *val, int *plen) { const void *pval = sqlite3_value_text16(val); *plen = (pval != 0) ? wcslen((wchar_t *)pval) * sizeof(wchar_t) : 0; return pval; } -__declspec(dllexport) void WINAPI sqlite3_result_double_interop(sqlite3_context *pctx, double *val) +SQLITE_API void WINAPI sqlite3_result_double_interop(sqlite3_context *pctx, double *val) { sqlite3_result_double(pctx, *val); } -__declspec(dllexport) void WINAPI sqlite3_result_int64_interop(sqlite3_context *pctx, sqlite_int64 *val) +SQLITE_API void WINAPI sqlite3_result_int64_interop(sqlite3_context *pctx, sqlite_int64 *val) { sqlite3_result_int64(pctx, *val); } -__declspec(dllexport) int WINAPI sqlite3_context_collcompare(sqlite3_context *ctx, const void *p1, int p1len, const void *p2, int p2len) +SQLITE_API int WINAPI sqlite3_context_collcompare(sqlite3_context *ctx, const void *p1, int p1len, const void *p2, int p2len) { if ((ctx->pFunc->flags & SQLITE_FUNC_NEEDCOLL) == 0) return 2; return ctx->pColl->xCmp(ctx->pColl->pUser, p1len, p1, p2len, p2); } -__declspec(dllexport) const char * WINAPI sqlite3_context_collseq(sqlite3_context *ctx, int *ptype, int *enc, int *plen) +SQLITE_API const char * WINAPI sqlite3_context_collseq(sqlite3_context *ctx, int *ptype, int *enc, int *plen) { CollSeq *pColl = ctx->pColl; *ptype = 0; *plen = 0; *enc = 0; @@ -305,53 +332,53 @@ return pColl->zName; } return NULL; } -__declspec(dllexport) const char * WINAPI sqlite3_column_database_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const char * WINAPI sqlite3_column_database_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const char *pval = sqlite3_column_database_name(stmt, iCol); *plen = (pval != 0) ? strlen(pval) : 0; return pval; } -__declspec(dllexport) const void * WINAPI sqlite3_column_database_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const void * WINAPI sqlite3_column_database_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const void *pval = sqlite3_column_database_name16(stmt, iCol); *plen = (pval != 0) ? wcslen((wchar_t *)pval) * sizeof(wchar_t) : 0; return pval; } -__declspec(dllexport) const char * WINAPI sqlite3_column_table_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const char * WINAPI sqlite3_column_table_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const char *pval = sqlite3_column_table_name(stmt, iCol); *plen = (pval != 0) ? strlen(pval) : 0; return pval; } -__declspec(dllexport) const void * WINAPI sqlite3_column_table_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const void * WINAPI sqlite3_column_table_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const void *pval = sqlite3_column_table_name16(stmt, iCol); *plen = (pval != 0) ? wcslen((wchar_t *)pval) * sizeof(wchar_t) : 0; return pval; } -__declspec(dllexport) const char * WINAPI sqlite3_column_origin_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const char * WINAPI sqlite3_column_origin_name_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const char *pval = sqlite3_column_origin_name(stmt, iCol); *plen = (pval != 0) ? strlen(pval) : 0; return pval; } -__declspec(dllexport) const void * WINAPI sqlite3_column_origin_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) +SQLITE_API const void * WINAPI sqlite3_column_origin_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const void *pval = sqlite3_column_origin_name16(stmt, iCol); *plen = (pval != 0) ? wcslen((wchar_t *)pval) * sizeof(wchar_t) : 0; return pval; } -__declspec(dllexport) int WINAPI sqlite3_table_column_metadata_interop(sqlite3 *db, const char *zDbName, const char *zTableName, const char *zColumnName, char **pzDataType, char **pzCollSeq, int *pNotNull, int *pPrimaryKey, int *pAutoinc, int *pdtLen, int *pcsLen) +SQLITE_API int WINAPI sqlite3_table_column_metadata_interop(sqlite3 *db, const char *zDbName, const char *zTableName, const char *zColumnName, char **pzDataType, char **pzCollSeq, int *pNotNull, int *pPrimaryKey, int *pAutoinc, int *pdtLen, int *pcsLen) { int n; n = sqlite3_table_column_metadata(db, zDbName, zTableName, zColumnName, pzDataType, pzCollSeq, pNotNull, pPrimaryKey, pAutoinc); *pdtLen = (*pzDataType != 0) ? strlen(*pzDataType) : 0; @@ -358,16 +385,24 @@ *pcsLen = (*pzCollSeq != 0) ? strlen(*pzCollSeq) : 0; return n; } -__declspec(dllexport) int WINAPI sqlite3_index_column_info_interop(sqlite3 *db, const char *zDb, const char *zIndexName, const char *zColumnName, int *sortOrder, int *onError, char **pzColl, int *plen) +SQLITE_API int WINAPI sqlite3_index_column_info_interop(sqlite3 *db, const char *zDb, const char *zIndexName, const char *zColumnName, int *sortOrder, int *onError, char **pzColl, int *plen) { Index *pIdx; Table *pTab; int n; + + sqlite3_mutex_enter(db->mutex); + sqlite3BtreeEnterAll(db); + pIdx = sqlite3FindIndex(db, zIndexName, zDb); + + sqlite3BtreeLeaveAll(db); + sqlite3_mutex_leave(db->mutex); + if (!pIdx) return SQLITE_ERROR; pTab = pIdx->pTable; for (n = 0; n < pIdx->nColumn; n++) { @@ -383,11 +418,11 @@ } } return SQLITE_ERROR; } -__declspec(dllexport) int WINAPI sqlite3_table_cursor(sqlite3_stmt *pstmt, int iDb, Pgno tableRootPage) +SQLITE_API int WINAPI sqlite3_table_cursor(sqlite3_stmt *pstmt, int iDb, Pgno tableRootPage) { Vdbe *p = (Vdbe *)pstmt; sqlite3 *db = (p == NULL) ? NULL : p->db; int n; int ret = -1; @@ -406,11 +441,11 @@ sqlite3_mutex_leave(db->mutex); return ret; } -__declspec(dllexport) int WINAPI sqlite3_cursor_rowid(sqlite3_stmt *pstmt, int cursor, sqlite_int64 *prowid) +SQLITE_API int WINAPI sqlite3_cursor_rowid(sqlite3_stmt *pstmt, int cursor, sqlite_int64 *prowid) { Vdbe *p = (Vdbe *)pstmt; sqlite3 *db = (p == NULL) ? NULL : p->db; VdbeCursor *pC; int ret = 0; @@ -465,6 +500,5 @@ return ret; } #endif // SQLITE_OS_WIN - Index: SQLite.Interop/src/win/interop.h ================================================================== --- SQLite.Interop/src/win/interop.h +++ SQLite.Interop/src/win/interop.h @@ -6,7 +6,7 @@ * Released to the public domain, use at your own risk! * */ #ifndef INTEROP_VERSION -#define INTEROP_VERSION "1.0.74.0" +#define INTEROP_VERSION "1.0.75.0" #endif Index: SQLite.NET.2008.MSBuild.sln ================================================================== --- SQLite.NET.2008.MSBuild.sln +++ SQLite.NET.2008.MSBuild.sln @@ -32,10 +32,17 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.CE.2008", "SQLite.Interop\SQLite.Interop.CE.2008.vcproj", "{9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testce.2008", "testce\testce.2008.csproj", "{B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.Static.2008", "SQLite.Interop\SQLite.Interop.Static.2008.vcproj", "{490CBC51-A3B2-4397-89F9-16E858DCB4F8}" + ProjectSection(ProjectDependencies) = postProject + {AC139952-261A-4463-B6FA-AEBC25284A66} = {AC139952-261A-4463-B6FA-AEBC25284A66} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer.2008", "tools\install\Installer.2008.csproj", "{A41FE2A5-07AD-4CE7-B836-1544634816F5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4) @@ -208,19 +215,19 @@ {E27B1B1E-19C0-45E8-AA74-B6E1C041A130}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Any CPU.ActiveCfg = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Any CPU.Build.0 = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|x64 + {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Win32.ActiveCfg = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Win32.Build.0 = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|x64.ActiveCfg = Debug|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|x64.Build.0 = Debug|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Pocket PC 2003 (ARMV4).ActiveCfg = DebugNativeOnly|Win32 - {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Win32.ActiveCfg = DebugNativeOnly|x64 + {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|x64.ActiveCfg = DebugNativeOnly|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Any CPU.Build.0 = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Mixed Platforms.Build.0 = DebugNativeOnly|Win32 @@ -492,10 +499,102 @@ {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Any CPU.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Win32.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Win32.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|x64.ActiveCfg = Debug|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|x64.Build.0 = Debug|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|Pocket PC 2003 (ARMV4).ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|x64.ActiveCfg = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Any CPU.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Mixed Platforms.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Win32.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|x64.ActiveCfg = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|x64.Build.0 = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Any CPU.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Any CPU.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Mixed Platforms.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Win32.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Win32.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|x64.ActiveCfg = Release|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|x64.Build.0 = Release|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|Any CPU.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|Mixed Platforms.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|Pocket PC 2003 (ARMV4).ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|Win32.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|x64.ActiveCfg = ReleaseNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Any CPU.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Any CPU.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Mixed Platforms.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Win32.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Win32.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|x64.ActiveCfg = ReleaseNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|x64.Build.0 = ReleaseNativeOnly|x64 + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Win32.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|x64.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Any CPU.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Mixed Platforms.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Win32.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|x64.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Any CPU.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Win32.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|x64.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|x64.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Any CPU.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Mixed Platforms.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Win32.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|x64.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|x64.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection EndGlobal Index: SQLite.NET.2008.sln ================================================================== --- SQLite.NET.2008.sln +++ SQLite.NET.2008.sln @@ -37,10 +37,17 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testce.2008", "testce\testce.2008.csproj", "{B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.CE.2008", "SQLite.Interop\SQLite.Interop.CE.2008.vcproj", "{9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.Static.2008", "SQLite.Interop\SQLite.Interop.Static.2008.vcproj", "{490CBC51-A3B2-4397-89F9-16E858DCB4F8}" + ProjectSection(ProjectDependencies) = postProject + {AC139952-261A-4463-B6FA-AEBC25284A66} = {AC139952-261A-4463-B6FA-AEBC25284A66} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer.2008", "tools\install\Installer.2008.csproj", "{A41FE2A5-07AD-4CE7-B836-1544634816F5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4) @@ -140,43 +147,35 @@ {AC139951-261A-4463-B6FA-AEBC25283A66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Debug|Win32.ActiveCfg = Debug|Any CPU - {AC139951-261A-4463-B6FA-AEBC25283A66}.Debug|Win32.Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Debug|x64.ActiveCfg = Debug|Any CPU - {AC139951-261A-4463-B6FA-AEBC25283A66}.Debug|x64.Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|Any CPU.Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|Mixed Platforms.Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|Pocket PC 2003 (ARMV4).Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU - {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|Win32.Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU - {AC139951-261A-4463-B6FA-AEBC25283A66}.DebugNativeOnly|x64.Build.0 = Debug|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|Any CPU.ActiveCfg = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|Any CPU.Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|Mixed Platforms.Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|Win32.ActiveCfg = Release|Any CPU - {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|Win32.Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|x64.ActiveCfg = Release|Any CPU - {AC139951-261A-4463-B6FA-AEBC25283A66}.Release|x64.Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Any CPU.Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Mixed Platforms.Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU - {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Win32.Build.0 = Release|Any CPU {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU - {AC139951-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|x64.Build.0 = Release|Any CPU {E27B1B1E-19C0-45E8-AA74-B6E1C041A130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E27B1B1E-19C0-45E8-AA74-B6E1C041A130}.Debug|Any CPU.Build.0 = Debug|Any CPU {E27B1B1E-19C0-45E8-AA74-B6E1C041A130}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {E27B1B1E-19C0-45E8-AA74-B6E1C041A130}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {E27B1B1E-19C0-45E8-AA74-B6E1C041A130}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU @@ -213,38 +212,38 @@ {E27B1B1E-19C0-45E8-AA74-B6E1C041A130}.ReleaseNativeOnly|x64.Build.0 = Release|Any CPU {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Any CPU.ActiveCfg = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Any CPU.Build.0 = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|x64 + {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Win32.ActiveCfg = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Win32.Build.0 = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|x64.ActiveCfg = Debug|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|x64.Build.0 = Debug|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Any CPU.Build.0 = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Mixed Platforms.Build.0 = DebugNativeOnly|Win32 - {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = DebugNativeOnly|x64 + {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Win32.Build.0 = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|x64.ActiveCfg = DebugNativeOnly|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|x64.Build.0 = DebugNativeOnly|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|Any CPU.ActiveCfg = Release|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|Any CPU.Build.0 = Release|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|Mixed Platforms.Build.0 = Release|Win32 - {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|x64 + {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|Win32.ActiveCfg = Release|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|Win32.Build.0 = Release|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|x64.ActiveCfg = Release|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Release|x64.Build.0 = Release|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|Any CPU.ActiveCfg = ReleaseNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|Any CPU.Build.0 = ReleaseNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = ReleaseNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|Mixed Platforms.Build.0 = ReleaseNativeOnly|Win32 - {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = ReleaseNativeOnly|x64 + {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = ReleaseNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|Win32.ActiveCfg = ReleaseNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|Win32.Build.0 = ReleaseNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|x64.ActiveCfg = ReleaseNativeOnly|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.ReleaseNativeOnly|x64.Build.0 = ReleaseNativeOnly|x64 {E6BF9F74-58E2-413B-A7CE-EA653ECB728D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -361,90 +360,146 @@ {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Debug|Win32.ActiveCfg = Debug|Any CPU - {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Debug|Win32.Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Debug|x64.ActiveCfg = Debug|Any CPU - {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Debug|x64.Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Any CPU.Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Mixed Platforms.Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Pocket PC 2003 (ARMV4).Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU - {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|Win32.Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU - {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.DebugNativeOnly|x64.Build.0 = Debug|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Any CPU.ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Any CPU.Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Mixed Platforms.Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Win32.ActiveCfg = Release|Any CPU - {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|Win32.Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|x64.ActiveCfg = Release|Any CPU - {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.Release|x64.Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Any CPU.Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Mixed Platforms.Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU - {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|Win32.Build.0 = Release|Any CPU {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU - {B86CE504-C4E4-496F-A0F0-E613BCFD3DF7}.ReleaseNativeOnly|x64.Build.0 = Release|Any CPU {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Any CPU.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Any CPU.Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|Win32.Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|x64.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Debug|x64.Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Any CPU.Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|Win32.Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|x64.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.DebugNativeOnly|x64.Build.0 = Debug|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Any CPU.ActiveCfg = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Any CPU.Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|Win32.Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|x64.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.Release|x64.Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Any CPU.Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|Win32.Build.0 = Release|Pocket PC 2003 (ARMV4) {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|x64.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {9E5A8F20-5F04-4629-B2E1-27B5E30F2AF6}.ReleaseNativeOnly|x64.Build.0 = Release|Pocket PC 2003 (ARMV4) + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Any CPU.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Win32.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Win32.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|x64.ActiveCfg = Debug|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|x64.Build.0 = Debug|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Any CPU.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Mixed Platforms.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Win32.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|x64.ActiveCfg = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|x64.Build.0 = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Any CPU.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Any CPU.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Mixed Platforms.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Win32.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Win32.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|x64.ActiveCfg = Release|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|x64.Build.0 = Release|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Any CPU.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Any CPU.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Mixed Platforms.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Win32.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Win32.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|x64.ActiveCfg = ReleaseNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|x64.Build.0 = ReleaseNativeOnly|x64 + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Win32.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|x64.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Any CPU.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Mixed Platforms.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Win32.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|x64.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Any CPU.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Win32.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|x64.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|x64.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Any CPU.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Mixed Platforms.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Win32.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection EndGlobal Index: SQLite.NET.2010.MSBuild.sln ================================================================== --- SQLite.NET.2010.MSBuild.sln +++ SQLite.NET.2010.MSBuild.sln @@ -26,10 +26,17 @@ ProjectSection(ProjectDependencies) = postProject {AC139952-261A-4463-B6FA-AEBC25283A66} = {AC139952-261A-4463-B6FA-AEBC25283A66} {E6BF9F74-58E2-413B-A7CE-EA653ECB728D} = {E6BF9F74-58E2-413B-A7CE-EA653ECB728D} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.Static.2010", "SQLite.Interop\SQLite.Interop.Static.2010.vcxproj", "{490CBC51-A3B2-4397-89F9-16E858DCB4F8}" + ProjectSection(ProjectDependencies) = postProject + {AC139952-261A-4463-B6FA-AEBC25284A66} = {AC139952-261A-4463-B6FA-AEBC25284A66} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer.2010", "tools\install\Installer.2010.csproj", "{A41FE2A5-07AD-4CE7-B836-1544634816F5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 @@ -184,11 +191,11 @@ {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|Win32.Build.0 = Debug|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|x64.ActiveCfg = Debug|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.Debug|x64.Build.0 = Debug|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 - {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Win32.ActiveCfg = DebugNativeOnly|x64 + {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugManagedOnly|x64.ActiveCfg = DebugNativeOnly|x64 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Any CPU.Build.0 = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 {53784BC1-A8BC-4AC8-8A3E-158D6807345A}.DebugNativeOnly|Mixed Platforms.Build.0 = DebugNativeOnly|Win32 @@ -294,10 +301,90 @@ {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseManagedOnly|x64.Build.0 = Release|Any CPU {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Any CPU.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Win32.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Win32.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|x64.ActiveCfg = Debug|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|x64.Build.0 = Debug|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugManagedOnly|x64.ActiveCfg = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Any CPU.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Mixed Platforms.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Win32.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|x64.ActiveCfg = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|x64.Build.0 = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Any CPU.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Any CPU.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Mixed Platforms.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Win32.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Win32.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|x64.ActiveCfg = Release|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|x64.Build.0 = Release|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|Any CPU.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|Mixed Platforms.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|Win32.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseManagedOnly|x64.ActiveCfg = ReleaseNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Any CPU.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Any CPU.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Mixed Platforms.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Win32.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Win32.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|x64.ActiveCfg = ReleaseNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|x64.Build.0 = ReleaseNativeOnly|x64 + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Win32.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|x64.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Any CPU.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Mixed Platforms.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|Win32.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugManagedOnly|x64.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Any CPU.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Win32.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|x64.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|x64.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Any CPU.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Mixed Platforms.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|Win32.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|x64.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseManagedOnly|x64.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection EndGlobal Index: SQLite.NET.2010.sln ================================================================== --- SQLite.NET.2010.sln +++ SQLite.NET.2010.sln @@ -28,10 +28,17 @@ ProjectSection(ProjectDependencies) = postProject {AC139952-261A-4463-B6FA-AEBC25283A66} = {AC139952-261A-4463-B6FA-AEBC25283A66} {E6BF9F74-58E2-413B-A7CE-EA653ECB728D} = {E6BF9F74-58E2-413B-A7CE-EA653ECB728D} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.Static.2010", "SQLite.Interop\SQLite.Interop.Static.2010.vcxproj", "{490CBC51-A3B2-4397-89F9-16E858DCB4F8}" + ProjectSection(ProjectDependencies) = postProject + {AC139952-261A-4463-B6FA-AEBC25284A66} = {AC139952-261A-4463-B6FA-AEBC25284A66} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer.2010", "tools\install\Installer.2010.csproj", "{A41FE2A5-07AD-4CE7-B836-1544634816F5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 @@ -272,10 +279,78 @@ {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|Mixed Platforms.Build.0 = Release|Any CPU {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|Win32.Build.0 = Release|Any CPU {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU {9D3CF7A6-092A-4B05-B0E4-BEF6944525B3}.ReleaseNativeOnly|x64.Build.0 = Release|Any CPU + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Any CPU.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Win32.ActiveCfg = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|Win32.Build.0 = Debug|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|x64.ActiveCfg = Debug|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Debug|x64.Build.0 = Debug|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Any CPU.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Any CPU.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Mixed Platforms.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Mixed Platforms.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Win32.ActiveCfg = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|Win32.Build.0 = DebugNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|x64.ActiveCfg = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.DebugNativeOnly|x64.Build.0 = DebugNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Any CPU.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Any CPU.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Mixed Platforms.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Win32.ActiveCfg = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|Win32.Build.0 = Release|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|x64.ActiveCfg = Release|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.Release|x64.Build.0 = Release|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Any CPU.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Any CPU.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Mixed Platforms.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Win32.ActiveCfg = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|Win32.Build.0 = ReleaseNativeOnly|Win32 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|x64.ActiveCfg = ReleaseNativeOnly|x64 + {490CBC51-A3B2-4397-89F9-16E858DCB4F8}.ReleaseNativeOnly|x64.Build.0 = ReleaseNativeOnly|x64 + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|Win32.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Debug|x64.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Any CPU.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Mixed Platforms.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|Win32.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.DebugNativeOnly|x64.Build.0 = Debug|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Any CPU.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|Win32.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|x64.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.Release|x64.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Any CPU.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Mixed Platforms.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|Win32.Build.0 = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU + {A41FE2A5-07AD-4CE7-B836-1544634816F5}.ReleaseNativeOnly|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection EndGlobal ADDED SQLite.nuspec Index: SQLite.nuspec ================================================================== --- /dev/null +++ SQLite.nuspec @@ -0,0 +1,17 @@ + + + + System.Data.SQLite + 1.0.75.0 + SQLite Development Team + The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly. + en-US + http://system.data.sqlite.org/ + http://system.data.sqlite.org/images/sqlite32.png + http://www.sqlite.org/copyright.html + sqlite database ado.net provider interop + + + + + Index: Setup/SQLite.iss ================================================================== --- Setup/SQLite.iss +++ Setup/SQLite.iss @@ -34,12 +34,12 @@ AppUpdatesURL={#AppURL} AppVerName=System.Data.SQLite v{#AppVersion} AppVersion={#AppVersion} AppComments=The ADO.NET adapter for the SQLite database engine. AppReadmeFile={app}\readme.htm -DefaultDirName={pf}\System.Data.SQLite -DefaultGroupName=System.Data.SQLite +DefaultDirName={pf}\System.Data.SQLite\{#Year} +DefaultGroupName=System.Data.SQLite\{#Year} OutputBaseFilename=sqlite-{#Framework}-{#OutputConfiguration}-{#AppProcessor}-{#Year}-{#AppVersion} OutputManifestFile=sqlite-{#Framework}-{#OutputConfiguration}-{#AppProcessor}-{#Year}-{#AppVersion}-manifest.txt SetupLogging=true UninstallFilesDir={app}\uninstall VersionInfoVersion={#AppVersion} Index: Setup/archive.bat ================================================================== --- Setup/archive.bat +++ Setup/archive.bat @@ -63,10 +63,17 @@ :skip_mungeVersion %_VECHO% Version = '%VERSION%' CALL :fn_ResetErrorLevel + +%_ECHO% IF NOT EXIST Setup\Output MKDIR Setup\Output + +IF ERRORLEVEL 1 ( + ECHO Could not create directory "Setup\Output". + GOTO errors +) %_ECHO% zip.exe -r Setup\Output\sqlite-netFx-source-%VERSION%.zip * -x@exclude_src.txt IF ERRORLEVEL 1 ( ECHO Failed to archive source files. Index: Setup/build.bat ================================================================== --- Setup/build.bat +++ Setup/build.bat @@ -49,10 +49,12 @@ SET TOOLS=%TOOLS:\\=\% %_VECHO% Tools = '%TOOLS%' IF EXIST "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" ( + CALL :fn_ResetErrorLevel + %_AECHO% Running "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat"... %_ECHO% CALL "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" IF ERRORLEVEL 1 ( ECHO File "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" failed. @@ -78,10 +80,22 @@ %_AECHO% Forcing the use of the .NET Framework 4.0... SET YEAR=2010 SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v4.0.30319 GOTO skip_netFxCheck ) + +IF DEFINED FRAMEWORKDIR ( + IF NOT EXIST "%FRAMEWORKDIR%" ( + CALL :fn_UnsetVariable FRAMEWORKDIR + ) +) + +IF DEFINED FRAMEWORKDIR ( + IF NOT EXIST "%FRAMEWORKDIR%\csc.exe" ( + CALL :fn_UnsetVariable FRAMEWORKDIR + ) +) IF NOT DEFINED FRAMEWORKDIR ( %_AECHO% Checking for the .NET Framework 4.0... SET YEAR=2010 SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v4.0.30319 Index: Setup/release.bat ================================================================== --- Setup/release.bat +++ Setup/release.bat @@ -141,10 +141,17 @@ :skip_mungeVersion %_VECHO% Version = '%VERSION%' CALL :fn_ResetErrorLevel + +%_ECHO% IF NOT EXIST Setup\Output MKDIR Setup\Output + +IF ERRORLEVEL 1 ( + ECHO Could not create directory "Setup\Output". + GOTO errors +) IF DEFINED CONFIGURATIONSUFFIX ( %_ECHO% zip.exe -j -r "Setup\Output\sqlite-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%-%YEAR%-%VERSION%.zip" "bin\%YEAR%\%BASE_CONFIGURATION%%CONFIGURATIONSUFFIX%\bin" -x @exclude_bin.txt ) ELSE ( %_ECHO% zip.exe -j -r "Setup\Output\sqlite-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%-%YEAR%-%VERSION%.zip" "bin\%YEAR%\%BASE_CONFIGURATION%\bin" -x @exclude_bin.txt Index: Setup/set_Release.bat ================================================================== --- Setup/set_Release.bat +++ Setup/set_Release.bat @@ -5,6 +5,6 @@ :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: -REM SET MSBUILD_ARGS=/property:TargetFrameworkVersion=v3.5 +REM SET MSBUILD_ARGS=/p:TargetFrameworkVersion=v3.5 /p:PlatformToolset=v100 Index: System.Data.SQLite.Linq/AssemblyInfo.cs ================================================================== --- System.Data.SQLite.Linq/AssemblyInfo.cs +++ System.Data.SQLite.Linq/AssemblyInfo.cs @@ -5,18 +5,21 @@ using System.Runtime.ConstrainedExecution; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("System.Data.SQLite.Linq")] -[assembly: AssemblyDescription("ADO.NET Entity Framework support for SQLite")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("http://system.data.sqlite.org")] +[assembly: AssemblyTitle("System.Data.SQLite for LINQ")] +[assembly: AssemblyDescription("ADO.NET Data Provider for SQLite")] +[assembly: AssemblyCompany("http://system.data.sqlite.org/")] [assembly: AssemblyProduct("System.Data.SQLite")] [assembly: AssemblyCopyright("Public Domain")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -32,7 +35,7 @@ // Revision // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.74.0")] -[assembly: AssemblyFileVersion("1.0.74.0")] +[assembly: AssemblyVersion("1.0.75.0")] +[assembly: AssemblyFileVersion("1.0.75.0")] ADDED System.Data.SQLite.Linq/SQL Generation/SkipClause.cs Index: System.Data.SQLite.Linq/SQL Generation/SkipClause.cs ================================================================== --- /dev/null +++ System.Data.SQLite.Linq/SQL Generation/SkipClause.cs @@ -0,0 +1,65 @@ +//--------------------------------------------------------------------- +// +// Portions of this file copyright (c) Microsoft Corporation +// and are released under the Microsoft Pulic License. See +// http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx +// or License.txt for details. +// All rights reserved. +// +//--------------------------------------------------------------------- + +namespace System.Data.SQLite +{ + using System.Globalization; + + ///

+ /// SkipClause represents the a SKIP expression in a SqlSelectStatement. + /// It has a count property, which indicates how many rows should be skipped. + ///

+ class SkipClause : ISqlFragment + { + ISqlFragment skipCount; + + ///

+ /// How many rows should be skipped. + ///

+ internal ISqlFragment SkipCount + { + get { return skipCount; } + } + + ///

+ /// Creates a SkipClause with the given skipCount. + ///

+ /// + internal SkipClause(ISqlFragment skipCount) + { + this.skipCount = skipCount; + } + + ///

+ /// Creates a SkipClause with the given skipCount. + ///

+ /// + internal SkipClause(int skipCount) + { + SqlBuilder sqlBuilder = new SqlBuilder(); + sqlBuilder.Append(skipCount.ToString(CultureInfo.InvariantCulture)); + this.skipCount = sqlBuilder; + } + + #region ISqlFragment Members + ///

+ /// Write out the SKIP part of sql select statement + /// It basically writes OFFSET (X). + ///

+ /// + /// + public void WriteSql(SqlWriter writer, SqlGenerator sqlGenerator) + { + writer.Write(" OFFSET "); + this.SkipCount.WriteSql(writer, sqlGenerator); + } + #endregion + } +} Index: System.Data.SQLite.Linq/SQL Generation/SqlChecker.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SqlChecker.cs +++ System.Data.SQLite.Linq/SQL Generation/SqlChecker.cs @@ -11,21 +11,31 @@ using System.Collections.Generic; using System.Data.Common.CommandTrees; internal class SqlChecker : DbExpressionVisitor { +#if false private static Type sql8rewriter; static SqlChecker() { - sql8rewriter = Type.GetType("System.Data.SqlClient.SqlGen.Sql8ExpressionRewriter, System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", false); + string version = +#if NET_20 + "3.5.0.0"; +#else + "4.0.0.0"; +#endif + + sql8rewriter = Type.GetType(String.Format("System.Data.SqlClient.SqlGen.Sql8ExpressionRewriter, System.Data.Entity, Version={0}, Culture=neutral, PublicKeyToken=b77a5c561934e089", version), false); } +#endif private SqlChecker() { } +#if false ///

/// SQLite doesn't support things like SKIP and a few other things. /// So determine if the query has to be rewritten ///

/// @@ -44,10 +54,11 @@ { tree = sql8rewriter.InvokeMember("Rewrite", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Static, null, null, new object[] { tree }) as DbQueryCommandTree; } return tree; } +#endif public override bool Visit(DbAndExpression expression) { return VisitBinaryExpression(expression); } Index: System.Data.SQLite.Linq/SQL Generation/SqlGenerator.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SqlGenerator.cs +++ System.Data.SQLite.Linq/SQL Generation/SqlGenerator.cs @@ -333,10 +333,11 @@ functionHandlers.Add("NewGuid", HandleCanonicalFunctionNewGuid); functionHandlers.Add("Round", HandleCanonicalFunctionRound); functionHandlers.Add("ToLower", HandleCanonicalFunctionToLower); functionHandlers.Add("ToUpper", HandleCanonicalFunctionToUpper); functionHandlers.Add("Trim", HandleCanonicalFunctionTrim); + functionHandlers.Add("Right", HandleCanonicalFunctionRight); functionHandlers.Add("CurrentDateTime", HandleGetDateFunction); functionHandlers.Add("CurrentUtcDateTime", HandleGetUtcDateFunction); //DatePartFunctions functionHandlers.Add("Year", HandleCanonicalFunctionDatepart); @@ -507,11 +508,14 @@ /// /// /// The string representing the SQL to be executed. private string GenerateSql(DbQueryCommandTree tree) { +#if false tree = SqlChecker.Rewrite(tree); +#endif + selectStatementStack = new Stack(); isParentAJoinStack = new Stack(); allExtentNames = new Dictionary(StringComparer.OrdinalIgnoreCase); allColumnNames = new Dictionary(StringComparer.OrdinalIgnoreCase); @@ -1805,12 +1809,34 @@ /// /// /// A public override ISqlFragment Visit(DbSkipExpression e) { - // Should never get here. The Sql2000 rewriter would've rewritten the command tree not to use this - throw new NotSupportedException(); + Debug.Assert(e.Count is DbConstantExpression || e.Count is DbParameterReferenceExpression, "DbLimitExpression.Count is of invalid expression type"); + + Symbol fromSymbol; + SqlSelectStatement result = VisitInputExpression(e.Input.Expression, e.Input.VariableName, e.Input.VariableType, out fromSymbol); + + if (!IsCompatible(result, e.ExpressionKind)) + { + result = CreateNewSelectStatement(result, e.Input.VariableName, e.Input.VariableType, out fromSymbol); + } + + selectStatementStack.Push(result); + symbolTable.EnterScope(); + + AddFromSymbol(result, e.Input.VariableName, fromSymbol); + + AddSortKeys(result.OrderBy, e.SortOrder); + + symbolTable.ExitScope(); + selectStatementStack.Pop(); + + ISqlFragment skipCount = HandleCountExpression(e.Count); + + result.Skip = new SkipClause(skipCount); + return result; } ///

/// ///

@@ -2916,10 +2942,33 @@ result.Append(")"); return result; } + + ///

+ /// RIGHT(string, length) -> SUBSTR(string, -(length), length) + ///

+ /// + /// + /// + private static ISqlFragment HandleCanonicalFunctionRight(SqlGenerator sqlgen, DbFunctionExpression e) + { + SqlBuilder result = new SqlBuilder(); + + result.Append("SUBSTR("); + + Debug.Assert(e.Arguments.Count == 2, "Right should have two arguments"); + result.Append(e.Arguments[0].Accept(sqlgen)); + result.Append(", -("); + result.Append(e.Arguments[1].Accept(sqlgen)); + result.Append("), "); + result.Append(e.Arguments[1].Accept(sqlgen)); + result.Append(")"); + + return result; + } ///

/// Function rename ToLower -> LOWER ///

/// Index: System.Data.SQLite.Linq/SQL Generation/SqlSelectStatement.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SqlSelectStatement.cs +++ System.Data.SQLite.Linq/SQL Generation/SqlSelectStatement.cs @@ -112,10 +112,21 @@ { Debug.Assert(top == null, "SqlSelectStatement.Top has already been set"); top = value; } } + + private SkipClause skip; + internal SkipClause Skip + { + get { return skip; } + set + { + Debug.Assert(skip == null, "SqlSelectStatement.Skip has already been set"); + skip = value; + } + } private SqlBuilder select = new SqlBuilder(); internal SqlBuilder Select { get { return select; } @@ -302,12 +313,16 @@ if (this.Top != null) { this.Top.WriteSql(writer, sqlGenerator); } + if (this.skip != null) + { + this.Skip.WriteSql(writer, sqlGenerator); + } --writer.Indent; } #endregion } } Index: System.Data.SQLite.Linq/SQL Generation/TopClause.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/TopClause.cs +++ System.Data.SQLite.Linq/SQL Generation/TopClause.cs @@ -65,11 +65,11 @@ #region ISqlFragment Members ///

/// Write out the TOP part of sql select statement - /// It basically writes TOP (X) [WITH TIES]. + /// It basically writes LIMIT (X). ///

/// /// public void WriteSql(SqlWriter writer, SqlGenerator sqlGenerator) { Index: System.Data.SQLite.Linq/System.Data.SQLite.Linq.2008.csproj ================================================================== --- System.Data.SQLite.Linq/System.Data.SQLite.Linq.2008.csproj +++ System.Data.SQLite.Linq/System.Data.SQLite.Linq.2008.csproj @@ -59,10 +59,11 @@ + Index: System.Data.SQLite.Linq/System.Data.SQLite.Linq.2010.csproj ================================================================== --- System.Data.SQLite.Linq/System.Data.SQLite.Linq.2010.csproj +++ System.Data.SQLite.Linq/System.Data.SQLite.Linq.2010.csproj @@ -58,10 +58,11 @@ + Index: System.Data.SQLite/AssemblyInfo.cs ================================================================== --- System.Data.SQLite/AssemblyInfo.cs +++ System.Data.SQLite/AssemblyInfo.cs @@ -10,18 +10,21 @@ #endif // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("System.Data.SQLite")] +[assembly: AssemblyTitle("System.Data.SQLite Core")] [assembly: AssemblyDescription("ADO.NET Data Provider for SQLite")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("http://system.data.sqlite.org")] +[assembly: AssemblyCompany("http://system.data.sqlite.org/")] [assembly: AssemblyProduct("System.Data.SQLite")] [assembly: AssemblyCopyright("Public Domain")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif #if PLATFORM_COMPACTFRAMEWORK && RETARGETABLE [assembly: AssemblyFlags(AssemblyNameFlags.Retargetable)] #endif @@ -52,9 +55,9 @@ // Build Number // Revision // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.74.0")] +[assembly: AssemblyVersion("1.0.75.0")] #if !PLATFORM_COMPACTFRAMEWORK -[assembly: AssemblyFileVersion("1.0.74.0")] +[assembly: AssemblyFileVersion("1.0.75.0")] #endif Index: System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs ================================================================== --- System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs +++ System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs @@ -19,10 +19,14 @@ private static Type _dbProviderServicesType; private static object _sqliteServices; static SQLiteFactory() { +#if !PLATFORM_COMPACTFRAMEWORK + SQLiteLog.Initialize(); +#endif + string version = #if NET_20 "3.5.0.0"; #else "4.0.0.0"; Index: System.Data.SQLite/SQLite3.cs ================================================================== --- System.Data.SQLite/SQLite3.cs +++ System.Data.SQLite/SQLite3.cs @@ -18,10 +18,14 @@ ///

/// This class implements SQLiteBase completely, and is the guts of the code that interop's SQLite with .NET ///

internal class SQLite3 : SQLiteBase { +#if !PLATFORM_COMPACTFRAMEWORK + internal const string DesignerVersion = "1.0.75.0"; +#endif + ///

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

protected SQLiteConnectionHandle _sql; protected string _fileName; @@ -93,10 +97,18 @@ get { return IsAutocommit(_sql); } } + + internal override long LastInsertRowId + { + get + { + return UnsafeNativeMethods.sqlite3_last_insert_rowid(_sql); + } + } internal override int Changes { get { @@ -112,10 +124,15 @@ internal override int Shutdown() { int rc = UnsafeNativeMethods.sqlite3_shutdown(); return rc; } + + internal override bool IsOpen() + { + return (_sql != null); + } internal override void Open(string strFilename, SQLiteOpenFlagsEnum flags, int maxPoolSize, bool usePool) { if (_sql != null) return; @@ -1026,7 +1043,12 @@ sortMode = 0; onError = 2; collationSequence = "BINARY"; #endif } + + internal override int FileControl(string zDbName, int op, IntPtr pArg) + { + return UnsafeNativeMethods.sqlite3_file_control(_sql, (zDbName != null) ? ToUTF8(zDbName) : null, op, pArg); + } } } Index: System.Data.SQLite/SQLiteBase.cs ================================================================== --- System.Data.SQLite/SQLiteBase.cs +++ System.Data.SQLite/SQLiteBase.cs @@ -22,19 +22,28 @@ ///

/// Returns a string representing the active version of SQLite ///

internal abstract string Version { get; } + ///

+ /// Returns the rowid of the most recent successful INSERT into the database from this connection. + ///

+ internal abstract long LastInsertRowId { get; } ///

/// Returns the number of changes the last executing insert/update caused. ///

internal abstract int Changes { get; } ///

/// Shutdown the SQLite engine so that it can be restarted with different config options. /// We depend on auto initialization to recover. ///

internal abstract int Shutdown(); + ///

+ /// Returns non-zero if a database connection is open. + ///

+ /// + internal abstract bool IsOpen(); ///

/// Opens a database. ///

/// /// Implementers should call SQLiteFunction.BindFunctions() and save the array after opening a connection @@ -197,10 +206,12 @@ internal abstract bool AutoCommit { get; } + + internal abstract int FileControl(string zDbName, int op, IntPtr pArg); protected virtual void Dispose(bool bDisposing) { } Index: System.Data.SQLite/SQLiteCommand.cs ================================================================== --- System.Data.SQLite/SQLiteCommand.cs +++ System.Data.SQLite/SQLiteCommand.cs @@ -15,11 +15,11 @@ ///

/// SQLite implementation of DbCommand. ///

#if !PLATFORM_COMPACTFRAMEWORK - [Designer("SQLite.Designer.SQLiteCommandDesigner, SQLite.Designer, Version=1.0.38.1, Culture=neutral, PublicKeyToken=db937bc2d44ff139"), ToolboxItem(true)] + [Designer("SQLite.Designer.SQLiteCommandDesigner, SQLite.Designer, Version=" + SQLite3.DesignerVersion + ", Culture=neutral, PublicKeyToken=db937bc2d44ff139"), ToolboxItem(true)] #endif public sealed class SQLiteCommand : DbCommand, ICloneable { ///

/// The command text this command is based on Index: System.Data.SQLite/SQLiteConnection.cs ================================================================== --- System.Data.SQLite/SQLiteConnection.cs +++ System.Data.SQLite/SQLiteConnection.cs @@ -150,10 +150,12 @@ /// /// /// public sealed partial class SQLiteConnection : DbConnection, ICloneable { + private const int SQLITE_FCNTL_WIN32_AV_RETRY = 9; + private const string _dataDirectory = "|DataDirectory|"; private const string _masterdb = "sqlite_master"; private const string _tempmasterdb = "sqlite_temp_master"; ///

@@ -232,10 +234,14 @@ /// Initializes the connection with the specified connection string ///

/// The connection string to use on the connection public SQLiteConnection(string connectionString) { +#if !PLATFORM_COMPACTFRAMEWORK + SQLiteLog.Initialize(); +#endif + _connectionState = ConnectionState.Closed; _connectionString = ""; //_commandList = new List(); if (connectionString != null) @@ -604,11 +610,11 @@ /// /// /// #if !PLATFORM_COMPACTFRAMEWORK [RefreshProperties(RefreshProperties.All), DefaultValue("")] - [Editor("SQLite.Designer.SQLiteConnectionStringEditor, SQLite.Designer, Version=1.0.38.1, Culture=neutral, PublicKeyToken=db937bc2d44ff139", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [Editor("SQLite.Designer.SQLiteConnectionStringEditor, SQLite.Designer, Version=" + SQLite3.DesignerVersion + ", Culture=neutral, PublicKeyToken=db937bc2d44ff139", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] #endif public override string ConnectionString { get { @@ -657,11 +663,11 @@ return _dataSource; } } ///

- /// Returns an empty string + /// Returns the string "main". ///

#if !PLATFORM_COMPACTFRAMEWORK [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] #endif public override string Database @@ -719,18 +725,20 @@ /// Manual distributed transaction enlistment support ///

/// The distributed transaction to enlist in public override void EnlistTransaction(System.Transactions.Transaction transaction) { - if (_transactionLevel > 0 && transaction != null) - throw new ArgumentException("Unable to enlist in transaction, a local transaction already exists"); - if (_enlistment != null && transaction == _enlistment._scope) return; else if (_enlistment != null) throw new ArgumentException("Already enlisted in a transaction"); + 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); } #endif ///

@@ -957,10 +965,45 @@ // throw new InvalidOperationException(); //return _sql.Version; } } + + ///

+ /// Returns the rowid of the most recent successful INSERT into the database from this connection. + ///

+#if !PLATFORM_COMPACTFRAMEWORK + [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] +#endif + public long LastInsertRowId + { + get + { + if (_sql == null) + throw new InvalidOperationException("Database connection not valid for getting last insert rowid."); + + return _sql.LastInsertRowId; + } + } + + ///

+ /// Returns the number of rows changed by the last INSERT, UPDATE, or DELETE statement executed on + /// this connection. + ///

+#if !PLATFORM_COMPACTFRAMEWORK + [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] +#endif + public int Changes + { + get + { + if (_sql == null) + throw new InvalidOperationException("Database connection not valid for getting number of changes."); + + return _sql.Changes; + } + } ///

/// Returns the version of the underlying SQLite database engine ///

public static string SQLiteVersion @@ -1082,10 +1125,54 @@ if (databasePassword != null) if (databasePassword.Length == 0) databasePassword = null; _password = databasePassword; } + + ///

+ /// Queries or modifies the number of retries or the retry interval (in milliseconds) for + /// certain I/O operations that may fail due to anti-virus software. + ///

+ /// The number of times to retry the I/O operation. A negative value + /// will cause the current count to be queried and replace that negative value. + /// The number of milliseconds to wait before retrying the I/O + /// operation. This number is multiplied by the number of retry attempts so far to come + /// up with the final number of milliseconds to wait. A negative value will cause the + /// current interval to be queried and replace that negative value. + /// Zero for success, non-zero for error. + public int SetAvRetry(ref int count, ref int interval) + { + if (_connectionState != ConnectionState.Open) + throw new InvalidOperationException( + "Database must be opened before changing the AV retry parameters."); + + int rc; + IntPtr pArg = IntPtr.Zero; + + try + { + pArg = Marshal.AllocHGlobal(sizeof(int) * 2); + + Marshal.WriteInt32(pArg, 0, count); + Marshal.WriteInt32(pArg, sizeof(int), interval); + + rc = _sql.FileControl(null, SQLITE_FCNTL_WIN32_AV_RETRY, pArg); + + if (rc == 0) + { + count = Marshal.ReadInt32(pArg, 0); + interval = Marshal.ReadInt32(pArg, sizeof(int)); + } + } + finally + { + if (pArg != IntPtr.Zero) + Marshal.FreeHGlobal(pArg); + } + + return rc; + } ///

/// Expand the filename of the data source, resolving the |DataDirectory| macro as appropriate. ///

/// The database filename to expand @@ -2152,10 +2239,13 @@ tbl.Columns.Add("FKEY_FROM_ORDINAL_POSITION", typeof(int)); tbl.Columns.Add("FKEY_TO_CATALOG", typeof(string)); tbl.Columns.Add("FKEY_TO_SCHEMA", typeof(string)); tbl.Columns.Add("FKEY_TO_TABLE", typeof(string)); tbl.Columns.Add("FKEY_TO_COLUMN", typeof(string)); + tbl.Columns.Add("FKEY_ON_UPDATE", typeof(string)); + tbl.Columns.Add("FKEY_ON_DELETE", typeof(string)); + tbl.Columns.Add("FKEY_MATCH", typeof(string)); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; @@ -2189,10 +2279,13 @@ row["FKEY_FROM_COLUMN"] = builder.UnquoteIdentifier(rdKey[3].ToString()); row["FKEY_TO_CATALOG"] = strCatalog; row["FKEY_TO_TABLE"] = builder.UnquoteIdentifier(rdKey[2].ToString()); row["FKEY_TO_COLUMN"] = builder.UnquoteIdentifier(rdKey[4].ToString()); row["FKEY_FROM_ORDINAL_POSITION"] = rdKey[1]; + row["FKEY_ON_UPDATE"] = (rdKey.FieldCount > 5) ? rdKey[5] : String.Empty; + row["FKEY_ON_DELETE"] = (rdKey.FieldCount > 6) ? rdKey[6] : String.Empty; + row["FKEY_MATCH"] = (rdKey.FieldCount > 7) ? rdKey[7] : String.Empty; if (String.IsNullOrEmpty(strKeyName) || String.Compare(strKeyName, row["CONSTRAINT_NAME"].ToString(), StringComparison.OrdinalIgnoreCase) == 0) tbl.Rows.Add(row); } } Index: System.Data.SQLite/SQLiteConnectionStringBuilder.cs ================================================================== --- System.Data.SQLite/SQLiteConnectionStringBuilder.cs +++ System.Data.SQLite/SQLiteConnectionStringBuilder.cs @@ -390,12 +390,12 @@ } ///

/// Gets/Sets the datetime format for the connection. ///

- [Browsable(true)] - [DefaultValue(SQLiteDateFormats.ISO8601)] + [Browsable(true)] + [DefaultValue(SQLiteDateFormats.Default)] public SQLiteDateFormats DateTimeFormat { get { object value; Index: System.Data.SQLite/SQLiteConvert.cs ================================================================== --- System.Data.SQLite/SQLiteConvert.cs +++ System.Data.SQLite/SQLiteConvert.cs @@ -740,17 +740,21 @@ ///

/// Using ticks is not recommended and is not well supported with LINQ. ///

Ticks = 0, ///

- /// The default format for this provider. + /// The ISO8601 format ///

ISO8601 = 1, ///

/// JulianDay format, which is what SQLite uses internally ///

- JulianDay = 2 + JulianDay = 2, + ///

+ /// The default format for this provider. + ///

+ Default = ISO8601 } ///

/// This enum determines how SQLite treats its journal file. ///

Index: System.Data.SQLite/SQLiteDataAdapter.cs ================================================================== --- System.Data.SQLite/SQLiteDataAdapter.cs +++ System.Data.SQLite/SQLiteDataAdapter.cs @@ -14,11 +14,11 @@ ///

/// SQLite implementation of DbDataAdapter. ///

#if !PLATFORM_COMPACTFRAMEWORK [DefaultEvent("RowUpdated")] - [ToolboxItem("SQLite.Designer.SQLiteDataAdapterToolboxItem, SQLite.Designer, Version=1.0.38.1, Culture=neutral, PublicKeyToken=db937bc2d44ff139")] + [ToolboxItem("SQLite.Designer.SQLiteDataAdapterToolboxItem, SQLite.Designer, Version=" + SQLite3.DesignerVersion + ", Culture=neutral, PublicKeyToken=db937bc2d44ff139")] [Designer("Microsoft.VSDesigner.Data.VS.SqlDataAdapterDesigner, Microsoft.VSDesigner, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] #endif public sealed class SQLiteDataAdapter : DbDataAdapter { private static object _updatingEventPH = new object(); Index: System.Data.SQLite/SQLiteDataReader.cs ================================================================== --- System.Data.SQLite/SQLiteDataReader.cs +++ System.Data.SQLite/SQLiteDataReader.cs @@ -882,11 +882,11 @@ SQLiteStatement stmt = null; int fieldCount; while (true) { - if (_activeStatement != null && _activeStatement._sql != null && stmt == null) + if (stmt == null && _activeStatement != null && _activeStatement._sql != null && _activeStatement._sql.IsOpen()) { // Reset the previously-executed statement _activeStatement._sql.Reset(_activeStatement); // If we're only supposed to return a single rowset, step through all remaining statements once until Index: System.Data.SQLite/SQLiteFactory.cs ================================================================== --- System.Data.SQLite/SQLiteFactory.cs +++ System.Data.SQLite/SQLiteFactory.cs @@ -7,96 +7,27 @@ namespace System.Data.SQLite { using System; using System.Data.Common; - - ///

- /// Passed during an Log callback - ///

- public class LogEventArgs : EventArgs - { - ///

- /// The error code. - ///

- public readonly int ErrorCode; - - ///

- /// SQL statement text as the statement first begins executing - ///

- public readonly string Message; - - internal LogEventArgs(IntPtr puser, int err_code, string message) - { - // puser should be NULL - ErrorCode = err_code; - Message = message; - } - } - - ///

- /// Raised when a log event occurs. - ///

- /// The current connection - /// Event arguments of the trace - public delegate void SQLiteLogEventHandler(object sender, LogEventArgs e); - #if !PLATFORM_COMPACTFRAMEWORK ///

/// SQLite implementation of DbProviderFactory. ///

public sealed partial class SQLiteFactory : DbProviderFactory { - ///

- /// Member variable to store the application log handler to call. - ///

- internal event SQLiteLogEventHandler _logHandler; - ///

- /// The log callback passed to SQLite engine. - ///

- private SQLiteLogCallback _logCallback; - ///

- /// The base SQLite object to interop with. - ///

- internal SQLiteBase _sql; - ///

/// 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. + /// application. This event is provided for backward compatibility only. + /// New code should use the SQLiteLog class instead. ///

public event SQLiteLogEventHandler Log { - add - { - // Remove any copies of this event handler from registered list. - // This essentially means that a handler will be called only once - // no matter how many times it is added. - _logHandler -= value; - // add this to the list of event handlers - _logHandler += value; - } - remove - { - _logHandler -= value; - } - } - - ///

- /// Internal proxy function that calls any registered application log - /// event handlers. - ///

- private void LogCallback(IntPtr puser, int err_code, IntPtr message) - { - // if there are any registered event handlers - if (_logHandler != null) - // call them - _logHandler(this, - new LogEventArgs(puser, - err_code, - SQLiteBase.UTF8ToString(message, -1))); + add { SQLiteLog.Log += value; } + remove { SQLiteLog.Log -= value; } } /// /// Constructs a new SQLiteFactory object /// @@ -103,28 +34,14 @@ ///

/// Default constructor ///

public SQLiteFactory() { - if (_sql == null) - { - _sql = new SQLite3(SQLiteDateFormats.ISO8601); - if (_sql != null) - { - // Create a single "global" callback to register with SQLite. - // This callback will pass the event on to any registered - // handler. We only want to do this once. - if (_logCallback == null) - { - _logCallback = new SQLiteLogCallback(LogCallback); - if (_logCallback != null) - { - _sql.SetLogCallback(_logCallback); - } - } - } - } + // + // NOTE: Do nothing here now. All the logging setup related code has + // been moved to the new SQLiteLog static class. + // } ///

/// Static instance member which returns an instanced SQLiteFactory class. ///

ADDED System.Data.SQLite/SQLiteLog.cs Index: System.Data.SQLite/SQLiteLog.cs ================================================================== --- /dev/null +++ System.Data.SQLite/SQLiteLog.cs @@ -0,0 +1,305 @@ +/******************************************************** + * ADO.NET 2.0 Data Provider for SQLite Version 3.X + * Written by Robert Simpson (robert@blackcastlesoft.com) + * + * Released to the public domain, use at your own risk! + ********************************************************/ + +namespace System.Data.SQLite +{ + using System; + using System.Data.Common; + using System.Diagnostics; + + ///

+ /// Passed during an Log callback + ///

+ public class LogEventArgs : EventArgs + { + ///

+ /// The error code. + ///

+ public readonly int ErrorCode; + + ///

+ /// SQL statement text as the statement first begins executing + ///

+ public readonly string Message; + + ///

+ /// Extra data associated with this event, if any. + ///

+ public readonly object Data; + + ///

+ /// Constructs the LogEventArgs object. + ///

+ /// Should be null. + /// The SQLite error code. + /// The error message, if any. + /// The extra data, if any. + internal LogEventArgs( + IntPtr pUserData, + int errorCode, + string message, + object data + ) + { + ErrorCode = errorCode; + Message = message; + Data = data; + } + } + + /////////////////////////////////////////////////////////////////////////// + + ///

+ /// Raised when a log event occurs. + ///

+ /// The current connection + /// Event arguments of the trace + public delegate void SQLiteLogEventHandler(object sender, LogEventArgs e); + + /////////////////////////////////////////////////////////////////////////// + +#if !PLATFORM_COMPACTFRAMEWORK + ///

+ /// Manages the SQLite custom logging functionality and the associated + /// callback for the whole process. + ///

+ public static class SQLiteLog + { + ///

+ /// Object used to synchronize access to the static instance data + /// for this class. + ///

+ private static object syncRoot = new object(); + + ///

+ /// Member variable to store the application log handler to call. + ///

+ private static event SQLiteLogEventHandler _handlers; + + ///

+ /// The default log event handler. + ///

+ private static SQLiteLogEventHandler _defaultHandler; + + ///

+ /// The log callback passed to native SQLite engine. This must live + /// as long as the SQLite library has a pointer to it. + ///

+ private static SQLiteLogCallback _callback; + + ///

+ /// The base SQLite object to interop with. + ///

+ private static SQLiteBase _sql; + + ///

+ /// This will be non-zero if logging is currently enabled. + ///

+ private static bool _enabled; + + ///

+ /// Initializes the SQLite logging facilities. + ///

+ public static void Initialize() + { + lock (syncRoot) + { + // + // NOTE: Add an event handler for the DomainUnload event so + // that we can unhook our logging managed function + // pointer from the native SQLite code prior to it + // being invalidated. + // + AppDomain.CurrentDomain.DomainUnload += + new EventHandler(DomainUnload); + + // + // NOTE: Create an instance of the SQLite wrapper class. + // + if (_sql == null) + _sql = new SQLite3(SQLiteDateFormats.Default); + + // + // NOTE: Create a single "global" (i.e. per-process) callback + // to register with SQLite. This callback will pass the + // event on to any registered handler. We only want to + // do this once. + // + if (_callback == null) + { + _callback = new SQLiteLogCallback(LogCallback); + + int rc = _sql.SetLogCallback(_callback); + + if (rc != 0) + throw new SQLiteException(rc, + "Failed to initialize logging."); + } + + // + // NOTE: Logging is enabled by default. + // + _enabled = true; + + // + // NOTE: For now, always setup the default log event handler. + // + AddDefaultHandler(); + } + } + + ///

+ /// Handles the AppDomain being unloaded. + ///

+ /// + /// + private static void DomainUnload( + object sender, + EventArgs e + ) + { + // + // BUGBUG: This will cause serious problems if other AppDomains + // have any open SQLite connections; however, there is + // currently no way around this limitation. + // + if (_sql != null) + { + int rc = _sql.Shutdown(); + + if (rc != 0) + throw new SQLiteException(rc, + "Failed to shutdown interface."); + + rc = _sql.SetLogCallback(null); + + if (rc != 0) + throw new SQLiteException(rc, + "Failed to shutdown logging."); + } + } + + ///

+ /// 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. + ///

+ public static event SQLiteLogEventHandler Log + { + add + { + lock (syncRoot) + { + // Remove any copies of this event handler from registered + // list. This essentially means that a handler will be + // called only once no matter how many times it is added. + _handlers -= value; + + // Add this to the list of event handlers. + _handlers += value; + } + } + remove + { + lock (syncRoot) + { + _handlers -= value; + } + } + } + + ///

+ /// If this property is true, logging is enabled; otherwise, logging is + /// disabled. When logging is disabled, no logging events will fire. + ///

+ public static bool Enabled + { + get { lock (syncRoot) { return _enabled; } } + set { lock (syncRoot) { _enabled = value; } } + } + + ///

+ /// Creates and initializes the default log event handler. + ///

+ private static void InitializeDefaultHandler() + { + lock (syncRoot) + { + if (_defaultHandler == null) + _defaultHandler = new SQLiteLogEventHandler(LogEventHandler); + } + } + + ///

+ /// Adds the default log event handler to the list of handlers. + ///

+ public static void AddDefaultHandler() + { + InitializeDefaultHandler(); + Log += _defaultHandler; + } + + ///

+ /// Removes the default log event handler from the list of handlers. + ///

+ public static void RemoveDefaultHandler() + { + InitializeDefaultHandler(); + Log -= _defaultHandler; + } + + ///

+ /// Internal proxy function that calls any registered application log + /// event handlers. + ///

+ private static void LogCallback( + IntPtr pUserData, + int errorCode, + IntPtr pMessage + ) + { + bool enabled; + SQLiteLogEventHandler handlers; + + lock (syncRoot) + { + enabled = _enabled; + handlers = _handlers; + } + + if (enabled && (handlers != null)) + handlers(null, new LogEventArgs(pUserData, errorCode, + SQLiteBase.UTF8ToString(pMessage, -1), null)); + } + + ///

+ /// Default logger. Currently, uses the Trace class (i.e. sends events + /// to the current trace listeners, if any). + ///

+ /// Should be null. + /// The data associated with this event. + private static void LogEventHandler( + object sender, + LogEventArgs e + ) + { + if (e == null) + return; + + string message = e.Message; + + if (message == null) + message = ""; + else if (message.Length == 0) + message = ""; + + Trace.WriteLine(String.Format("SQLite error ({0}): {1}", + e.ErrorCode, message)); + } + } +#endif +} Index: System.Data.SQLite/System.Data.SQLite.Files.targets ================================================================== --- System.Data.SQLite/System.Data.SQLite.Files.targets +++ System.Data.SQLite/System.Data.SQLite.Files.targets @@ -37,10 +37,11 @@ + Index: System.Data.SQLite/UnsafeNativeMethods.cs ================================================================== --- System.Data.SQLite/UnsafeNativeMethods.cs +++ System.Data.SQLite/UnsafeNativeMethods.cs @@ -23,17 +23,17 @@ #if !SQLITE_STANDARD #if !USE_INTEROP_DLL #if !PLATFORM_COMPACTFRAMEWORK - private const string SQLITE_DLL = "System.Data.SQLite.DLL"; + private const string SQLITE_DLL = "System.Data.SQLite.dll"; #else - internal const string SQLITE_DLL = "SQLite.Interop.074.DLL"; + internal const string SQLITE_DLL = "SQLite.Interop.075.dll"; #endif // PLATFORM_COMPACTFRAMEWORK #else - private const string SQLITE_DLL = "SQLite.Interop.DLL"; + private const string SQLITE_DLL = "SQLite.Interop.dll"; #endif // USE_INTEROP_DLL #else private const string SQLITE_DLL = "sqlite3"; #endif @@ -356,10 +356,17 @@ #else [DllImport(SQLITE_DLL)] #endif internal static extern void sqlite3_interrupt(IntPtr db); +#if !PLATFORM_COMPACTFRAMEWORK + [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] +#else + [DllImport(SQLITE_DLL)] +#endif + internal static extern long sqlite3_last_insert_rowid(IntPtr db); + #if !PLATFORM_COMPACTFRAMEWORK [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] #else [DllImport(SQLITE_DLL)] #endif @@ -740,10 +747,17 @@ #else [DllImport(SQLITE_DLL)] #endif internal static extern void sqlite3_log(int iErrCode, byte[] zFormat); +#if !PLATFORM_COMPACTFRAMEWORK + [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)] +#else + [DllImport(SQLITE_DLL)] +#endif + internal static extern int sqlite3_file_control(IntPtr db, byte[] zDbName, int op, IntPtr pArg); + #endregion } #if PLATFORM_COMPACTFRAMEWORK internal abstract class CriticalHandle : IDisposable Index: Tests/all.eagle ================================================================== --- Tests/all.eagle +++ Tests/all.eagle @@ -25,12 +25,11 @@ # NOTE: Pre-load the assembly and the necessary helper procedures now, so that # they do not count as being "leaked" (i.e. the test framework has no way # to know who procedures actually belong to). # source [file join $path common.eagle] -tryLoadAssembly System.Data.SQLite.dll -tryLoadAssembly System.Data.SQLite.Linq.dll +runSQLiteTestPrologue ############################################################################### set no(prologue.eagle) true set no(epilogue.eagle) true @@ -67,6 +66,7 @@ if {[array size no] == 0} then {unset no} ############################################################################### +runSQLiteTestEpilogue runTestEpilogue Index: Tests/basic.eagle ================================================================== --- Tests/basic.eagle +++ Tests/basic.eagle @@ -14,23 +14,23 @@ runTestPrologue ############################################################################### source [file join $path common.eagle] -tryLoadAssembly System.Data.SQLite.dll -tryLoadAssembly System.Data.SQLite.Linq.dll +runSQLiteTestPrologue ############################################################################### # # NOTE: Setup the variables that refer to the various files required by the # tests in this file. # set testExeFile [getBuildFileName test.exe] set testLinqExeFile [getBuildFileName testlinq.exe] -set northwindEfDbFile [getBuildFileName northwindEF.db] -set testLinqOutFile [file join $path testlinq.out] +set testLinqOutFile [file nativename [file join $path testlinq.out]] +set northwindEfDbFile [file nativename [file join [file dirname $path] \ + testlinq northwindEF.db]] # # NOTE: Setup the test constraints specific to the tests in this file. # if {![haveConstraint file_[file tail $testExeFile]]} then { @@ -49,59 +49,68 @@ checkForFile $test_channel $testLinqOutFile } ############################################################################### -runTest {test basic-1.1 {unit tests from the 'test' project} -body { +runTest {test basic-1.1 {unit tests from the 'test' project} -setup { + catch {file delete [file join [file dirname $testExeFile] Test.db3]} +} -body { set code [catch { testExec $testExeFile [list -eventflags Wait -directory \ - [file dirname $northwindEfDbFile] -stdout output -success 0] -autoRun + [file dirname $testExeFile] -stdout output -success 0] -autoRun } error] tlog "---- BEGIN STDOUT OUTPUT\n" tlog $output tlog "\n---- END STDOUT OUTPUT\n" list $code [expr {$code == 0 ? "" : $error}] } -cleanup { unset -nocomplain code output error -} -constraints {eagle System.Data.SQLite file_test.exe} -result {0 {}}} +} -constraints {eagle file_test.exe} -result {0 {}}} ############################################################################### runTest {test basic-1.2 {unit tests from the 'testlinq' project} -setup { + # + # NOTE: Re-copy the reference database file used for this unit test to the + # build directory in case it has been changed by a previous test run. + # + file copy -force $northwindEfDbFile \ + [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + # # NOTE: We need to make 100% sure that the console output encoding is the # same as when the 'testlinq.out' file was created. # set savedEncoding [object invoke Console OutputEncoding] + set encoding [object invoke System.Text.Encoding GetEncoding Windows-1252] - object invoke Console OutputEncoding \ - [object invoke System.Text.Encoding GetEncoding Windows-1252] + object invoke Console OutputEncoding $encoding } -body { set code [catch { testExec $testLinqExeFile [list -eventflags Wait -directory \ - [file dirname $northwindEfDbFile] -stdout output -success 0] -autoRun + [file dirname $testLinqExeFile] -stdout output -success 0] } error] tlog "---- BEGIN STDOUT OUTPUT\n" tlog $output tlog "\n---- END STDOUT OUTPUT\n" list $code [string equal $output [readFile $testLinqOutFile]] \ [expr {$code == 0 ? "" : $error}] } -cleanup { - object invoke Console OutputEncoding $savedEncoding + catch {object invoke Console OutputEncoding $savedEncoding} - unset -nocomplain code output error savedEncoding -} -constraints {eagle System.Data.SQLite file_testlinq.exe file_northwindEF.db\ -file_testlinq.out} -result {0 True {}}} + unset -nocomplain code output error savedEncoding encoding +} -constraints {eagle file_testlinq.exe file_northwindEF.db file_testlinq.out} \ +-result {0 True {}}} ############################################################################### runTest {test basic-1.3 {SELECT scalar/reader, CREATE, INSERT} -setup { - setupDb [set fileName basic-1.1.db] + setupDb [set fileName basic-1.3.db] } -body { set result [list] lappend result [sql execute -execute scalar $db \ "SELECT sqlite_source_id();"] @@ -124,10 +133,514 @@ -match regexp -result {^\{\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [0-9a-f]{40}\}\ \{1 \{\{x 1\} \{y foo\} \{z 1234\}\}\} \{count 1\} \{names \{x y z\}\}$}} ############################################################################### +runTest {test basic-1.4 {GetSchema with ReservedWords} -setup { + setupDb [set fileName basic-1.4.db] +} -body { + set id [object invoke Interpreter.GetActive NextId] + set dataSource [file join [getTemporaryPath] basic-1.4.db] + + unset -nocomplain results errors + + set code [compileCSharpWith [subst { + using System.Data; + using System.Data.SQLite; + + namespace _Dynamic${id} + { + public class Test${id} + { + public static DataTable GetReservedWords() + { + using (SQLiteConnection connection = new SQLiteConnection( + "Data Source=${dataSource};")) + { + connection.Open(); + + return connection.GetSchema("ReservedWords"); + } + } + + public static void Main() + { + // do nothing. + } + } + } + }] results errors System.Data.SQLite.dll] + + list $code $results \ + [expr {[info exists errors] ? $errors : ""}] \ + [expr {$code eq "Ok" ? [catch { + object invoke _Dynamic${id}.Test${id} GetReservedWords + } result] : [set result ""]}] $result +} -cleanup { + cleanupDb $fileName + unset -nocomplain result results errors code dataSource id db fileName +} -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ +-match regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\ +System#Data#DataTable#\d+$}} + +############################################################################### + +runTest {test basic-1.5 {GetSchema with ForeignKeys} -setup { + setupDb [set fileName basic-1.5.db] +} -body { + sql execute $db { + CREATE TABLE t1( + x INTEGER REFERENCES t2 MATCH FULL + ON UPDATE SET DEFAULT ON DELETE CASCADE + DEFAULT 1 + ); + } + + sql execute $db "CREATE TABLE t2(x INTEGER REFERENCES t3);" + + set id [object invoke Interpreter.GetActive NextId] + set dataSource [file join [getTemporaryPath] basic-1.5.db] + + unset -nocomplain results errors + + set code [compileCSharpWith [subst { + using System.Data; + using System.Data.SQLite; + + namespace _Dynamic${id} + { + public class Test${id} + { + public static DataRowCollection GetForeignKeys() + { + using (SQLiteConnection connection = new SQLiteConnection( + "Data Source=${dataSource};")) + { + connection.Open(); + + return connection.GetSchema("ForeignKeys").Rows; + } + } + + public static void Main() + { + // do nothing. + } + } + } + }] results errors System.Data.SQLite.dll] + + list $code $results \ + [expr {[info exists errors] ? $errors : ""}] \ + [expr {$code eq "Ok" ? [catch { + set rows [list] + set foreignKeys [object invoke _Dynamic${id}.Test${id} GetForeignKeys] + + object foreach -alias foreignKey $foreignKeys { + lappend rows [list \ + [$foreignKey Item CONSTRAINT_CATALOG] \ + [$foreignKey Item CONSTRAINT_NAME] \ + [$foreignKey Item TABLE_CATALOG] \ + [$foreignKey Item TABLE_NAME] \ + [$foreignKey Item CONSTRAINT_TYPE] \ + [$foreignKey Item IS_DEFERRABLE] \ + [$foreignKey Item INITIALLY_DEFERRED] \ + [$foreignKey Item FKEY_FROM_COLUMN] \ + [$foreignKey Item FKEY_TO_CATALOG] \ + [$foreignKey Item FKEY_TO_TABLE] \ + [$foreignKey Item FKEY_TO_COLUMN] \ + [$foreignKey Item FKEY_FROM_ORDINAL_POSITION] \ + [$foreignKey Item FKEY_ON_UPDATE] \ + [$foreignKey Item FKEY_ON_DELETE] \ + [$foreignKey Item FKEY_MATCH]] + } + + set rows + } result] : [set result ""]}] $result +} -cleanup { + cleanupDb $fileName + + unset -nocomplain result rows foreignKey foreignKeys results errors code \ + dataSource id db fileName +} -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ +-match regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\ +\{\{main FK_t1_0 main t1 \{FOREIGN KEY\} False False x main t2 \{\} 0 \{SET\ +DEFAULT\} CASCADE NONE\} \{main FK_t2_0 main t2 \{FOREIGN KEY\} False False x\ +main t3 \{\} 0 \{NO ACTION\} \{NO ACTION\} NONE\}\}$}} + +############################################################################### + +runTest {test basic-1.6 {SQLITE_FCNTL_WIN32_AV_RETRY} -setup { + setupDb [set fileName basic-1.6.db] +} -body { + set id [object invoke Interpreter.GetActive NextId] + set dataSource [file join [getTemporaryPath] basic-1.6.db] + + unset -nocomplain results errors + + set code [compileCSharpWith [subst { + using System.Data; + using System.Data.SQLite; + + namespace _Dynamic${id} + { + public class Test${id} + { + public static bool TestSetAvRetry( + ref int count, + ref int interval + ) + { + using (SQLiteConnection connection = new SQLiteConnection( + "Data Source=${dataSource};")) + { + connection.Open(); + + // + // NOTE: Set the requested retry parameter values. + // + if (connection.SetAvRetry(ref count, ref interval) != 0) + return false; + + // + // NOTE: Query the retry parameter values. + // + int newCount = -1; int newInterval = -1; + + if (connection.SetAvRetry(ref newCount, ref newInterval) != 0) + return false; + + // + // NOTE: Make sure the retry parameter values were set. + // + return (newCount == count && newInterval == interval); + } + } + + public static void Main() + { + // do nothing. + } + } + } + }] results errors System.Data.SQLite.dll] + + list $code $results \ + [expr {[info exists errors] ? $errors : ""}] \ + [expr {$code eq "Ok" ? [catch { + set savedCount -1; set savedInterval -1 + + object invoke _Dynamic${id}.Test${id} TestSetAvRetry \ + savedCount savedInterval + + set count 5; set interval 50 + + object invoke _Dynamic${id}.Test${id} TestSetAvRetry \ + count interval + } result] : [set result ""]}] $result +} -cleanup { + if {[info exists savedCount]} then { + # + # NOTE: Restore the saved retry count, if possible. + # + catch { + set interval -1 + object invoke _Dynamic${id}.Test${id} TestSetAvRetry savedCount interval + } + } + + if {[info exists savedInterval]} then { + # + # NOTE: Restore the saved retry interval, if possible. + # + catch { + set count -1 + object invoke _Dynamic${id}.Test${id} TestSetAvRetry count savedInterval + } + } + + cleanupDb $fileName + + unset -nocomplain result count interval savedCount savedInterval results \ + errors code dataSource id db fileName +} -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ +-match regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\ +True$}} + +############################################################################### + +runTest {test basic-1.7 {properly closed database file (non-query)} -setup { + set fileName basic-1.7.db +} -body { + set id [object invoke Interpreter.GetActive NextId] + set dataSource [file join [getTemporaryPath] $fileName] + + set sql { \ + BEGIN EXCLUSIVE TRANSACTION; \ + CREATE TABLE t1(x INTEGER); \ + INSERT INTO t1 (x) VALUES(1); \ + SELECT * FROM t1; \ + } + + unset -nocomplain results errors + + set code [compileCSharpWith [subst { + using System.Data; + using System.Data.SQLite; + + namespace _Dynamic${id} + { + public class Test${id} + { + public static void Main() + { + using (SQLiteConnection connection = new SQLiteConnection( + "Data Source=${dataSource};")) + { + connection.Open(); + + using (SQLiteCommand command = new SQLiteCommand("${sql}", + connection)) + { + command.ExecuteNonQuery(); + } + } + } + } + } + }] results errors System.Data.SQLite.dll] + + list $code $results \ + [expr {[info exists errors] ? $errors : ""}] \ + [expr {$code eq "Ok" ? [catch { + object invoke _Dynamic${id}.Test${id} Main + } result] : [set result ""]}] $result \ + [close [open $dataSource RDONLY 0 "" -share None]] +} -cleanup { + cleanupDb $fileName + + unset -nocomplain result results errors code sql dataSource id db fileName +} -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ +-match regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\ +\{\} \{\}$}} + +############################################################################### + +runTest {test basic-1.8 {properly closed database file (reader #1)} -setup { + set fileName basic-1.8.db +} -body { + set id [object invoke Interpreter.GetActive NextId] + set dataSource [file join [getTemporaryPath] $fileName] + + set sql { \ + BEGIN EXCLUSIVE TRANSACTION; \ + CREATE TABLE t1(x INTEGER); \ + INSERT INTO t1 (x) VALUES(1); \ + SELECT * FROM t1; \ + } + + unset -nocomplain results errors + + set code [compileCSharpWith [subst { + using System.Data; + using System.Data.SQLite; + + namespace _Dynamic${id} + { + public class Test${id} + { + public static void Main() + { + using (SQLiteConnection connection = new SQLiteConnection( + "Data Source=${dataSource};")) + { + connection.Open(); + + using (SQLiteCommand command = new SQLiteCommand("${sql}", + connection)) + { + using (SQLiteDataReader dataReader = command.ExecuteReader()) + { + // do nothing. + } + } + } + } + } + } + }] results errors System.Data.SQLite.dll] + + list $code $results \ + [expr {[info exists errors] ? $errors : ""}] \ + [expr {$code eq "Ok" ? [catch { + object invoke _Dynamic${id}.Test${id} Main + } result] : [set result ""]}] $result \ + [close [open $dataSource RDONLY 0 "" -share None]] +} -cleanup { + cleanupDb $fileName + + unset -nocomplain result results errors code sql dataSource id db fileName +} -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ +-match regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\ +\{\} \{\}$}} + +############################################################################### + +runTest {test basic-1.9 {properly closed database file (reader #2)} -setup { + set fileName basic-1.9.db +} -body { + set id [object invoke Interpreter.GetActive NextId] + set dataSource [file join [getTemporaryPath] $fileName] + + set sql { \ + BEGIN EXCLUSIVE TRANSACTION; \ + CREATE TABLE t1(x INTEGER); \ + INSERT INTO t1 (x) VALUES(1); \ + SELECT * FROM t1; \ + } + + unset -nocomplain results errors + + set code [compileCSharpWith [subst { + using System.Data; + using System.Data.SQLite; + + namespace _Dynamic${id} + { + public class Test${id} + { + public static void Main() + { + using (SQLiteConnection connection = new SQLiteConnection( + "Data Source=${dataSource};")) + { + connection.Open(); + + using (SQLiteCommand command = new SQLiteCommand("${sql}", + connection)) + { + using (SQLiteDataReader dataReader = command.ExecuteReader( + CommandBehavior.CloseConnection)) + { + // do nothing. + } + } + } + } + } + } + }] results errors System.Data.SQLite.dll] + + list $code $results \ + [expr {[info exists errors] ? $errors : ""}] \ + [expr {$code eq "Ok" ? [catch { + object invoke _Dynamic${id}.Test${id} Main + } result] : [set result ""]}] $result \ + [close [open $dataSource RDONLY 0 "" -share None]] +} -cleanup { + cleanupDb $fileName + + unset -nocomplain result results errors code sql dataSource id db fileName +} -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ +-match regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\ +\{\} \{\}$}} + +############################################################################### + +runTest {test basic-1.10 {Changes property} -setup { + setupDb [set fileName basic-1.10.db] +} -body { + set connection [object invoke -flags +NonPublic -objectflags +NoDispose \ + Interpreter.GetActive.connections Item $db] + + set result [list] + + sql execute $db "CREATE TABLE t1(x INTEGER PRIMARY KEY ASC, y, z);" + + sql execute $db "INSERT INTO t1 (x, y, z) VALUES(1, 'foo', 1234);" + sql execute $db "INSERT INTO t1 (x, y, z) VALUES(2, 'bar', 5678);" + lappend result [object invoke $connection Changes] + + sql execute $db "UPDATE t1 SET y = 'foobar';" + lappend result [object invoke $connection Changes] + + sql execute -execute reader $db "SELECT x, y, z FROM t1;" + lappend result [object invoke $connection Changes] + + foreach name [lsort [array names rows]] { + lappend result [list $name $rows($name)] + } + + set result +} -cleanup { + cleanupDb $fileName + + unset -nocomplain name rows result connection db fileName +} -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ +-result {1 2 2 {1 {{x 1} {y foobar} {z 1234}}} {2 {{x 2} {y foobar} {z 5678}}}\ +{count 2} {names {x y z}}}} + +############################################################################### + +runTest {test basic-1.11 {LastInsertRowId property} -setup { + setupDb [set fileName basic-1.11.db] +} -body { + set connection [object invoke -flags +NonPublic -objectflags +NoDispose \ + Interpreter.GetActive.connections Item $db] + + set result [list] + + sql execute $db "CREATE TABLE t1(x INTEGER PRIMARY KEY ASC, y, z);" + + sql execute $db "CREATE TABLE t2(x INTEGER PRIMARY KEY AUTOINCREMENT, y, z);" + lappend result [object invoke $connection LastInsertRowId] + + sql execute $db "INSERT INTO t1 (x, y, z) VALUES(1, 'foo', 1234);" + lappend result [object invoke $connection LastInsertRowId] + + sql execute $db "INSERT INTO t1 (x, y, z) VALUES(2, 'bar', 5678);" + lappend result [object invoke $connection LastInsertRowId] + + sql execute $db "UPDATE t1 SET y = 'foobar';" + lappend result [object invoke $connection LastInsertRowId] + + sql execute $db "INSERT INTO t2 (y, z) VALUES('foo', 1234);" + lappend result [object invoke $connection LastInsertRowId] + + sql execute $db "INSERT INTO t2 (y, z) VALUES('bar', 5678);" + lappend result [object invoke $connection LastInsertRowId] + + sql execute $db "UPDATE t2 SET y = 'foobar';" + lappend result [object invoke $connection LastInsertRowId] + + sql execute -execute reader $db "SELECT x, y, z FROM t1;" + lappend result [object invoke $connection LastInsertRowId] + + foreach name [lsort [array names rows]] { + lappend result [list $name $rows($name)] + } + + sql execute -execute reader $db "SELECT x, y, z FROM t2;" + lappend result [object invoke $connection LastInsertRowId] + + foreach name [lsort [array names rows]] { + lappend result [list $name $rows($name)] + } + + set result +} -cleanup { + cleanupDb $fileName + + unset -nocomplain name rows result connection db fileName +} -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ +-result {0 1 2 2 1 2 2 2 {1 {{x 1} {y foobar} {z 1234}}} {2 {{x 2} {y foobar}\ +{z 5678}}} {count 2} {names {x y z}} 2 {1 {{x 1} {y foobar} {z 1234}}} {2 {{x\ +2} {y foobar} {z 5678}}} {count 2} {names {x y z}}}} + +############################################################################### + unset -nocomplain testExeFile testLinqExeFile northwindEfDbFile testLinqOutFile ############################################################################### +runSQLiteTestEpilogue runTestEpilogue Index: Tests/common.eagle ================================================================== --- Tests/common.eagle +++ Tests/common.eagle @@ -6,24 +6,190 @@ # Released to the public domain, use at your own risk! # ############################################################################### if {[isEagle]} then { + proc getBuildYear {} { + # + # NOTE: See if the "year" setting has been overridden by the user (e.g. on + # the command line). This helps control exactly which set of + # binaries we are testing, those produced using either the Visual + # Studio 2008 or Visual Studio 2010 build systems. To override this + # value via the command line, enter a command similar to one of the + # following (all on one line): + # + # EagleShell.exe -preInitialize "set test_year 2008" + # -file .\path\to\all.eagle + # + # EagleShell.exe -preInitialize "set test_year 2010" + # -file .\path\to\all.eagle + # + # EagleShell.exe -preInitialize "unset -nocomplain test_year" + # -file .\path\to\all.eagle + # + if {[info exists ::test_year] && [string length $::test_year] > 0} then { + # + # NOTE: Use the specified test year. If this variable is not set, the + # default value will be based on whether or not Eagle has been + # compiled against the .NET Framework 2.0 or 4.0. + # + return $::test_year + } else { + # + # NOTE: If Eagle has been compiled against the .NET Framework 4.0, use + # "2010" as the test year; otherwise, use "2008". If another major + # [incompatible] version of the .NET Framework is released, this + # check will have to be changed. + # + return [expr {[haveConstraint imageRuntime40] ? "2010" : "2008"}] + } + } + + proc getBuildConfiguration {} { + # + # NOTE: See if the "configuration" setting has been overridden by the user + # (e.g. on the command line). This helps control exactly which set + # of binaries we are testing (i.e. those built in the "Debug" or + # "Release" build configurations). To override this value via the + # command line, enter a command similar to one of the following (all + # on one line): + # + # EagleShell.exe -preInitialize "set test_configuration Debug" + # -file .\path\to\all.eagle + # + # EagleShell.exe -preInitialize "set test_configuration Release" + # -file .\path\to\all.eagle + # + # EagleShell.exe -file .\path\to\all.eagle -preTest + # "unset -nocomplain test_configuration" + # + if {[info exists ::test_configuration] && \ + [string length $::test_configuration] > 0} then { + # + # NOTE: Use the specified test configuration. The default value used + # for this variable is "Release", as set by the test suite itself. + # + return $::test_configuration + } else { + # + # NOTE: Normally, we will never hit this case because the value of the + # test configuration variable is always set by the test suite + # itself; however, it can be overridden using the unset command + # from the -preTest option to the test suite. + # + return $::eagle_platform(configuration) + } + } + + proc getBuildDirectory {} { + # + # NOTE: See if the "native" runtime option has been added. If so, use the + # directory for the mixed-mode assembly (a.k.a. the native interop + # assembly). To enable this option via the command line, enter a + # command similar to one of the following (all on one line): + # + # EagleShell.exe -initialize -runtimeOption native + # -file .\path\to\all.eagle + # + # To enable this option via the command line prior to the "beta 16" + # release of Eagle, the following command must be used instead (also + # all on one line): + # + # EagleShell.exe -initialize -postInitialize + # "object invoke Interpreter.GetActive AddRuntimeOption native" + # -file .\path\to\all.eagle + # + if {[hasRuntimeOption native]} then { + return [file join [file dirname $::path] bin [getBuildYear] \ + [machineToPlatform $::tcl_platform(machine)] [getBuildConfiguration]] + } else { + return [file join [file dirname $::path] bin [getBuildYear] \ + [getBuildConfiguration] bin] + } + } + proc getBuildFileName { fileName } { - return [file join [file dirname $::path] bin \ - [expr {[haveConstraint imageRuntime40] ? "2010" : "2008"}] \ - $::test_configuration bin $fileName] + return [file nativename \ + [file join [getBuildDirectory] [file tail $fileName]]] + } + + proc getBinaryDirectory {} { + # + # NOTE: This procedure returns the directory where the test application + # itself (i.e. the Eagle shell) is located. This will be used as + # the destination for the copied System.Data.SQLite native and + # managed assemblies (i.e. because this is one of the few places + # where the CLR will actually find and load them properly). + # + return [info binary] + } + + proc getBinaryFileName { fileName } { + return [file nativename \ + [file join [getBinaryDirectory] [file tail $fileName]]] + } + + proc tryCopyBuildFile { fileName } { + # + # NOTE: If we cannot copy the assembly then it is probably already loaded. + # + set sourceFileName [getBuildFileName $fileName] + + if {![file exists $sourceFileName]} then { + tputs $::test_channel [appendArgs \ + "---- skipped copying build file \"" $sourceFileName \ + "\", it does not exist\n"] + + return + } + + set targetFileName [getBinaryFileName $fileName] + + if {[catch {file copy -force $sourceFileName $targetFileName}] == 0} then { + tputs $::test_channel [appendArgs \ + "---- copied build file from \"" $sourceFileName "\" to \"" \ + $targetFileName \"\n] + } else { + tputs $::test_channel [appendArgs \ + "---- failed to copy build file from \"" $sourceFileName "\" to \"" \ + $targetFileName \"\n] + } + } + + proc tryDeleteBinaryFile { fileName } { + set fileName [getBinaryFileName $fileName] + + if {![file exists $fileName]} then { + tputs $::test_channel [appendArgs \ + "---- skipped deleting binary file \"" $fileName \ + "\", it does not exist\n"] + + return + } + + if {[catch {file delete $fileName}] == 0} then { + tputs $::test_channel [appendArgs \ + "---- deleted binary file \"" $fileName \"\n] + } else { + tputs $::test_channel [appendArgs \ + "---- failed to delete binary file \"" $fileName \"\n] + } + } + + proc tryCopyAssembly { fileName {pdb true} } { + tryCopyBuildFile $fileName + + if {$pdb} then { + tryCopyBuildFile [appendArgs [file rootname $fileName] .pdb] + } } - proc copyAssembly { fileName } { - # - # NOTE: If we cannot copy the file then it is probably already loaded, - # ignore the error. - # - catch { - file copy -force [getBuildFileName $fileName] \ - [file join [info binary] $fileName] + proc tryDeleteAssembly { fileName {pdb true} } { + tryDeleteBinaryFile $fileName + + if {$pdb} then { + tryDeleteBinaryFile [appendArgs [file rootname $fileName] .pdb] } } proc tryLoadAssembly { fileName } { set fileName [getBuildFileName $fileName] @@ -41,20 +207,36 @@ return $fileName } return "" } + + proc enumerableToString { enumerable } { + set result [list] + + if {[string length $enumerable] == 0 || $enumerable eq "null"} then { + return $result + } + + object foreach -alias item $enumerable { + if {[string length $item] > 0} then { + lappend result [$item ToString] + } + } + + return $result + } proc compileCSharpWith { text resultsVarName errorsVarName fileNames args } { # # NOTE: Create the base command to evaluate and add the property settings # that are almost always needed by our unit tests (i.e. the System # and System.Data assembly references). # set command [list compileCSharp $text results errors \ ReferencedAssemblies.Add System.dll ReferencedAssemblies.Add \ - System.Data.dll] + System.Data.dll ReferencedAssemblies.Add System.Xml.dll] # # NOTE: Add all the provided file names as assembly references. # foreach fileName $fileNames { @@ -79,32 +261,131 @@ # eval $command } proc setupDb {fileName {mode ""} {delete ""} {extra ""} {varName db}} { - set fileName [file join [getTemporaryPath] $fileName] + # + # NOTE: For now, all test databases used by the test suite are placed into + # the temporary directory. Each database used by a test should be + # cleaned up by that test using the "cleanupDb" procedure, below. + # + set fileName [file join [getTemporaryPath] [file tail $fileName]] + # + # NOTE: By default, delete any pre-existing database with the same file + # name. + # if {[string length $delete] == 0 || $delete} then { catch {file delete $fileName} } + # + # NOTE: Refer to the specified variable (e.g. "db") in the context of the + # caller. The handle to the opened database will be stored there. + # upvar 1 $varName db + # + # NOTE: Start building the connection string. The only required portion + # of the connection string is the database file name itself. + # set connection {Data Source=${fileName}} + # + # NOTE: If the caller specified a journal mode, add the necessary portion + # of the connection string now. + # if {[string length $mode] > 0} then { append connection {;Journal Mode=${mode}} } + # + # NOTE: If the caller specified an extra payload to the connection string, + # append it now. + # if {[string length $extra] > 0} then { append connection \; $extra } + # + # NOTE: Open the database connection now, placing the opaque handle value + # into the variable specified by the caller. + # set db [sql open -type SQLite [subst $connection]] } proc cleanupDb {fileName {varName db}} { + # + # NOTE: Refer to the specified variable (e.g. "db") in the context of the + # caller. The handle to the opened database is stored there. + # upvar 1 $varName db + + # + # NOTE: Close the connection to the database now. This should allow us to + # delete the underlying database file. + # catch {sql close $db} - catch {file delete [file join [getTemporaryPath] $fileName]} + + # + # NOTE: Delete the test database file now. For now, all test database + # files are stored in the temporary directory. + # + catch {file delete [file join [getTemporaryPath] [file tail $fileName]]} + } + + proc runSQLiteTestPrologue {} { + # + # NOTE: Skip running our custom prologue if the main one has been skipped. + # + if {![info exists ::no(prologue.eagle)]} then { + tryDeleteAssembly SQLite.Interop.dll + tryDeleteAssembly System.Data.SQLite.dll + tryDeleteAssembly System.Data.SQLite.Linq.dll + + tryCopyAssembly SQLite.Interop.dll + tryCopyAssembly System.Data.SQLite.dll + tryCopyAssembly System.Data.SQLite.Linq.dll + + tryLoadAssembly System.Data.SQLite.dll + tryLoadAssembly System.Data.SQLite.Linq.dll + + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"SQLite.Interop.dll\"... " \ + [file version [getBinaryFileName SQLite.Interop.dll]] \n] + } + + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"System.Data.SQLite.dll\"... " \ + [file version [getBinaryFileName System.Data.SQLite.dll]] \n] + } + + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"System.Data.SQLite.Linq.dll\"... " \ + [file version [getBinaryFileName System.Data.SQLite.Linq.dll]] \n] + } + + set assemblies [object invoke AppDomain.CurrentDomain GetAssemblies] + + object foreach assembly $assemblies { + if {[string match \{System.Data.SQLite* $assembly]} then { + tputs $::test_channel [appendArgs \ + "---- found assembly: " $assembly \n] + } + } + } + } + + proc runSQLiteTestEpilogue {} { + # + # NOTE: Skip running our custom epilogue if the main one has been skipped. + # + if {![info exists ::no(epilogue.eagle)]} then { + # + # NOTE: For now, nothing is done here. + # + } } } ADDED Tests/tkt-00f86f9739.eagle Index: Tests/tkt-00f86f9739.eagle ================================================================== --- /dev/null +++ Tests/tkt-00f86f9739.eagle @@ -0,0 +1,81 @@ +############################################################################### +# +# tkt-00f86f9739.eagle -- +# +# Written by Joe Mistachkin. +# Released to the public domain, use at your own risk! +# +############################################################################### + +package require Eagle +package require EagleLibrary +package require EagleTest + +runTestPrologue + +############################################################################### + +source [file join $path common.eagle] +runSQLiteTestPrologue + +############################################################################### + +# +# NOTE: Setup the variables that refer to the various files required by the +# tests in this file. +# +set testLinqExeFile [getBuildFileName testlinq.exe] +set northwindEfDbFile [file nativename [file join [file dirname $path] \ + testlinq northwindEF.db]] + +# +# NOTE: Setup the test constraints specific to the tests in this file. +# +if {![haveConstraint file_[file tail $testLinqExeFile]]} then { + checkForFile $test_channel $testLinqExeFile +} + +if {![haveConstraint file_[file tail $northwindEfDbFile]]} then { + checkForFile $test_channel $northwindEfDbFile +} + +############################################################################### + +runTest {test tkt-00f86f9739-1.1 {LINQ with StartsWith} -body { + set result [list] + + foreach value [list "" a b z 1+1 don notthere] { + set code [catch { + testExec $testLinqExeFile [list -eventflags Wait -directory \ + [file dirname $testLinqExeFile] -nocarriagereturns -stdout output \ + -success 0] -startsWith $value + } error] + + tlog "---- BEGIN STDOUT OUTPUT\n" + tlog $output + tlog "\n---- END STDOUT OUTPUT\n" + + lappend result $code + + if {$code == 0} then { + lappend result [string trim $output] + } else { + lappend result [string trim $error] + } + } + + set result +} -cleanup { + unset -nocomplain code output error result value +} -constraints {eagle file_testlinq.exe file_northwindEF.db} -result \ +{0 {} 0 {DRACD OLDWO RATTC} 0 {ALFKI CACTU CHOPS FOLKO GALED KOENE LILAS MAGAA\ +MAISD OCEAN RANCH SAVEA THECR} 0 {} 0 {} 0 {} 0 {}}} + +############################################################################### + +unset -nocomplain testLinqExeFile northwindEfDbFile + +############################################################################### + +runSQLiteTestEpilogue +runTestEpilogue Index: Tests/tkt-201128cc88.eagle ================================================================== --- Tests/tkt-201128cc88.eagle +++ Tests/tkt-201128cc88.eagle @@ -14,17 +14,15 @@ runTestPrologue ############################################################################### source [file join $path common.eagle] -tryLoadAssembly System.Data.SQLite.dll +runSQLiteTestPrologue ############################################################################### runTest {test tkt-201128cc88-1.1 {custom function with byte[] arg} -setup { - copyAssembly SQLite.Interop.dll - copyAssembly System.Data.SQLite.dll set fileName tkt-201128cc88-1.1.db } -body { set id [object invoke Interpreter.GetActive NextId] unset -nocomplain results errors @@ -97,6 +95,7 @@ -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}\ SQLiteConnection#\d+ \{\} \{\} Zm9v$}} ############################################################################### +runSQLiteTestEpilogue runTestEpilogue Index: Tests/tkt-2c630bffa7.eagle ================================================================== --- Tests/tkt-2c630bffa7.eagle +++ Tests/tkt-2c630bffa7.eagle @@ -14,11 +14,11 @@ runTestPrologue ############################################################################### source [file join $path common.eagle] -tryLoadAssembly System.Data.SQLite.dll +runSQLiteTestPrologue ############################################################################### set y [list -1.79769e308 -3.40282e038 -1 0 1 3.40282e038 1.79769e308] @@ -92,6 +92,7 @@ unset -nocomplain y ############################################################################### +runSQLiteTestEpilogue runTestEpilogue Index: Tests/tkt-448d663d11.eagle ================================================================== --- Tests/tkt-448d663d11.eagle +++ Tests/tkt-448d663d11.eagle @@ -14,11 +14,11 @@ runTestPrologue ############################################################################### source [file join $path common.eagle] -tryLoadAssembly System.Data.SQLite.dll +runSQLiteTestPrologue ############################################################################### runTest {test tkt-448d663d11-1.1 {missing journal mode, new db} -body { setupDb [set fileName tkt-448d663d11-1.1.db] @@ -257,6 +257,7 @@ } -constraints \ {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} -result {wal}} ############################################################################### +runSQLiteTestEpilogue runTestEpilogue ADDED Tests/tkt-59edc1018b.eagle Index: Tests/tkt-59edc1018b.eagle ================================================================== --- /dev/null +++ Tests/tkt-59edc1018b.eagle @@ -0,0 +1,81 @@ +############################################################################### +# +# tkt-59edc1018b.eagle -- +# +# Written by Joe Mistachkin. +# Released to the public domain, use at your own risk! +# +############################################################################### + +package require Eagle +package require EagleLibrary +package require EagleTest + +runTestPrologue + +############################################################################### + +source [file join $path common.eagle] +runSQLiteTestPrologue + +############################################################################### + +# +# NOTE: Setup the variables that refer to the various files required by the +# tests in this file. +# +set testLinqExeFile [getBuildFileName testlinq.exe] +set northwindEfDbFile [file nativename [file join [file dirname $path] \ + testlinq northwindEF.db]] + +# +# NOTE: Setup the test constraints specific to the tests in this file. +# +if {![haveConstraint file_[file tail $testLinqExeFile]]} then { + checkForFile $test_channel $testLinqExeFile +} + +if {![haveConstraint file_[file tail $northwindEfDbFile]]} then { + checkForFile $test_channel $northwindEfDbFile +} + +############################################################################### + +runTest {test tkt-59edc1018b-1.1 {LINQ with EndsWith} -body { + set result [list] + + foreach value [list "" a b z 1+1 don notthere] { + set code [catch { + testExec $testLinqExeFile [list -eventflags Wait -directory \ + [file dirname $testLinqExeFile] -nocarriagereturns -stdout output \ + -success 0] -endsWith $value + } error] + + tlog "---- BEGIN STDOUT OUTPUT\n" + tlog $output + tlog "\n---- END STDOUT OUTPUT\n" + + lappend result $code + + if {$code == 0} then { + lappend result [string trim $output] + } else { + lappend result [string trim $error] + } + } + + set result +} -cleanup { + unset -nocomplain code output error result value +} -constraints {eagle file_testlinq.exe file_northwindEF.db} -result \ +{0 {} 0 {FURIB GALED GODOS LAZYK LINOD PRINI REGGC WOLZA} 0 {} 0 ERNSH 0 {} 0\ +{AROUT BSBEV CONSH EASTC NORTS SEVES} 0 {}}} + +############################################################################### + +unset -nocomplain testLinqExeFile northwindEfDbFile + +############################################################################### + +runSQLiteTestEpilogue +runTestEpilogue ADDED Tests/tkt-8b7d179c3c.eagle Index: Tests/tkt-8b7d179c3c.eagle ================================================================== --- /dev/null +++ Tests/tkt-8b7d179c3c.eagle @@ -0,0 +1,94 @@ +############################################################################### +# +# tkt-8b7d179c3c.eagle -- +# +# Written by Joe Mistachkin. +# Released to the public domain, use at your own risk! +# +############################################################################### + +package require Eagle +package require EagleLibrary +package require EagleTest + +runTestPrologue + +############################################################################### + +source [file join $path common.eagle] +runSQLiteTestPrologue + +############################################################################### + +# +# NOTE: Setup the variables that refer to the various files required by the +# tests in this file. +# +set testLinqExeFile [getBuildFileName testlinq.exe] +set northwindEfDbFile [file nativename [file join [file dirname $path] \ + testlinq northwindEF.db]] + +# +# NOTE: Setup the test constraints specific to the tests in this file. +# +if {![haveConstraint file_[file tail $testLinqExeFile]]} then { + checkForFile $test_channel $testLinqExeFile +} + +if {![haveConstraint file_[file tail $northwindEfDbFile]]} then { + checkForFile $test_channel $northwindEfDbFile +} + +############################################################################### + +runTest {test tkt-8b7d179c3c-1.1 {LINQ with Skip and Take} -body { + set result [list] + + for {set pageSize 0} {$pageSize <= 2} {incr pageSize} { + set code [catch { + testExec $testLinqExeFile [list -eventflags Wait -directory \ + [file dirname $testLinqExeFile] -nocarriagereturns -stdout output \ + -success 0] -skip $pageSize + } error] + + tlog "---- BEGIN STDOUT OUTPUT\n" + tlog $output + tlog "\n---- END STDOUT OUTPUT\n" + + lappend result $code + + if {$code == 0} then { + lappend result [string trim $output] + } else { + lappend result [string trim $error] + } + } + + set result +} -cleanup { + unset -nocomplain code output error result pageSize +} -constraints {eagle file_testlinq.exe file_northwindEF.db} -result \ +{0 {} 0 {DRACD RATTC OLDWO GALED LILAS MAGAA ALFKI CHOPS SAVEA KOENE MAISD\ +FOLKO CACTU OCEAN RANCH THECR GOURL GROSR SUPRD HUNGO ISLAT QUICK HUNGC GREAL\ +LEHMS RICSU ERNSH WILMK LINOD TRAIH SIMOB OTTIK SPLIR MORGK FOLIG FURIB PRINI\ +AROUT BSBEV CONSH EASTC NORTS SEVES BERGS VICTE BOLID FISSA ROMEY BLAUS BONAP\ +MEREP ANATR ANTON CENTC PERIC TORTU FRANK TOMSP DUMON FRANR WARTH PARIS SPECD\ +LONEP THEBI REGGC VINET WELLI HANAR QUEDE RICAR PICCO HILAA LETSS COMMI FAMIA\ +QUEEN TRADH WHITC GODOS SANTG BLONP WANDK FRANS LAMAI BOTTM LAUGB LACOR LAZYK\ +WOLZA VAFFE} 0 {DRACD RATTC OLDWO GALED LILAS MAGAA ALFKI CHOPS SAVEA KOENE\ +MAISD FOLKO CACTU OCEAN RANCH THECR GOURL GROSR SUPRD HUNGO ISLAT QUICK HUNGC\ +GREAL LEHMS RICSU ERNSH WILMK LINOD TRAIH SIMOB OTTIK SPLIR MORGK FOLIG FURIB\ +PRINI AROUT BSBEV CONSH EASTC NORTS SEVES BERGS VICTE BOLID FISSA ROMEY BLAUS\ +BONAP MEREP ANATR ANTON CENTC PERIC TORTU FRANK TOMSP DUMON FRANR WARTH PARIS\ +SPECD LONEP THEBI REGGC VINET WELLI HANAR QUEDE RICAR PICCO HILAA LETSS COMMI\ +FAMIA QUEEN TRADH WHITC GODOS SANTG BLONP WANDK FRANS LAMAI BOTTM LAUGB LACOR\ +LAZYK WOLZA VAFFE}}} + +############################################################################### + +unset -nocomplain testLinqExeFile northwindEfDbFile + +############################################################################### + +runSQLiteTestEpilogue +runTestEpilogue ADDED Tests/tkt-b4a7ddc83f.eagle Index: Tests/tkt-b4a7ddc83f.eagle ================================================================== --- /dev/null +++ Tests/tkt-b4a7ddc83f.eagle @@ -0,0 +1,63 @@ +############################################################################### +# +# tkt-b4a7ddc83f.eagle -- +# +# Written by Joe Mistachkin. +# Released to the public domain, use at your own risk! +# +############################################################################### + +package require Eagle +package require EagleLibrary +package require EagleTest + +runTestPrologue + +############################################################################### + +source [file join $path common.eagle] +runSQLiteTestPrologue + +############################################################################### + +for {set i 1} {$i < 3} {incr i} { + runTest {test tkt-b4a7ddc83f-1.$i {logging shutdown} -setup [subst { + set appDomainId(1) {[object invoke AppDomain.CurrentDomain Id]} + set fileName {tkt-b4a7ddc83f-1.$i.db} + + if {[hasRuntimeOption native]} then { + object invoke Interpreter.GetActive AddRuntimeOption native + } + + set ::path {$::path} + set ::test_year {[getBuildYear]} + set ::test_configuration {[getBuildConfiguration]} + }] -body { + set appDomainId(2) [object invoke AppDomain.CurrentDomain Id] + + package require EagleLibrary + package require EagleTest + + source [file join $path common.eagle] + + object load -loadtype File [getBuildFileName System.Data.SQLite.dll] + object invoke System.Data.SQLite.SQLiteLog Initialize + + list $appDomainId(1) $appDomainId(2) \ + [expr {$appDomainId(1) != $appDomainId(2)}] [setupDb $fileName] + } -cleanup { + cleanupDb $fileName + unset -nocomplain appDomainId db fileName + } -constraints {eagle monoBug28 command.sql compile.DATA\ +compile.ISOLATED_INTERPRETERS System.Data.SQLite} -isolationLevel AppDomain \ +-match regexp -result {^\d+ \d+ True SQLiteConnection#\d+$}} +} + +############################################################################### + +unset -nocomplain i + +############################################################################### + +runSQLiteTestEpilogue +runTestEpilogue ADDED Tests/tkt-ccfa69fc32.eagle Index: Tests/tkt-ccfa69fc32.eagle ================================================================== --- /dev/null +++ Tests/tkt-ccfa69fc32.eagle @@ -0,0 +1,83 @@ +############################################################################### +# +# tkt-ccfa69fc32.eagle -- +# +# Written by Joe Mistachkin. +# Released to the public domain, use at your own risk! +# +############################################################################### + +package require Eagle +package require EagleLibrary +package require EagleTest + +runTestPrologue + +############################################################################### + +source [file join $path common.eagle] +runSQLiteTestPrologue + +############################################################################### + +# +# NOTE: Setup the variables that refer to the various files required by the +# tests in this file. +# +set testLinqExeFile [getBuildFileName testlinq.exe] +set northwindEfDbFile [file nativename [file join [file dirname $path] \ + testlinq northwindEF.db]] + +# +# NOTE: Setup the test constraints specific to the tests in this file. +# +if {![haveConstraint file_[file tail $testLinqExeFile]]} then { + checkForFile $test_channel $testLinqExeFile +} + +if {![haveConstraint file_[file tail $northwindEfDbFile]]} then { + checkForFile $test_channel $northwindEfDbFile +} + +############################################################################### + +runTest {test tkt-ccfa69fc32-1.1 {Entity Framework / Transaction Scope} -body { + set result [list] + + foreach add [list false true false] { + set code [catch { + testExec $testLinqExeFile [list -eventflags Wait -directory \ + [file dirname $testLinqExeFile] -nocarriagereturns -stdout output \ + -success 0] -efTransaction $add + } error] + + tlog "---- BEGIN STDOUT OUTPUT\n" + tlog $output + tlog "\n---- END STDOUT OUTPUT\n" + + lappend result $code + + if {$code == 0} then { + lappend result [string trim $output] + } else { + lappend result [string trim $error] + } + } + + set result +} -cleanup { + unset -nocomplain code output error result add +} -constraints {eagle file_testlinq.exe file_northwindEF.db} -match glob \ +-result {0 {1581 1730 1833 2116 2139} 0 {System.Data.UpdateException: * --->\ +System.Data.SQLite.SQLiteException: Abort due to constraint violation +PRIMARY KEY must be unique +*} 0 {1 2 3 4 5 6 7 8 9 10 1576 1577 1578 1579 1580 1581 1730 1833 2116 2139}}} + +############################################################################### + +unset -nocomplain testLinqExeFile northwindEfDbFile + +############################################################################### + +runSQLiteTestEpilogue +runTestEpilogue Index: Tests/tkt-e1b2e0f769.eagle ================================================================== --- Tests/tkt-e1b2e0f769.eagle +++ Tests/tkt-e1b2e0f769.eagle @@ -14,17 +14,15 @@ runTestPrologue ############################################################################### source [file join $path common.eagle] -tryLoadAssembly System.Data.SQLite.dll +runSQLiteTestPrologue ############################################################################### runTest {test tkt-e1b2e0f769-1.1 {data reader cleanup} -setup { - copyAssembly SQLite.Interop.dll - copyAssembly System.Data.SQLite.dll setupDb [set fileName tkt-e1b2e0f769-1.1.db] } -body { sql execute $db "CREATE TABLE t1(x INTEGER);" sql execute $db "CREATE TABLE t2(x INTEGER);" @@ -125,6 +123,7 @@ -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 3 Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 0$}} ############################################################################### +runSQLiteTestEpilogue runTestEpilogue Index: exclude_src.txt ================================================================== --- exclude_src.txt +++ exclude_src.txt @@ -6,10 +6,11 @@ *.user *.zip _FOSSIL_ bin/* Externals/* +Membership/* Membership/obj/* Membership/Profile/* Membership/SiteMap/* obj/* Setup/Output/* @@ -20,8 +21,7 @@ System.Data.SQLite/obj/* System.Data.SQLite/Properties/* test/obj/* testce/obj/* testlinq/obj/* -Tests/* -tools/* +tools/install/obj/* www/* Index: readme.htm ================================================================== --- readme.htm +++ readme.htm @@ -3,12 +3,12 @@ ADO.NET SQLite Data Provider
-Version 1.0.74.0 July 4, 2011
-Using SQLite 3.7.7.1 [af0d91adf4]
+Version 1.0.75.0 September XX, 2011
+Using SQLite 3.7.8 [3e0da808d2]
Originally written by Robert Simpson
Released to the public domain, use at your own risk!
Official provider website: http://system.data.sqlite.org/
Legacy versions: http://sqlite.phxsoftware.com/

@@ -187,10 +187,37 @@

Version History

+ 1.0.75.0 - September XX, 2011 +

Updated to SQLite 3.7.8 [3e0da808d2].
More enhancements to the build system.
Add official NuGet package.
Add Changes and LastInsertRowId properties to the connection class.
Make all the assembly versioning attributes consistent.
Add unit testing infrastructure using Eagle.
Integrate all legacy unit tests, including the "testlinq" project, into the new test suite.
Add projects to build the interop assembly statically linked to the Visual C++ runtime. Fix for [53f0c5cbf6].
Add SQLITE_ENABLE_STAT2 compile-time option to the interop assembly. Fix for [74807fbf27].
Fix mutex issues exposed when running the test suite with the debug version of SQLite.
Fix transaction enlistment when repeated attempts are made to enlist in the same transaction. Fix for [ccfa69fc32].
Support the SQLITE_FCNTL_WIN32_AV_RETRY file control to mitigate the impact of file sharing violations caused by external processes.
Refactor the logging interface to be thread-safe and self-initializing.
Shutdown the SQLite native interface when the AppDomain is being unloaded. Fix for [b4a7ddc83f].
Support Skip operation for LINQ using OFFSET. Fix for [8b7d179c3c].
Support EndsWith operation for LINQ using SUBSTR. Fix for [59edc1018b].
Support all SQLite journal modes. Fix for [448d663d11].
Do not throw exceptions when disposing SQLiteDataReader. Fix for [e1b2e0f769].
The REAL type should be mapped to System.Double. Fix for [2c630bffa7] and [b0a5990f48].
Minor optimization to GetParamValueBytes(). Fix for [201128cc88].
Support the ON UPDATE, ON DELETE, and MATCH clause information when generating schema metadata for foreign keys. Partial fix for [b226147b37]. VS designer changes are not yet tested.
Fix incorrect resource name for SR.resx in the mixed-mode assembly.

1.0.74.0 - July 4, 2011

Updated to SQLite 3.7.7.1 [af0d91adf4].

droptables = new List(); private List maydroptable = new List(); private long logevents = 0; @@ -1284,10 +1287,11 @@ { internal DbConnection cnn; internal Exception e; internal System.Threading.Thread t; internal int value; + internal System.Threading.ManualResetEvent ev; } [Test(Sequence=11)] internal void MultithreadingTest() { @@ -1300,33 +1304,39 @@ cmd.CommandText = "CREATE TABLE MultiThreadedTest(ID integer primary key, ThreadId integer, MyValue integer)"; cmd.ExecuteNonQuery(); } - MTTest[] arr = new MTTest[8]; + System.Threading.ManualResetEvent[] events = new System.Threading.ManualResetEvent[NumThreads]; + MTTest[] arr = new MTTest[NumThreads]; for (int n = 0; n < arr.Length; n++) { arr[n] = new MTTest(); arr[n].t = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(MultithreadedTestThread)); arr[n].t.IsBackground = true; arr[n].cnn = ((ICloneable)_cnn).Clone() as DbConnection; + arr[n].ev = events[n] = new System.Threading.ManualResetEvent(false); arr[n].t.Start(arr[n]); } - System.Threading.Thread.Sleep(8000); + System.Threading.WaitHandle.WaitAll(events, ThreadTimeout); + bool failed = false; Exception e = null; + for (int n = 0; n < arr.Length; n++) { if (arr[n].t.Join(0) == false) { failed = true; arr[n].t.Abort(); + arr[n].t.Join(); } if (arr[n].e != null) e = arr[n].e; arr[n].cnn.Dispose(); + arr[n].ev.Close(); } if (failed) throw new Exception("One or more threads deadlocked"); if (e != null) throw e; } @@ -1341,11 +1351,12 @@ int start = Environment.TickCount; try { using (DbCommand cmd = test.cnn.CreateCommand()) { - while (Environment.TickCount - start < 2000) + bool once = false; + while (!once || ((Environment.TickCount - start) < 2000)) { using (DbTransaction trans = test.cnn.BeginTransaction()) { cmd.CommandText = String.Format("SELECT * FROM MultiThreadedTest WHERE ThreadId = {0}", test.t.ManagedThreadId); cmd.Transaction = trans; @@ -1359,17 +1370,23 @@ cmd.CommandText = String.Format("INSERT INTO MultiThreadedTest(ThreadId, MyValue) VALUES({0}, {1})", test.t.ManagedThreadId, Environment.TickCount); cmd.ExecuteNonQuery(); trans.Commit(); } + + once = true; } } } catch (Exception e) { test.e = e; } + finally + { + test.ev.Set(); + } } [Test] internal void ParameterizedInsert() { Index: test/TestCasesDialog.cs ================================================================== --- test/TestCasesDialog.cs +++ test/TestCasesDialog.cs @@ -184,9 +184,23 @@ } } private void closeButton_Click(object sender, EventArgs e) { + if (_autoRun) + { + try + { + Console.Write("canceled..."); + } + catch + { + // do nothing, ignored. + } + + Environment.Exit(2); + } + Close(); } } } Index: test/app.config ================================================================== --- test/app.config +++ test/app.config @@ -1,8 +1,8 @@ - + Index: test/test.2008.csproj ================================================================== --- test/test.2008.csproj +++ test/test.2008.csproj @@ -24,11 +24,10 @@ 2008 $(BinaryOutputPath) - $(BinaryOutputPath)System.Data.SQLite.xml true full false Index: test/test.2010.csproj ================================================================== --- test/test.2010.csproj +++ test/test.2010.csproj @@ -23,11 +23,10 @@ 2010 $(BinaryOutputPath) - $(BinaryOutputPath)System.Data.SQLite.xml true full false Index: testce/AssemblyInfo.cs ================================================================== --- testce/AssemblyInfo.cs +++ testce/AssemblyInfo.cs @@ -1,19 +1,22 @@ using System.Reflection; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("testce")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +// associated with an assembly. +[assembly: AssemblyTitle("System.Data.SQLite Tester for Windows CE")] +[assembly: AssemblyDescription("ADO.NET Data Provider for SQLite")] +[assembly: AssemblyCompany("http://system.data.sqlite.org/")] +[assembly: AssemblyProduct("System.Data.SQLite")] +[assembly: AssemblyCopyright("Public Domain")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif // Setting ComVisible to false makes the types in this assembly not visible // to COM componenets. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] Index: testlinq/2008/App.config ================================================================== --- testlinq/2008/App.config +++ testlinq/2008/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/2010/App.config ================================================================== --- testlinq/2010/App.config +++ testlinq/2010/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/Program.cs ================================================================== --- testlinq/Program.cs +++ testlinq/Program.cs @@ -1,15 +1,299 @@ -using System; +using System; +using System.Diagnostics; using System.Linq; using System.Data.Objects; using System.Text; +using System.Transactions; namespace testlinq { class Program - { - static void Main(string[] args) + { + private static int Main(string[] args) + { + if (Environment.GetEnvironmentVariable("BREAK") != null) + { + Console.WriteLine( + "Attach a debugger to process {0} and press any key to continue.", + Process.GetCurrentProcess().Id); + + try + { + Console.ReadKey(true); /* throw */ + } + catch (InvalidOperationException) // Console.ReadKey + { + // do nothing. + } + + Debugger.Break(); + } + + string arg = null; + + if ((args != null) && (args.Length > 0)) + arg = args[0]; + + if (arg == null) + arg = ""; + + arg = arg.Trim().TrimStart('-', '/').ToLowerInvariant(); + + switch (arg) + { + case "": // String.Empty + case "old": + { + return OldTests(); + } + case "skip": + { + int pageSize = 0; + + if (args.Length > 1) + { + arg = args[1]; + + if (arg != null) + pageSize = int.Parse(arg.Trim()); + } + + return SkipTest(pageSize); + } + case "endswith": + { + string value = null; + + if (args.Length > 1) + { + value = args[1]; + + if (value != null) + value = value.Trim(); + } + + return EndsWithTest(value); + } + case "startswith": + { + string value = null; + + if (args.Length > 1) + { + value = args[1]; + + if (value != null) + value = value.Trim(); + } + + return StartsWithTest(value); + } + case "eftransaction": + { + bool value = false; + + if (args.Length > 1) + { + if (!bool.TryParse(args[1], out value)) + { + Console.WriteLine( + "cannot parse \"{0}\" as boolean", + args[1]); + + return 1; + } + } + + return EFTransactionTest(value); + } + default: + { + Console.WriteLine("unknown test \"{0}\"", arg); + return 1; + } + } + } + + // + // NOTE: Used to test the fix for ticket [8b7d179c3c]. + // + private static int SkipTest(int pageSize) + { + using (northwindEFEntities db = new northwindEFEntities()) + { + bool once = false; + int count = db.Customers.Count(); + + int PageCount = (pageSize != 0) ? + (count / pageSize) + ((count % pageSize) == 0 ? 0 : 1) : 1; + + for (int pageIndex = 0; pageIndex < PageCount; pageIndex++) + { + var query = db.Customers.OrderBy(p => p.City). + Skip(pageSize * pageIndex).Take(pageSize); + + foreach (Customers customers in query) + { + if (once) + Console.Write(' '); + + Console.Write(customers.CustomerID); + + once = true; + } + } + } + + return 0; + } + + // + // NOTE: Used to test the fix for ticket [59edc1018b]. + // + private static int EndsWithTest(string value) + { + using (northwindEFEntities db = new northwindEFEntities()) + { + bool once = false; + var query = from c in db.Customers + where c.City.EndsWith(value) + orderby c.CustomerID + select c; + + foreach (Customers customers in query) + { + if (once) + Console.Write(' '); + + Console.Write(customers.CustomerID); + + once = true; + } + } + + return 0; + } + + // + // NOTE: Used to verify the behavior from ticket [00f86f9739]. + // + private static int StartsWithTest(string value) + { + using (northwindEFEntities db = new northwindEFEntities()) + { + bool once = false; + var query = from c in db.Customers + where c.City.StartsWith(value) + orderby c.CustomerID + select c; + + foreach (Customers customers in query) + { + if (once) + Console.Write(' '); + + Console.Write(customers.CustomerID); + + once = true; + } + } + + return 0; + } + + // + // NOTE: Used to test the fix for ticket [ccfa69fc32]. + // + private static int EFTransactionTest(bool add) + { + // + // NOTE: Some of these territories already exist and should cause + // an exception to be thrown when we try to INSERT them. + // + long[] territoryIds = new long[] { + 1, 2, 3, 4, 5, // NOTE: Success + 6, 7, 8, 9, 10, // NOTE: Success + 1576, 1577, 1578, 1579, 1580, // NOTE: Success + 1581, 1730, 1833, 2116, 2139, // NOTE: Fail (1581) + 2140, 2141 // NOTE: Skipped + }; + + if (add) + { + using (northwindEFEntities db = new northwindEFEntities()) + { + using (TransactionScope scope = new TransactionScope()) + { + // + // NOTE: *REQUIRED* This is required so that the + // Entity Framework is prevented from opening + // multiple connections to the underlying SQLite + // database (i.e. which would result in multiple + // IMMEDIATE transactions, thereby failing [later + // on] with locking errors). + // + db.Connection.Open(); + + foreach (int id in territoryIds) + { + Territories territories = new Territories(); + + territories.TerritoryID = id; + territories.TerritoryDescription = String.Format( + "Test Territory #{0}", id); + territories.Regions = db.Regions.First(); + + db.AddObject("Territories", territories); + } + + try + { +#if NET_20 + db.SaveChanges(false); +#else + db.SaveChanges(SaveOptions.None); +#endif + } + catch (Exception e) + { + Console.WriteLine(e); + } + finally + { + scope.Complete(); + db.AcceptAllChanges(); + } + } + } + } + else + { + using (northwindEFEntities db = new northwindEFEntities()) + { + bool once = false; + var query = from t in db.Territories + where territoryIds.AsQueryable().Contains(t.TerritoryID) + orderby t.TerritoryID + select t; + + foreach (Territories territories in query) + { + if (once) + Console.Write(' '); + + Console.Write(territories.TerritoryID); + + once = true; + } + } + } + + return 0; + } + + private static int OldTests() { using (northwindEFEntities db = new northwindEFEntities()) { { string entitySQL = "SELECT VALUE o FROM Orders AS o WHERE SQLite.DatePart('yyyy', o.OrderDate) = 1997;"; @@ -140,9 +424,11 @@ // // NOTE: (JJM) Removed on 2011/07/06, makes it harder to run this EXE via // the new unit test suite. // - // Console.ReadKey(); + // Console.ReadKey(); + + return 0; } } } Index: testlinq/Properties/AssemblyInfo.cs ================================================================== --- testlinq/Properties/AssemblyInfo.cs +++ testlinq/Properties/AssemblyInfo.cs @@ -1,20 +1,22 @@ -using System.Reflection; -using System.Runtime.CompilerServices; +using System.Reflection; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("testlinq")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +// associated with an assembly. +[assembly: AssemblyTitle("System.Data.SQLite Tester for LINQ")] +[assembly: AssemblyDescription("ADO.NET Data Provider for SQLite")] +[assembly: AssemblyCompany("http://system.data.sqlite.org/")] +[assembly: AssemblyProduct("System.Data.SQLite")] +[assembly: AssemblyCopyright("Public Domain")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] Index: testlinq/testlinq.2008.csproj ================================================================== --- testlinq/testlinq.2008.csproj +++ testlinq/testlinq.2008.csproj @@ -25,11 +25,10 @@ 2008 $(BinaryOutputPath) - $(BinaryOutputPath)System.Data.SQLite.xml true full false @@ -45,10 +44,11 @@ + @@ -70,14 +70,15 @@ + Index: testlinq/testlinq.2010.csproj ================================================================== --- testlinq/testlinq.2010.csproj +++ testlinq/testlinq.2010.csproj @@ -23,11 +23,10 @@ 2010 $(BinaryOutputPath) - $(BinaryOutputPath)System.Data.SQLite.xml true full false @@ -42,39 +41,57 @@ + - + + True + True + NorthwindModel2008.edmx + + True True NorthwindModel2010.edmx - + + Always - + + EntityModelCodeGenerator + NorthwindModel2008.Designer.cs + + EntityModelCodeGenerator NorthwindModel2010.Designer.cs + - DELETED tools/install/GACWrap.cs Index: tools/install/GACWrap.cs ================================================================== --- tools/install/GACWrap.cs +++ /dev/null @@ -1,507 +0,0 @@ -//------------------------------------------------------------- -// GACWrap.cs -// -// This implements managed wrappers to GAC API Interfaces -//------------------------------------------------------------- - -using System; -using System.Runtime.InteropServices; -using System.Text; - -namespace System.GACManagedAccess -{ - //------------------------------------------------------------- - // Interfaces defined by fusion - //------------------------------------------------------------- - [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("e707dcde-d1cd-11d2-bab9-00c04f8eceae")] - internal interface IAssemblyCache - { - [PreserveSig()] - int UninstallAssembly( - int flags, - [MarshalAs(UnmanagedType.LPWStr)] - String assemblyName, - InstallReference refData, - out AssemblyCacheUninstallDisposition disposition); - - [PreserveSig()] - int QueryAssemblyInfo( - int flags, - [MarshalAs(UnmanagedType.LPWStr)] - String assemblyName, - ref AssemblyInfo assemblyInfo); - [PreserveSig()] - int Reserved( - int flags, - IntPtr pvReserved, - out Object ppAsmItem, - [MarshalAs(UnmanagedType.LPWStr)] - String assemblyName); - [PreserveSig()] - int Reserved(out Object ppAsmScavenger); - - [PreserveSig()] - int InstallAssembly( - int flags, - [MarshalAs(UnmanagedType.LPWStr)] - String assemblyFilePath, - InstallReference refData); - }// IAssemblyCache - - [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("CD193BC0-B4BC-11d2-9833-00C04FC31D2E")] - internal interface IAssemblyName - { - [PreserveSig()] - int SetProperty( - int PropertyId, - IntPtr pvProperty, - int cbProperty); - - [PreserveSig()] - int GetProperty( - int PropertyId, - IntPtr pvProperty, - ref int pcbProperty); - - [PreserveSig()] - int Finalize(); - - [PreserveSig()] - int GetDisplayName( - StringBuilder pDisplayName, - ref int pccDisplayName, - int displayFlags); - - [PreserveSig()] - int Reserved(ref Guid guid, - Object obj1, - Object obj2, - String string1, - Int64 llFlags, - IntPtr pvReserved, - int cbReserved, - out IntPtr ppv); - - [PreserveSig()] - int GetName( - ref int pccBuffer, - StringBuilder pwzName); - - [PreserveSig()] - int GetVersion( - out int versionHi, - out int versionLow); - [PreserveSig()] - int IsEqual( - IAssemblyName pAsmName, - int cmpFlags); - - [PreserveSig()] - int Clone(out IAssemblyName pAsmName); - }// IAssemblyName - - [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("21b8916c-f28e-11d2-a473-00c04f8ef448")] - internal interface IAssemblyEnum - { - [PreserveSig()] - int GetNextAssembly( - IntPtr pvReserved, - out IAssemblyName ppName, - int flags); - [PreserveSig()] - int Reset(); - [PreserveSig()] - int Clone(out IAssemblyEnum ppEnum); - }// IAssemblyEnum - - [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("582dac66-e678-449f-aba6-6faaec8a9394")] - internal interface IInstallReferenceItem - { - // A pointer to a FUSION_INSTALL_REFERENCE structure. - // The memory is allocated by the GetReference method and is freed when - // IInstallReferenceItem is released. Callers must not hold a reference to this - // buffer after the IInstallReferenceItem object is released. - // This uses the InstallReferenceOutput object to avoid allocation - // issues with the interop layer. - // This cannot be marshaled directly - must use IntPtr - [PreserveSig()] - int GetReference( - out IntPtr pRefData, - int flags, - IntPtr pvReserced); - }// IInstallReferenceItem - - [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("56b1a988-7c0c-4aa2-8639-c3eb5a90226f")] - internal interface IInstallReferenceEnum - { - [PreserveSig()] - int GetNextInstallReferenceItem( - out IInstallReferenceItem ppRefItem, - int flags, - IntPtr pvReserced); - }// IInstallReferenceEnum - - public enum AssemblyCommitFlags - { - Default = 1, - Force = 2 - }// enum AssemblyCommitFlags - - public enum AssemblyCacheUninstallDisposition - { - Unknown = 0, - Uninstalled = 1, - StillInUse = 2, - AlreadyUninstalled = 3, - DeletePending = 4, - HasInstallReference = 5, - ReferenceNotFound = 6 - } - - [Flags] - internal enum AssemblyCacheFlags - { - GAC = 2, - } - - internal enum CreateAssemblyNameObjectFlags - { - CANOF_DEFAULT = 0, - CANOF_PARSE_DISPLAY_NAME = 1, - } - - [Flags] - internal enum AssemblyNameDisplayFlags - { - VERSION = 0x01, - CULTURE = 0x02, - PUBLIC_KEY_TOKEN = 0x04, - PROCESSORARCHITECTURE = 0x20, - RETARGETABLE = 0x80, - // This enum will change in the future to include - // more attributes. - ALL = VERSION - | CULTURE - | PUBLIC_KEY_TOKEN - | PROCESSORARCHITECTURE - | RETARGETABLE - } - - [StructLayout(LayoutKind.Sequential)] - public class InstallReference - { - public InstallReference(Guid guid, String id, String data) - { - cbSize = (int)(2 * IntPtr.Size + 16 + (id.Length + data.Length) * 2); - flags = 0; - // quiet compiler warning - if (flags == 0) { } - guidScheme = guid; - identifier = id; - description = data; - } - - public Guid GuidScheme - { - get { return guidScheme; } - } - - public String Identifier - { - get { return identifier; } - } - - public String Description - { - get { return description; } - } - - int cbSize; - int flags; - Guid guidScheme; - [MarshalAs(UnmanagedType.LPWStr)] - String identifier; - [MarshalAs(UnmanagedType.LPWStr)] - String description; - } - - [StructLayout(LayoutKind.Sequential)] - internal struct AssemblyInfo - { - public int cbAssemblyInfo; // size of this structure for future expansion - public int assemblyFlags; - public long assemblySizeInKB; - [MarshalAs(UnmanagedType.LPWStr)] - public String currentAssemblyPath; - public int cchBuf; // size of path buf. - } - - [ComVisible(false)] - public class InstallReferenceGuid - { - public static bool IsValidGuidScheme(Guid guid) - { - return (guid.Equals(UninstallSubkeyGuid) || - guid.Equals(FilePathGuid) || - guid.Equals(OpaqueGuid) || - guid.Equals(Guid.Empty)); - } - - public readonly static Guid UninstallSubkeyGuid = new Guid("8cedc215-ac4b-488b-93c0-a50a49cb2fb8"); - public readonly static Guid FilePathGuid = new Guid("b02f9d65-fb77-4f7a-afa5-b391309f11c9"); - public readonly static Guid OpaqueGuid = new Guid("2ec93463-b0c3-45e1-8364-327e96aea856"); - // these GUID cannot be used for installing into GAC. - public readonly static Guid MsiGuid = new Guid("25df0fc1-7f97-4070-add7-4b13bbfd7cb8"); - public readonly static Guid OsInstallGuid = new Guid("d16d444c-56d8-11d5-882d-0080c847b195"); - } - - [ComVisible(false)] - public static class AssemblyCache - { - public static void InstallAssembly(String assemblyPath, InstallReference reference, AssemblyCommitFlags flags) - { - if (reference != null) - { - if (!InstallReferenceGuid.IsValidGuidScheme(reference.GuidScheme)) - throw new ArgumentException("Invalid reference guid.", "guid"); - } - - IAssemblyCache ac = null; - - int hr = 0; - - hr = Utils.CreateAssemblyCache(out ac, 0); - if (hr >= 0) - { - hr = ac.InstallAssembly((int)flags, assemblyPath, reference); - } - - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - } - - // assemblyName has to be fully specified name. - // A.k.a, for v1.0/v1.1 assemblies, it should be "name, Version=xx, Culture=xx, PublicKeyToken=xx". - // For v2.0 assemblies, it should be "name, Version=xx, Culture=xx, PublicKeyToken=xx, ProcessorArchitecture=xx". - // If assemblyName is not fully specified, a random matching assembly will be uninstalled. - public static void UninstallAssembly(String assemblyName, InstallReference reference, out AssemblyCacheUninstallDisposition disp) - { - AssemblyCacheUninstallDisposition dispResult = AssemblyCacheUninstallDisposition.Uninstalled; - if (reference != null) - { - if (!InstallReferenceGuid.IsValidGuidScheme(reference.GuidScheme)) - throw new ArgumentException("Invalid reference guid.", "guid"); - } - - IAssemblyCache ac = null; - - int hr = Utils.CreateAssemblyCache(out ac, 0); - if (hr >= 0) - { - hr = ac.UninstallAssembly(0, assemblyName, reference, out dispResult); - } - - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - - disp = dispResult; - } - - // See comments in UninstallAssembly - public static String QueryAssemblyInfo(String assemblyName) - { - if (assemblyName == null) - { - throw new ArgumentException("Invalid name", "assemblyName"); - } - - AssemblyInfo aInfo = new AssemblyInfo(); - - aInfo.cchBuf = 1024; - // Get a string with the desired length - aInfo.currentAssemblyPath = new String('\0', aInfo.cchBuf); - - IAssemblyCache ac = null; - int hr = Utils.CreateAssemblyCache(out ac, 0); - if (hr >= 0) - { - hr = ac.QueryAssemblyInfo(0, assemblyName, ref aInfo); - } - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - - return aInfo.currentAssemblyPath; - } - } - - [ComVisible(false)] - public class AssemblyCacheEnum - { - // null means enumerate all the assemblies - public AssemblyCacheEnum(String assemblyName) - { - IAssemblyName fusionName = null; - int hr = 0; - - if (assemblyName != null) - { - hr = Utils.CreateAssemblyNameObject( - out fusionName, - assemblyName, - CreateAssemblyNameObjectFlags.CANOF_PARSE_DISPLAY_NAME, - IntPtr.Zero); - } - - if (hr >= 0) - { - hr = Utils.CreateAssemblyEnum( - out m_AssemblyEnum, - IntPtr.Zero, - fusionName, - AssemblyCacheFlags.GAC, - IntPtr.Zero); - } - - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - } - - public String GetNextAssembly() - { - int hr = 0; - IAssemblyName fusionName = null; - - if (done) - { - return null; - } - - // Now get next IAssemblyName from m_AssemblyEnum - hr = m_AssemblyEnum.GetNextAssembly((IntPtr)0, out fusionName, 0); - - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - - if (fusionName != null) - { - return GetFullName(fusionName); - } - else - { - done = true; - return null; - } - } - - private String GetFullName(IAssemblyName fusionAsmName) - { - StringBuilder sDisplayName = new StringBuilder(1024); - int iLen = 1024; - - int hr = fusionAsmName.GetDisplayName(sDisplayName, ref iLen, (int)AssemblyNameDisplayFlags.ALL); - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - - return sDisplayName.ToString(); - } - - private IAssemblyEnum m_AssemblyEnum = null; - private bool done; - }// class AssemblyCacheEnum - - public class AssemblyCacheInstallReferenceEnum - { - public AssemblyCacheInstallReferenceEnum(String assemblyName) - { - IAssemblyName fusionName = null; - - int hr = Utils.CreateAssemblyNameObject( - out fusionName, - assemblyName, - CreateAssemblyNameObjectFlags.CANOF_PARSE_DISPLAY_NAME, - IntPtr.Zero); - - if (hr >= 0) - { - hr = Utils.CreateInstallReferenceEnum(out refEnum, fusionName, 0, IntPtr.Zero); - } - - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - } - - public InstallReference GetNextReference() - { - IInstallReferenceItem item = null; - int hr = refEnum.GetNextInstallReferenceItem(out item, 0, IntPtr.Zero); - if ((uint)hr == 0x80070103) - { // ERROR_NO_MORE_ITEMS - return null; - } - - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - - IntPtr refData; - InstallReference instRef = new InstallReference(Guid.Empty, String.Empty, String.Empty); - - hr = item.GetReference(out refData, 0, IntPtr.Zero); - if (hr < 0) - { - Marshal.ThrowExceptionForHR(hr); - } - - Marshal.PtrToStructure(refData, instRef); - return instRef; - } - - private IInstallReferenceEnum refEnum; - } - - internal class Utils - { - [DllImport("fusion.dll")] - internal static extern int CreateAssemblyEnum( - out IAssemblyEnum ppEnum, - IntPtr pUnkReserved, - IAssemblyName pName, - AssemblyCacheFlags flags, - IntPtr pvReserved); - - [DllImport("fusion.dll")] - internal static extern int CreateAssemblyNameObject( - out IAssemblyName ppAssemblyNameObj, - [MarshalAs(UnmanagedType.LPWStr)] - String szAssemblyName, - CreateAssemblyNameObjectFlags flags, - IntPtr pvReserved); - - [DllImport("fusion.dll")] - internal static extern int CreateAssemblyCache( - out IAssemblyCache ppAsmCache, - int reserved); - - [DllImport("fusion.dll")] - internal static extern int CreateInstallReferenceEnum( - out IInstallReferenceEnum ppRefEnum, - IAssemblyName pName, - int dwFlags, - IntPtr pvReserved); - } -} DELETED tools/install/InstallDesigner.Designer.cs Index: tools/install/InstallDesigner.Designer.cs ================================================================== --- tools/install/InstallDesigner.Designer.cs +++ /dev/null @@ -1,145 +0,0 @@ -namespace install -{ - partial class InstallDesigner - { - ///

- /// Required designer variable. - ///

- private System.ComponentModel.IContainer components = null; - - ///

- /// Clean up any resources being used. - ///

- /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - ///

- /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - ///

- private void InitializeComponent() - { - System.Windows.Forms.ColumnHeader columnHeader1; - System.Windows.Forms.Label label1; - System.Windows.Forms.Label label3; - System.Windows.Forms.Label label2; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InstallDesigner)); - this.installList = new System.Windows.Forms.ListView(); - this.warningPanel = new System.Windows.Forms.Panel(); - this.closeButton = new System.Windows.Forms.Button(); - columnHeader1 = new System.Windows.Forms.ColumnHeader(); - label1 = new System.Windows.Forms.Label(); - label3 = new System.Windows.Forms.Label(); - label2 = new System.Windows.Forms.Label(); - this.warningPanel.SuspendLayout(); - this.SuspendLayout(); - // - // columnHeader1 - // - columnHeader1.Text = "Environment"; - columnHeader1.Width = 800; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new System.Drawing.Point(13, 13); - label1.Name = "label1"; - label1.Size = new System.Drawing.Size(325, 13); - label1.TabIndex = 0; - label1.Text = "Install SQLite Design-Time Support for the following environments:"; - // - // label3 - // - label3.AutoSize = true; - label3.Location = new System.Drawing.Point(0, 0); - label3.Name = "label3"; - label3.Size = new System.Drawing.Size(13, 13); - label3.TabIndex = 5; - label3.Text = "*"; - // - // label2 - // - label2.Location = new System.Drawing.Point(10, 0); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(340, 61); - label2.TabIndex = 4; - label2.Text = resources.GetString("label2.Text"); - // - // installList - // - this.installList.CheckBoxes = true; - this.installList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - columnHeader1}); - this.installList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.installList.Location = new System.Drawing.Point(13, 30); - this.installList.Name = "installList"; - this.installList.Size = new System.Drawing.Size(350, 149); - this.installList.TabIndex = 1; - this.installList.UseCompatibleStateImageBehavior = false; - this.installList.View = System.Windows.Forms.View.List; - this.installList.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.installList_ItemChecked); - // - // warningPanel - // - this.warningPanel.Controls.Add(label3); - this.warningPanel.Controls.Add(label2); - this.warningPanel.Location = new System.Drawing.Point(13, 186); - this.warningPanel.Name = "warningPanel"; - this.warningPanel.Size = new System.Drawing.Size(350, 73); - this.warningPanel.TabIndex = 2; - this.warningPanel.Visible = false; - // - // closeButton - // - this.closeButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.closeButton.Location = new System.Drawing.Point(288, 270); - this.closeButton.Name = "closeButton"; - this.closeButton.Size = new System.Drawing.Size(75, 23); - this.closeButton.TabIndex = 3; - this.closeButton.Text = "&Close"; - this.closeButton.UseVisualStyleBackColor = true; - this.closeButton.Click += new System.EventHandler(this.closeButton_Click); - // - // InstallDesigner - // - this.AcceptButton = this.closeButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.closeButton; - this.ClientSize = new System.Drawing.Size(375, 305); - this.Controls.Add(this.closeButton); - this.Controls.Add(this.warningPanel); - this.Controls.Add(this.installList); - this.Controls.Add(label1); - this.Font = new System.Drawing.Font("MS Shell Dlg 2", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "InstallDesigner"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "SQLite Designer Installation"; - this.TopMost = true; - this.warningPanel.ResumeLayout(false); - this.warningPanel.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.ListView installList; - private System.Windows.Forms.Panel warningPanel; - private System.Windows.Forms.Button closeButton; - } -} DELETED tools/install/InstallDesigner.cs Index: tools/install/InstallDesigner.cs ================================================================== --- tools/install/InstallDesigner.cs +++ /dev/null @@ -1,1031 +0,0 @@ -/******************************************************** - * ADO.NET 2.0 Data Provider for SQLite Version 3.X - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -namespace install -{ - using System; - using System.ComponentModel; - using System.Data; - using System.Drawing; - using System.Text; - using System.Windows.Forms; - using Microsoft.Win32; - using System.IO; - using System.GACManagedAccess; - using System.Xml; - using System.Diagnostics; - using System.Collections.Generic; - - public partial class InstallDesigner : Form - { - private static Guid standardDataProviderGuid = new Guid("{0EBAAB6E-CA80-4b4a-8DDF-CBE6BF058C70}"); - private static Guid standardDataSourcesGuid = new Guid("{0EBAAB6E-CA80-4b4a-8DDF-CBE6BF058C71}"); - private static Guid standardCFDataSourcesGuid = new Guid("{0EBAAB6E-CA80-4b4a-8DDF-CBE6BF058C72}"); - private static Guid oledbDataProviderGuid = new Guid("{7F041D59-D76A-44ed-9AA2-FBF6B0548B80}"); - private static Guid oledbAltDataProviderGuid = new Guid("{7F041D59-D76A-44ed-9AA2-FBF6B0548B81}"); - private static Guid jetDataSourcesGuid = new Guid("{466CE797-67A4-4495-B75C-A3FD282E7FC3}"); - private static Guid jetAltDataSourcesGuid = new Guid("{466CE797-67A4-4495-B75C-A3FD282E7FC4}"); - private static string[] compactFrameworks = new string[] { /*"PocketPC", "SmartPhone", "WindowsCE"*/ }; - - internal bool _remove = false; - //private string _regRoot = "8.0"; - private System.Reflection.Assembly _assm = null; - private bool _ignoreChecks = true; - private string _assmLocation; - - private Dictionary _regRoots = new Dictionary(); - private List _frameworks = new List(); - - string SQLiteLocation - { - get - { - System.Reflection.Assembly assm = SQLite; - return _assmLocation; - } - } - - System.Reflection.Assembly SQLite - { - get - { - if (_assm == null) - { - Environment.CurrentDirectory = Path.GetDirectoryName(typeof(InstallDesigner).Assembly.Location); - - try - { - _assmLocation = Path.GetFullPath("..\\System.Data.SQLite.DLL"); - _assm = System.Reflection.Assembly.LoadFrom(_assmLocation); - } - catch - { - } - } - - OpenFileDialog dlg = new OpenFileDialog(); - while (_assm == null) - { - dlg.Multiselect = false; - dlg.InitialDirectory = Environment.CurrentDirectory; - dlg.FileName = "System.Data.SQLite.DLL"; - dlg.Filter = "System.Data.SQLite.DLL|System.Data.SQLite.DLL"; - if (dlg.ShowDialog() == DialogResult.OK) - { - try - { - _assmLocation = dlg.FileName; - _assm = System.Reflection.Assembly.LoadFrom(dlg.FileName); - } - catch - { - } - } - else - throw new ArgumentException("Unable to find or load System.Data.SQLite.DLL"); - } - return _assm; - } - - set - { - _assm = value; - } - } - - public InstallDesigner() - { - string[] args = Environment.GetCommandLineArgs(); - RegistryKey key; - string frameworkpath; - - //_regRoots.Add("8.0", "2005"); - //_regRoots.Add("9.0", "2008"); - _regRoots.Add("10.0", "2010"); - - using (key = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\.NETFramework")) - { - frameworkpath = key.GetValue("InstallRoot") as string; - } - - string[] frameworkfolders = Directory.GetDirectories(frameworkpath); - foreach (string framework in frameworkfolders) - { - // Don't do this on frameworks before 4.0 - string version = Path.GetFileNameWithoutExtension(framework); - if (String.Compare(version, "v4.0", StringComparison.OrdinalIgnoreCase) < 0) - continue; - - if (File.Exists(Path.Combine(framework, "CONFIG\\machine.config"))) - _frameworks.Add(Path.GetFileName(framework)); - } - - for (int n = 0; n < args.Length; n++) - { - if (String.Compare(args[n], "/regroot", true) == 0 || - String.Compare(args[n], "-regroot", true) == 0) - { - _regRoots.Add(args[n + 1], args[n + 1]); - break; - } - else if (String.Compare(args[n], "/remove", true) == 0 || - String.Compare(args[n], "-remove", true) == 0) - { - _remove = true; - } - } - - InitializeComponent(); - - foreach (KeyValuePair pair in _regRoots) - { - using (key = Registry.LocalMachine.OpenSubKey("Software\\Microsoft")) - { - AddItem(key, pair.Key, "VisualStudio", String.Format("Visual Studio {0} (full editions)", pair.Value), standardDataProviderGuid, null); - AddItem(key, pair.Key, "VWDExpress", String.Format("Visual Web Developer Express {0} Edition", pair.Value), standardDataProviderGuid, null); - - warningPanel.Visible = (AddItem(key, pair.Key, "VCSExpress", String.Format("Visual C# Express {0} Edition *", pair.Value), oledbDataProviderGuid, oledbAltDataProviderGuid) - | AddItem(key, pair.Key, "VCExpress", String.Format("Visual C++ Express {0} Edition *", pair.Value), oledbDataProviderGuid, oledbAltDataProviderGuid) - | AddItem(key, pair.Key, "VBExpress", String.Format("Visual Basic Express {0} Edition *", pair.Value), oledbDataProviderGuid, oledbAltDataProviderGuid) - | AddItem(key, pair.Key, "VJSExpress", String.Format("Visual J# Express {0} Edition *", pair.Value), oledbDataProviderGuid, oledbAltDataProviderGuid)); - } - GlobalAddRemove(pair.Key); - } - - _ignoreChecks = false; - } - - private bool AddItem(RegistryKey parent, string version, string subkeyname, string itemName, Guid lookFor, object isChecked) - { - RegistryKey subkey; - - try - { - using (subkey = parent.OpenSubKey(String.Format("{0}\\{1}", subkeyname, version))) - { - ListViewItem item = new ListViewItem(itemName); - - item.Tag = new string[] { subkeyname, version }; - - // Verify this edition has been installed and its not a fluke that the key exists - string dir = (string)subkey.GetValue("InstallDir"); - - using (RegistryKey subsubkey = subkey.OpenSubKey("Packages")) - { - if (subsubkey == null) - throw new ArgumentException("Edition not installed"); - if (subsubkey.SubKeyCount < 5) - throw new ArgumentException("Edition not installed"); - } - - using (RegistryKey subsubkey = subkey.OpenSubKey("DataProviders")) - { - if (subsubkey == null) - throw new ArgumentException("Edition not installed"); - } - - using (RegistryKey subsubkey = subkey.OpenSubKey(String.Format("DataProviders\\{0}", (isChecked == null) ? lookFor.ToString("B") : ((Guid)isChecked).ToString("B")))) - { - if (subsubkey == null) - { - DoInstallUninstall(item); - } - else - { - bool itemChecked = (subsubkey.GetValue(null) != null); - DoInstallUninstall(item); - if (_remove == false) item.Checked = itemChecked; - } - } - - installList.Items.Add(item); - if (item.Checked) - { - DoInstallUninstall(item); - } - return true; - } - } - catch - { - return false; - } - } - - private void closeButton_Click(object sender, EventArgs e) - { - this.Close(); - } - - private void installList_ItemChecked(object sender, ItemCheckedEventArgs e) - { - if (_ignoreChecks) return; - - string[] arr = (string[])e.Item.Tag; - - DoInstallUninstall(e.Item); - - GlobalAddRemove(arr[1]); - } - - private void DoInstallUninstall(ListViewItem Item) - { - string[] arr = (string[])Item.Tag; - if (Item.Checked == false) - { - if (Item.Text.IndexOf('*') > -1) - RestoreJet(arr[0], arr[1]); - else - Uninstall(arr[0], arr[1], standardDataProviderGuid, standardDataSourcesGuid); - } - else - { - if (Item.Text.IndexOf('*') > -1) - ReplaceJet(arr[0], arr[1]); - else - Install(arr[0], arr[1], standardDataProviderGuid, standardDataSourcesGuid); - } - } - - private void GlobalAddRemove(string version) - { - bool install = false; -// bool installed; - - //// Check to see if SQLite is installed in the GAC - //try - //{ - // string file = AssemblyCache.QueryAssemblyInfo("System.Data.SQLite"); - // installed = true; - //} - //catch - //{ - // installed = false; - //} - - // Check to see if any checkboxes in the list are checked - for (int n = 0; n < installList.Items.Count; n++) - { - if (installList.Items[n].Checked == true) - { - install = true; - break; - } - } - - // If at least 1 item is checked, then install some global settings - if (install) - { - string path = Path.GetDirectoryName(SQLiteLocation); - - foreach (string framework in _frameworks) - { - using (RegistryKey key = Registry.LocalMachine.CreateSubKey(String.Format("Software\\Microsoft\\.NETFramework\\{0}\\AssemblyFoldersEx\\SQLite", framework), RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - key.SetValue(null, path); - } - } - - while (String.IsNullOrEmpty(path) == false) - { - if (File.Exists(path + "\\CompactFramework\\System.Data.SQLite.DLL") == false) - { - path = Path.GetDirectoryName(path); - } - else break; - } - - if (String.IsNullOrEmpty(path) == false) - { - path += "\\CompactFramework\\"; - - for (int n = 0; n < compactFrameworks.Length; n++) - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\v2.0.0.0\\{0}\\AssemblyFoldersEx", compactFrameworks[n]), true)) - { - - if (key != null) - { - using (RegistryKey subkey = key.CreateSubKey("SQLite", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - subkey.SetValue(null, path); - } - } - } - } - - for (int n = 0; n < compactFrameworks.Length; n++) - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\v3.5.0.0\\{0}\\AssemblyFoldersEx", compactFrameworks[n]), true)) - { - - if (key != null) - { - using (RegistryKey subkey = key.CreateSubKey("SQLite", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - subkey.SetValue(null, path); - } - } - } - } - } - - for (int n = 0; n < 2; n++) - { - foreach (string framework in _frameworks) - { - // Add factory support to the machine.config file. - try - { - string xmlFileName = Environment.ExpandEnvironmentVariables(String.Format("%WinDir%\\Microsoft.NET\\{0}\\{1}\\CONFIG\\machine.config", (n == 0) ? "Framework" : "Framework64", framework)); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.PreserveWhitespace = true; - xmlDoc.Load(xmlFileName); - - - XmlNode xmlNode = xmlDoc.SelectSingleNode("configuration/system.data/DbProviderFactories/add[@invariant=\"System.Data.SQLite\"]"); - if (xmlNode == null) - { - XmlNode xmlConfig = xmlDoc.SelectSingleNode("configuration"); - if (xmlConfig != null) - { - XmlNode xmlData = xmlConfig.SelectSingleNode("system.data"); - if (xmlData == null) - { - xmlData = xmlDoc.CreateNode(XmlNodeType.Element, "system.data", ""); - xmlConfig.AppendChild(xmlData); - } - XmlNode xmlParent = xmlData.SelectSingleNode("DbProviderFactories"); - if (xmlParent == null) - { - xmlParent = xmlDoc.CreateNode(XmlNodeType.Element, "DbProviderFactories", ""); - xmlData.AppendChild(xmlParent); - } - - //xmlNode = xmlDoc.CreateNode(XmlNodeType.Element, "remove", ""); - //xmlNode.Attributes.SetNamedItem(xmlDoc.CreateAttribute("invariant")); - //xmlParent.AppendChild(xmlNode); - //xmlNode.Attributes.GetNamedItem("invariant").Value = "System.Data.SQLite"; - - xmlNode = xmlDoc.CreateNode(XmlNodeType.Element, "add", ""); - xmlNode.Attributes.SetNamedItem(xmlDoc.CreateAttribute("name")); - xmlNode.Attributes.SetNamedItem(xmlDoc.CreateAttribute("invariant")); - xmlNode.Attributes.SetNamedItem(xmlDoc.CreateAttribute("description")); - xmlNode.Attributes.SetNamedItem(xmlDoc.CreateAttribute("type")); - xmlParent.AppendChild(xmlNode); - } - } - xmlNode.Attributes.GetNamedItem("name").Value = "SQLite Data Provider"; - xmlNode.Attributes.GetNamedItem("invariant").Value = "System.Data.SQLite"; - xmlNode.Attributes.GetNamedItem("description").Value = ".Net Framework Data Provider for SQLite"; - xmlNode.Attributes.GetNamedItem("type").Value = "System.Data.SQLite.SQLiteFactory, " + SQLite.GetName().FullName; - - xmlDoc.Save(xmlFileName); - } - catch - { - } - } - } - } - else // No checkboxes are checked, remove some global settings - { - try - { - foreach (string framework in _frameworks) - { - Registry.LocalMachine.DeleteSubKey(String.Format("Software\\Microsoft\\.NETFramework\\{0}\\AssemblyFoldersEx\\SQLite", framework)); - } - - string[] versions = { /*"v2.0.0.0", "v3.5.0.0"*/ }; - for (int x = 0; x < versions.Length; x++) - { - for (int n = 0; n < compactFrameworks.Length; n++) - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\{1}\\{0}\\DataProviders", compactFrameworks[n], versions[x]), true)) - { - try - { - if (key != null) key.DeleteSubKey(standardDataProviderGuid.ToString("B")); - } - catch - { - } - } - } - } - - for (int n = 0; n < compactFrameworks.Length; n++) - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\v2.0.0.0\\{0}\\AssemblyFoldersEx", compactFrameworks[n]), true)) - { - try - { - if (key != null) key.DeleteSubKey("SQLite"); - } - catch - { - } - } - } - - for (int n = 0; n < 2; n++) - { - try - { - foreach (string framework in _frameworks) - { - // Remove any entries in the machine.config if they're still there - string xmlFileName = Environment.ExpandEnvironmentVariables(String.Format("%WinDir%\\Microsoft.NET\\{0}\\{1}\\CONFIG\\machine.config", (n == 0) ? "Framework" : "Framework64", framework)); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.PreserveWhitespace = true; - xmlDoc.Load(xmlFileName); - - XmlNode xmlNode = xmlDoc.SelectSingleNode("configuration/system.data/DbProviderFactories/add[@invariant=\"System.Data.SQLite\"]"); - - if (xmlNode != null) - xmlNode.ParentNode.RemoveChild(xmlNode); - - xmlNode = xmlDoc.SelectSingleNode("configuration/system.data/DbProviderFactories/remove[@invariant=\"System.Data.SQLite\"]"); - if (xmlNode != null) - xmlNode.ParentNode.RemoveChild(xmlNode); - - xmlDoc.Save(xmlFileName); - } - } - catch - { - } - } - } - catch - { - } - } - - try - { - if (!install) // Remove SQLite from the GAC if its there - { - AssemblyCacheUninstallDisposition disp; - - string s; - AssemblyCacheEnum entries = new AssemblyCacheEnum("System.Data.SQLite"); - while (true) - { - s = entries.GetNextAssembly(); - if (String.IsNullOrEmpty(s)) break; - - AssemblyCache.UninstallAssembly(s, null, out disp); - } - - entries = new AssemblyCacheEnum("SQLite.Designer"); - while (true) - { - s = entries.GetNextAssembly(); - if (String.IsNullOrEmpty(s)) break; - - AssemblyCache.UninstallAssembly(s, null, out disp); - } - - entries = new AssemblyCacheEnum("System.Data.SQLite.Linq"); - while (true) - { - s = entries.GetNextAssembly(); - if (String.IsNullOrEmpty(s)) break; - - AssemblyCache.UninstallAssembly(s, null, out disp); - } - - SQLite = null; - } - else // Install SQLite into the GAC - { - byte[] cfdt = Properties.Resources.System_Data_SQLite; - string tempPath = Path.GetTempPath(); - tempPath = Path.Combine(tempPath, "System.Data.SQLite.DLL"); - using (FileStream fs = File.Open(tempPath, FileMode.Create, FileAccess.Write, FileShare.None)) - { - fs.Write(cfdt, 0, cfdt.Length); - } - - try - { - AssemblyCache.InstallAssembly(tempPath, null, AssemblyCommitFlags.Default); - AssemblyCache.InstallAssembly(Path.Combine(Path.GetDirectoryName(SQLiteLocation), "x64\\System.Data.SQLite.DLL"), null, AssemblyCommitFlags.Default); - AssemblyCache.InstallAssembly(Path.Combine(Path.GetDirectoryName(SQLiteLocation), "itanium\\System.Data.SQLite.DLL"), null, AssemblyCommitFlags.Default); - } - catch - { - } - finally - { - File.Delete(tempPath); - if (File.Exists(Path.GetFullPath("..\\System.Data.SQLite.Linq.DLL")) == true) - AssemblyCache.InstallAssembly(Path.GetFullPath("..\\System.Data.SQLite.Linq.DLL"), null, AssemblyCommitFlags.Default); - - AssemblyCache.InstallAssembly(Path.GetFullPath("SQLite.Designer.DLL"), null, AssemblyCommitFlags.Default); - AssemblyCache.InstallAssembly(SQLiteLocation, null, AssemblyCommitFlags.Default); - } - } - } - catch - { - throw; - } - - FixXmlLibPaths(install, version); - } - - private void ReplaceJet(string keyname, string version) - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataProviders", keyname, version), true)) - { - using (RegistryKey source = key.OpenSubKey(oledbDataProviderGuid.ToString("B"))) - { - using (RegistryKey dest = key.CreateSubKey(oledbAltDataProviderGuid.ToString("B"))) - { - if (source == null) return; - CopyKey(source, dest); - } - } - key.DeleteSubKeyTree(oledbDataProviderGuid.ToString("B")); - } - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataSources", keyname, version), true)) - { - using (RegistryKey source = key.OpenSubKey(jetDataSourcesGuid.ToString("B"))) - { - using (RegistryKey dest = key.CreateSubKey(jetAltDataSourcesGuid.ToString("B"))) - { - if (source == null) return; - CopyKey(source, dest); - } - } - key.DeleteSubKeyTree(jetDataSourcesGuid.ToString("B")); - } - - Install(keyname, version, oledbDataProviderGuid, jetDataSourcesGuid); - } - - private void RestoreJet(string keyname, string version) - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataProviders", keyname, version), true)) - { - using (RegistryKey source = key.OpenSubKey(oledbAltDataProviderGuid.ToString("B"))) - { - if (source == null) return; - } - } - - Uninstall(keyname, version, oledbDataProviderGuid, jetDataSourcesGuid); - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataProviders", keyname, version), true)) - { - using (RegistryKey source = key.OpenSubKey(oledbAltDataProviderGuid.ToString("B"))) - { - if (source != null) - { - using (RegistryKey dest = key.CreateSubKey(oledbDataProviderGuid.ToString("B"))) - { - CopyKey(source, dest); - } - key.DeleteSubKeyTree(oledbAltDataProviderGuid.ToString("B")); - } - } - } - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataSources", keyname, version), true)) - { - using (RegistryKey source = key.OpenSubKey(jetAltDataSourcesGuid.ToString("B"))) - { - if (source != null) - { - using (RegistryKey dest = key.CreateSubKey(jetDataSourcesGuid.ToString("B"))) - { - CopyKey(source, dest); - } - key.DeleteSubKeyTree(jetAltDataSourcesGuid.ToString("B")); - } - } - } - } - - private void Install(string keyname, string version, Guid provider, Guid source) - { - bool usePackage = (keyname == "VisualStudio"); - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataProviders", keyname, version), true)) - { - using (RegistryKey subkey = key.CreateSubKey(provider.ToString("B"), RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - subkey.SetValue(null, ".NET Framework Data Provider for SQLite"); - subkey.SetValue("InvariantName", "System.Data.SQLite"); - subkey.SetValue("Technology", "{77AB9A9D-78B9-4ba7-91AC-873F5338F1D2}"); - subkey.SetValue("CodeBase", Path.GetFullPath("SQLite.Designer.DLL")); - - - if (usePackage) - subkey.SetValue("FactoryService", "{DCBE6C8D-0E57-4099-A183-98FF74C64D9D}"); - - using (RegistryKey subsubkey = subkey.CreateSubKey("SupportedObjects", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - using (RegistryKey subsubsubkey = subsubkey.CreateSubKey("DataConnectionUIControl", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - if (!usePackage) - subsubsubkey.SetValue(null, "SQLite.Designer.SQLiteConnectionUIControl"); - } - using (RegistryKey subsubsubkey = subsubkey.CreateSubKey("DataConnectionProperties", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - if (!usePackage) - subsubsubkey.SetValue(null, "SQLite.Designer.SQLiteConnectionProperties"); - } - - subsubkey.CreateSubKey("DataObjectSupport").Close(); - subsubkey.CreateSubKey("DataViewSupport").Close(); - using (RegistryKey subsubsubkey = subsubkey.CreateSubKey("DataConnectionSupport", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - if (!usePackage) - subsubsubkey.SetValue(null, "SQLite.Designer.SQLiteDataConnectionSupport"); - } - } - } - } - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataSources", keyname, version), true)) - { - using (RegistryKey subkey = key.CreateSubKey(source.ToString("B"), RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - subkey.SetValue(null, "SQLite Database File"); - using (RegistryKey subsubkey = subkey.CreateSubKey("SupportingProviders", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - subsubkey.CreateSubKey(provider.ToString("B")).Close(); - } - } - } - - //try - //{ - // using (RegistryKey key = Registry.LocalMachine.OpenSubKey("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment", true)) - // { - // string libpath = (string)key.GetValue("LIB"); - // string path = Path.GetDirectoryName(SQLiteLocation); - - // if (libpath.IndexOf(path, StringComparison.InvariantCultureIgnoreCase) == -1) - // { - // libpath += (";" + path); - // key.SetValue("LIB", libpath); - // } - // } - //} - //catch - //{ - //} - - string[] versions = { /*"v2.0.0.0", "v3.5.0.0"*/ }; - - for (int x = 0; x < versions.Length; x++) - { - for (int n = 0; n < compactFrameworks.Length; n++) - { - using (RegistryKey key = Registry.LocalMachine.CreateSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\{1}\\{0}\\DataProviders", compactFrameworks[n], versions[x]))) - { - if (key != null) - { - using (RegistryKey subkey = key.CreateSubKey(standardDataProviderGuid.ToString("B"), RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - subkey.SetValue(null, ".NET Framework Data Provider for SQLite"); - subkey.SetValue("InvariantName", "System.Data.SQLite"); - subkey.SetValue("RuntimeAssembly", "System.Data.SQLite.DLL"); - } - } - } - } - } - - if (usePackage) - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\Packages", keyname, version), true)) - { - using (RegistryKey subkey = key.CreateSubKey("{DCBE6C8D-0E57-4099-A183-98FF74C64D9C}", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - subkey.SetValue(null, "SQLite Designer Package"); - subkey.SetValue("Class", "SQLite.Designer.SQLitePackage"); - subkey.SetValue("CodeBase", Path.GetFullPath("SQLite.Designer.DLL")); - subkey.SetValue("ID", 400); - subkey.SetValue("InprocServer32", "mscoree.dll"); - subkey.SetValue("CompanyName", "Black Castle Software, LLC"); - subkey.SetValue("MinEdition", "standard"); - subkey.SetValue("ProductName", "SQLite Data Provider"); - subkey.SetValue("ProductVersion", "1.0"); - using (RegistryKey toolboxKey = subkey.CreateSubKey("Toolbox")) - { - toolboxKey.SetValue("Default Items", 3); - } - } - } - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\Menus", keyname, version), true)) - { - key.SetValue("{DCBE6C8D-0E57-4099-A183-98FF74C64D9C}", ", 1000, 3"); - } - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\Services", keyname, version), true)) - { - using (RegistryKey subkey = key.CreateSubKey("{DCBE6C8D-0E57-4099-A183-98FF74C64D9D}", RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - subkey.SetValue(null, "{DCBE6C8D-0E57-4099-A183-98FF74C64D9C}"); - subkey.SetValue("Name", "SQLite Provider Object Factory"); - } - } - } - } - - private XmlDocument GetConfig(string keyname, string version, out string xmlFileName) - { - try - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}", keyname, version), true)) - { - xmlFileName = (string)key.GetValue("InstallDir"); - if (String.Compare(keyname, "VisualStudio", true) == 0) - xmlFileName += "devenv.exe.config"; - else - xmlFileName += keyname + ".exe.config"; - } - - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.PreserveWhitespace = true; - xmlDoc.Load(xmlFileName); - - return xmlDoc; - } - catch - { - xmlFileName = null; - } - return null; - } - - private void Uninstall(string keyname, string version, Guid provider, Guid source) - { - try - { - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataProviders", keyname, version), true)) - { - if (key != null) key.DeleteSubKeyTree(provider.ToString("B")); - } - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\DataSources", keyname, version), true)) - { - if (key != null) key.DeleteSubKeyTree(source.ToString("B")); - } - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\Packages", keyname, version), true)) - { - if (key != null) key.DeleteSubKeyTree("{DCBE6C8D-0E57-4099-A183-98FF74C64D9C}"); - } - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\Services", keyname, version), true)) - { - if (key != null) key.DeleteSubKeyTree("{DCBE6C8D-0E57-4099-A183-98FF74C64D9D}"); - } - - using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\{0}\\{1}\\Menus", keyname, version), true)) - { - key.DeleteValue("{DCBE6C8D-0E57-4099-A183-98FF74C64D9C}"); - } - - //using (RegistryKey key = Registry.LocalMachine.OpenSubKey("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment", true)) - //{ - // string libpath = (string)key.GetValue("LIB"); - // string path = ";" + Path.GetDirectoryName(SQLiteLocation); - - // libpath = libpath.Replace(path, ""); - // key.SetValue("LIB", libpath); - //} - } - catch - { - } - - // Remove factory support from the development environment config file - string xmlFileName; - XmlDocument xmlDoc = GetConfig(keyname, version, out xmlFileName); - - if (xmlDoc == null) return; - - XmlNode xmlNode = xmlDoc.SelectSingleNode("configuration/system.data/DbProviderFactories/add[@invariant=\"System.Data.SQLite\"]"); - if (xmlNode != null) - xmlNode.ParentNode.RemoveChild(xmlNode); - - xmlNode = xmlDoc.SelectSingleNode("configuration/system.data/DbProviderFactories/remove[@invariant=\"System.Data.SQLite\"]"); - if (xmlNode != null) - xmlNode.ParentNode.RemoveChild(xmlNode); - - xmlDoc.Save(xmlFileName); - } - - - private static void CopyKey(RegistryKey keySource, RegistryKey keyDest) - { - if (keySource.SubKeyCount > 0) - { - string[] subkeys = keySource.GetSubKeyNames(); - for (int n = 0; n < subkeys.Length; n++) - { - using (RegistryKey subkeysource = keySource.OpenSubKey(subkeys[n])) - { - using (RegistryKey subkeydest = keyDest.CreateSubKey(subkeys[n], RegistryKeyPermissionCheck.ReadWriteSubTree)) - { - CopyKey(subkeysource, subkeydest); - } - } - } - } - string[] values = keySource.GetValueNames(); - for (int n = 0; n < values.Length; n++) - { - keyDest.SetValue(values[n], keySource.GetValue(values[n]), keySource.GetValueKind(values[n])); - } - } - - private void FixXmlLibPaths(bool install, string version) - { - string installDir = null; - RegistryKey key = null; - - try - { - key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\VisualStudio\\{0}", version)); - if (key != null) - { - try - { - installDir = (string)key.GetValue("InstallDir"); - } - catch - { - } - finally - { - if (String.IsNullOrEmpty(installDir)) - { - ((IDisposable)key).Dispose(); - key = null; - } - } - } - - if (key == null) - { - key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\VCExpress\\{0}", version)); - if (key == null) return; - } - - try - { - installDir = (string)key.GetValue("InstallDir"); - } - catch - { - } - } - finally - { - if (key != null) ((IDisposable)key).Dispose(); - } - - if (String.IsNullOrEmpty(installDir)) return; - - installDir = Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(installDir))), "VC"); - - string currentDir; - string[] lookIn = new string[] { "vcpackages", "bin\\amd64", "bin\\ia64" }; - string sqlitePath = Path.GetDirectoryName(SQLiteLocation); - - foreach (string subfolder in lookIn) - { - try - { - currentDir = Path.Combine(installDir, subfolder); - FixXmlLibPaths(currentDir, "VCProjectEngine.DLL*.config", sqlitePath, install); - FixXmlLibPaths(currentDir, "AMD64.VCPlatform.config", Path.Combine(sqlitePath, "x64"), install); - FixXmlLibPaths(currentDir, "Itanium.VCPlatform.config", Path.Combine(sqlitePath, "itanium"), install); - FixXmlLibPaths(currentDir, "WCE.VCPlatform.config", Path.Combine(sqlitePath, "CompactFramework"), install); - } - catch - { - } - } - - FixLocalUserPaths(install); - } - - private void FixLocalUserPaths(bool install) - { - string file = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\VisualStudio\\8.0\\VCComponents.dat"); - StringBuilder output = new StringBuilder(); - string line; - string sqlitePath = Path.GetDirectoryName(SQLiteLocation); - string currPath = sqlitePath; - - try - { - using (StreamReader rd = new StreamReader(file)) - { - while (rd.EndOfStream == false) - { - line = rd.ReadLine(); - line = line.Trim(); - if (String.IsNullOrEmpty(line)) continue; - if (line[0] == '[') - { - if (line.IndexOf("Win32", StringComparison.InvariantCultureIgnoreCase) != -1) - currPath = sqlitePath; - else if (line.IndexOf("x64", StringComparison.InvariantCultureIgnoreCase) != -1) - currPath = Path.Combine(sqlitePath, "x64"); - else if (line.IndexOf("Itanium", StringComparison.InvariantCultureIgnoreCase) != -1) - currPath = Path.Combine(sqlitePath, "x64"); - else if (line.IndexOf("ARM", StringComparison.InvariantCultureIgnoreCase) != -1) - currPath = Path.Combine(sqlitePath, "CompactFramework"); - } - else if (line.StartsWith("Reference Dirs", StringComparison.InvariantCultureIgnoreCase) == true) - { - int n = line.IndexOf(";" + currPath, StringComparison.InvariantCultureIgnoreCase); - if (n > -1) line = line.Remove(n, currPath.Length + 1); - - if (install) - { - if (line[line.Length - 1] == '=') - line += currPath; - else - line += (";" + currPath); - } - } - - output.AppendLine(line); - } - rd.Close(); - } - - File.Delete(file); - using (StreamWriter writer = new StreamWriter(file, false, Encoding.Unicode)) - { - writer.Write(output.ToString()); - writer.Close(); - } - } - catch - { - } - } - - private void FixXmlLibPaths(string path, string lookFor, string sqlitePath, bool install) - { - // Win32 - string[] files = Directory.GetFiles(path, lookFor); - if (files.Length > 0) - { - foreach (string file in files) - { - FixXmlLibPath(file, sqlitePath, install); - } - } - } - - private void FixXmlLibPath(string fileName, string sqlitePath, bool install) - { - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.PreserveWhitespace = true; - xmlDoc.Load(fileName); - - XmlNodeList xmlNodes = xmlDoc.SelectNodes("VCPlatformConfigurationFile/Platform/Directories"); - if (xmlNodes == null) return; - - foreach(XmlNode xmlNode in xmlNodes) - { - string libpath = xmlNode.Attributes.GetNamedItem("Reference").Value; - if (String.Compare(libpath, sqlitePath, true) == 0) - libpath = ""; - else - { - int n = libpath.IndexOf(";" + sqlitePath, StringComparison.InvariantCultureIgnoreCase); - if (n > -1) libpath = libpath.Remove(n, sqlitePath.Length + 1); - } - - if (install) - { - if (String.IsNullOrEmpty(libpath)) libpath = sqlitePath; - else libpath += (";" + sqlitePath); - } - xmlNode.Attributes.GetNamedItem("Reference").Value = libpath; - } - - xmlDoc.Save(fileName); - } - } -} DELETED tools/install/InstallDesigner.resx Index: tools/install/InstallDesigner.resx ================================================================== --- tools/install/InstallDesigner.resx +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - False - - - False - - - False - - - Due to limitations in some Express Editions, checking affected products above will temporarily replace the Microsoft Jet designer with the SQLite designer. The Microsoft Jet designer can be restored by un-checking the box(es) above. - - - - - AAABAAYAICAQAAAAAADoAgAAZgAAABAQEAAAAAAAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA - CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA - /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAREREREREREXd3d3d3ARERERERERERERF4uLeLiwARERER - ERERERERe4uHuLgDAREREREREREREXi4t4uLAzARERERERAAAA97i4e4uAMwAREREREXd3d/eLi3i4sD - MDARERERF/iIj3uLh7i4AzAwERERERf4iI94uLeLiwMwMBEREREX+IiPd3d3d3cDMDARAAERF/iIiPe/ - v3+/sDAwEHdwERf4iIiPe/v3+/sAMHeIdwAH+IiIiPeIiHiIgDB/+ICIh/iIiIiPe/v3+/sAf/+HB3f4 - iIiIiPd3d3d3cBf/gBEX+IiIiIiP/////xERd3ERF/iIiIiIiIiIiHARERERERf4iIiIiIiIiIhwERER - EREX+IiIiIiIiIiIcBERERERF/iIiIiIiIiIiHARERERERf4iIiIiIiIiIhwEREREREX//////////// - cBERERERF3d3d3d3d3d3d3AREREREREREXgBERF4ARERERERERERERF/ARERfwEREREREREREREReAER - EXgBEREREREREREREQcBEREHARERERERERERERBwcBEQcHARERERERERERF4iHcBeIh3ARERERERERER - f/iHAX/4hwEREREREREREX//hwF//4cBEREREREREREX/4ARF/+AEREREREREREREYiBERGIgREREf// - AB///wAP//8AB///AAP/gAAB/4AAAP+AAAD/gAAA/4AAAMeAAACDgAAAAAAAAAAAAAAAAAAAg4AAA8eA - AAP/gAAD/4AAA/+AAAP/gAAD/4AAA/+AAAP//Hx///x8f//8fH///Hx///g4P//wEB//8BAf//AQH//4 - OD///Hx/KAAAABAAAAAgAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAACA - gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAREREXd3dwERER - ERe4e4ABERERF4t4sDAREQAHuHuAMBERf3eLeLAwERF/h3d3cDCAgX+Ie/e/AA8Af4iHd3dwgIF/iIiI - dxEREX////9wERERd3d3d3AREREREQEREREREREYCBERERERERDwERERERERGAgREREREREREREREf4D - ERH+AYiP/gB3d/AAMDDwAAER8ACIiBAAv38AADAwEANwEfADiIjwA/v3/38AMP4/dwD+P4iI/j+IiP// - gDAoAAAAIAAAAEAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAA - AACAAIAAgIAAAICAgADA3MAA8MqmAKo/KgD/PyoAAF8qAFVfKgCqXyoA/18qAAB/KgBVfyoAqn8qAP9/ - KgAAnyoAVZ8qAKqfKgD/nyoAAL8qAFW/KgCqvyoA/78qAADfKgBV3yoAqt8qAP/fKgAA/yoAVf8qAKr/ - KgD//yoAAABVAFUAVQCqAFUA/wBVAAAfVQBVH1UAqh9VAP8fVQAAP1UAVT9VAKo/VQD/P1UAAF9VAFVf - VQCqX1UA/19VAAB/VQBVf1UAqn9VAP9/VQAAn1UAVZ9VAKqfVQD/n1UAAL9VAFW/VQCqv1UA/79VAADf - VQBV31UAqt9VAP/fVQAA/1UAVf9VAKr/VQD//1UAAAB/AFUAfwCqAH8A/wB/AAAffwBVH38Aqh9/AP8f - fwAAP38AVT9/AKo/fwD/P38AAF9/AFVffwCqX38A/19/AAB/fwBVf38Aqn9/AP9/fwAAn38AVZ9/AKqf - fwD/n38AAL9/AFW/fwCqv38A/79/AADffwBV338Aqt9/AP/ffwAA/38AVf9/AKr/fwD//38AAACqAFUA - qgCqAKoA/wCqAAAfqgBVH6oAqh+qAP8fqgAAP6oAVT+qAKo/qgD/P6oAAF+qAFVfqgCqX6oA/1+qAAB/ - qgBVf6oAqn+qAP9/qgAAn6oAVZ+qAKqfqgD/n6oAAL+qAFW/qgCqv6oA/7+qAADfqgBV36oAqt+qAP/f - qgAA/6oAVf+qAKr/qgD//6oAAADUAFUA1ACqANQA/wDUAAAf1ABVH9QAqh/UAP8f1AAAP9QAVT/UAKo/ - 1AD/P9QAAF/UAFVf1ACqX9QA/1/UAAB/1ABVf9QAqn/UAP9/1AAAn9QAVZ/UAKqf1AD/n9QAAL/UAFW/ - 1ACqv9QA/7/UAADf1ABV39QAqt/UAP/f1AAA/9QAVf/UAKr/1AD//9QAVQD/AKoA/wAAH/8AVR//AKof - /wD/H/8AAD//AFU//wCqP/8A/z//AABf/wBVX/8Aql//AP9f/wAAf/8AVX//AKp//wD/f/8AAJ//AFWf - /wCqn/8A/5//AAC//wBVv/8Aqr//AP+//wAA3/8AVd//AKrf/wD/3/8AVf//AKr//wD/zMwA/8z/AP// - MwD//2YA//+ZAP//zAAAfwAAVX8AAKp/AAD/fwAAAJ8AAFWfAACqnwAA/58AAAC/AABVvwAAqr8AAP+/ - AAAA3wAAVd8AAKrfAAD/3wAAVf8AAKr/AAAAACoAVQAqAKoAKgD/ACoAAB8qAFUfKgCqHyoA/x8qAAA/ - KgBVPyoA8Pv/AKSgoACAgIAAAAD/AAD/AAAA//8A/wAAAAAAAAD//wAA////AP39/f39/f39/f39/f39 - /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39 - /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/YF9fVlVWVVVVf39/f39/f39/f39 - /f39/f39/f39/f39pcuoylSkpMakVP39/f39/f39/f39/f39/f39/f39/f2pqcvLVMrKpMZ8LP39/f39 - /f39/f39/f39/f39/f39/anP0KkDy6jLpHxUeP39/f39/f39/f39/f39/f39/f39qc/Pz1nLy6ikfFR8 - eP39/f39/f39/f39/f39/f39/f2p0K7QWc+py8Z8VHx8/f39/f39/f39/f0yMTIxMjEyManP0M99z8+t - z3xUfHz9/f39/f39/f39XggJCYIJgoKDqfb29gf29tDTfFR8fP39/f39/f39/YKzrwgICAirCAiqy9DT - 0IHPy8vLVHx8/f39/f39/f39htH2r6+vrwivCNQIy/eFMS0wWXxUfHz9/VoHNjL9/f2Gs/b29q/2r6+v - CNQIpVXQLNBUqcvKfP2ChtSCWjX9/YL/9q/29q/2rwjRrwgHqVWpVctVqcul/V7/rwiCMjYyhv//9vav - 9q/2r68Ir4JZhquCMVr3Df39gvb2rwhagl6C//////bR9q/2r/avr68ICAjUhoMx/f2G1P//CV79/Qn/ - //////az9vavr9EIr6+vCKsJhg39/f0Igl6G/f39gv////////b2r/b2r/avCNGvCAiCMv39/f39/f39 - /f2G////////////9q/2r/avrwivCIMx/f39/f39/f39/f2G//////////////b2r/avr68IB/39/f39 - /f39/f39/f2GgoaCgl73Xl5eWl5aWgc2Bzb9/f39/f39/f39/f39/f39/f1eMf39/f39/V4x/f39/f39 - /f39/f39/f39/f39/f39/YIy/f39/f39gjL9/f39/f39/f39/f39/f39/f39/f1aNgcy/f39/Vo2BzL9 - /f39/f39/f39/f39/f39/f39gobUgjYH/f2ChtSCNgf9/f39/f39/f39/f39/f39/f1e/68IgjL9/V7/ - rwiCMv39/f39/f39/f39/f39/f39/ffR/68IB/3999H/rwgH/f39/f39/f39/f39/f39/f39CAj//wle - /f0ICP//CV79/f39/f39/f39/f39/f39/f39CYL3hv39/f0JgveG/f39/f39/f39/f39/f39/f39/f39 - /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f3///////////// - /////8Af///AD///wAf//8AD///AAf//wAH/wAAB/4AAAf8AAAH/AAABhwAAAQMAAAEAAAADAAAAAwMA - AAOHAAAD/wAAA/+AAAf/wAAP//z8///8/P//+Hh///AwP//wMD//8DA///AwP//4eH///////////ygA - AAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAA - gACAgAAAgICAAMDcwADwyqYAqj8qAP8/KgAAXyoAVV8qAKpfKgD/XyoAAH8qAFV/KgCqfyoA/38qAACf - KgBVnyoAqp8qAP+fKgAAvyoAVb8qAKq/KgD/vyoAAN8qAFXfKgCq3yoA/98qAAD/KgBV/yoAqv8qAP// - KgAAAFUAVQBVAKoAVQD/AFUAAB9VAFUfVQCqH1UA/x9VAAA/VQBVP1UAqj9VAP8/VQAAX1UAVV9VAKpf - VQD/X1UAAH9VAFV/VQCqf1UA/39VAACfVQBVn1UAqp9VAP+fVQAAv1UAVb9VAKq/VQD/v1UAAN9VAFXf - VQCq31UA/99VAAD/VQBV/1UAqv9VAP//VQAAAH8AVQB/AKoAfwD/AH8AAB9/AFUffwCqH38A/x9/AAA/ - fwBVP38Aqj9/AP8/fwAAX38AVV9/AKpffwD/X38AAH9/AFV/fwCqf38A/39/AACffwBVn38Aqp9/AP+f - fwAAv38AVb9/AKq/fwD/v38AAN9/AFXffwCq338A/99/AAD/fwBV/38Aqv9/AP//fwAAAKoAVQCqAKoA - qgD/AKoAAB+qAFUfqgCqH6oA/x+qAAA/qgBVP6oAqj+qAP8/qgAAX6oAVV+qAKpfqgD/X6oAAH+qAFV/ - qgCqf6oA/3+qAACfqgBVn6oAqp+qAP+fqgAAv6oAVb+qAKq/qgD/v6oAAN+qAFXfqgCq36oA/9+qAAD/ - qgBV/6oAqv+qAP//qgAAANQAVQDUAKoA1AD/ANQAAB/UAFUf1ACqH9QA/x/UAAA/1ABVP9QAqj/UAP8/ - 1AAAX9QAVV/UAKpf1AD/X9QAAH/UAFV/1ACqf9QA/3/UAACf1ABVn9QAqp/UAP+f1AAAv9QAVb/UAKq/ - 1AD/v9QAAN/UAFXf1ACq39QA/9/UAAD/1ABV/9QAqv/UAP//1ABVAP8AqgD/AAAf/wBVH/8Aqh//AP8f - /wAAP/8AVT//AKo//wD/P/8AAF//AFVf/wCqX/8A/1//AAB//wBVf/8Aqn//AP9//wAAn/8AVZ//AKqf - /wD/n/8AAL//AFW//wCqv/8A/7//AADf/wBV3/8Aqt//AP/f/wBV//8Aqv//AP/MzAD/zP8A//8zAP// - ZgD//5kA///MAAB/AABVfwAAqn8AAP9/AAAAnwAAVZ8AAKqfAAD/nwAAAL8AAFW/AACqvwAA/78AAADf - AABV3wAAqt8AAP/fAABV/wAAqv8AAAAAKgBVACoAqgAqAP8AKgAAHyoAVR8qAKofKgD/HyoAAD8qAFU/ - KgDw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAAAAAAAP//AAD///8A/f39/f39/f39/f39/f39/f39 - /f39/YF9fVlVWVVV/f39/f39/f2ly6jGVKTGpCz9/f39/f39qc/Qz1nLqcZUeP39/f39/anQrdBZz8uk - VHz9/f39/f2p0NDPfc+uz1R8/f39/f0xqfb29vf209BUfP39/f0yr/epgYUxLCx9VHz99f39WtH2r6lV - pTGlVKmlXv/19V7/9q/2rzAHVf39/f1e/f1e///29q+v1PX9/f39/f39/fdeXlpaBzH9/f39/f39/f39 - /f31/f39/f39/f39/f39/f399f39/f39/f39/f39/f39Xv/1/f39/f39/f39/f39/f1e/f39/f39/f// - /f38A/39/AH9/fwA/f38AKnQ/ABZz/gAxnzwAHz9sAD9/QAH/f2wBzIx+A8yMf9/qc//f33P/j/PfP9/ - fP0oAAAAIAAAAEAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAZpKo/2GMov9bhJz/VX2V/0Bec/9LcIr/RmmE/0Fjf/83V3T/FExpMQAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGrtv/R8fw/ye67/8Vsuz/BWSI/wGn6f8Ao+b/AKDi/wCc - 4P8QbJP/FExpMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFm34P9azvL/U83y/0PG8f8eb4v/JLnu/xiz - 7f8Nruv/AJ/i/wd7q/8UTGn/FExpMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWbjg/23W8v9p1fP/WM/y/yl0 - jP83wfD/Kbrv/xu17f8AoeP/BH6x/wdWev8QcJn/FExpMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZueL/ftzz/33e - 9P9t2PT/NnmM/0zK8v89xPD/Lb3w/wCj5f8Agrb/BFmA/wZ7p/8Ocpv/AAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFm6 - 4/+N5PT/kOX1/4Lf9f9Cfo3/Y9Pz/1HN8v9BxfD/AKbn/wCCtv8AXYX/BH2q/wl5pv8AAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiXFfRolxX/+Gblv/hGtZ/4FoVf9+ZVL/e2JP/3lg - TP92XUr/Wbzn/4rh9P+K4fT/iuH0/02Ilv9+3PP/dNjy/2jT8f9o0/H/AIK2/wBdhf8FgbD/CXmm/wAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIlxX0aumYr/0sC2/9C9s//Ou7H/zLmu/8u2 - q//KtKn/x7Km/8awpP9qxOv/3fT7/930+//d9Pv/h5yj/8/w+//P8Pv/u+n6/7Xo+v8AiMD/AF2F/wWB - sP8Jeab/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAw6+i//Pv7P/m3tr/4NTO/9/S - yv/dzsf/2szD/9jJwf/Wxr3/1MK6/7q+vv9qxOv/q/D3/6rw9/+d6/b/W5Sf/3fb9P9h0vP/Scnx/zS/ - 8P8AXYX/BYKz/wl5pv8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADEsKP/9/Px//Xw - 7v/y7ev/7+rn/+7m4//r49//6N/b/+bc1v/k2NL/4dTO/8TLzv9qxOv/fK6z/3issv8/YGb/K0tT/yVI - Uf84hp7/KYCd/xZjff8AiMD/CXmm/wAAAAC+r6UxppGDwI12ZPiFbFr4hmtZwIJoVTEAAAAAAAAAAMWx - pP/59/X/9/Tz//Xy7//z7uz/8Ovo/+/o5P/t5OH/6uHd/+fd2P/k2tT/4tfQ/8XO0P9fsNP/T25x/5/r - 9v8uS1H/n+v2/zJsfP9Dtdj/NcDw/yG37v8LfKz/AAAAALytosDHurD/18fB/8Otof+dg3P/h21awAAA - AAAAAAAAxbKk//v6+f/5+Pb/+PXz//bz8P/07+7/8uzq//Dq5v/u5uL/6+Pe/+jf2v/l29b/49jS/3Js - af9Zven/KVhs/1m96f8pV2v/Wb3p/y5hd/9Zven/RrXm/zGt4/8AAAAAsZ6Q+Pn39v/w6uj/3M7G/8Ku - of+IcF34hm5b/4RrWf/GsqX//f39//z6+v/7+fj/+fb1//fz8v/18O7/8u7s//Dr6P/u5+T/7OTg/+nh - 3P/m3df/uK+r/3Ntav/Ivbb/3M7H/7Cjnv9uZWH/o5KK/8GqnP9sUj7/AAAAAAAAAAC4ppn4+fj3//// - ///w6+j/1snA/5N7avjHsab/s5qK/8azpf////////3+//37+//7+vn/+fj2//f18//18vD/8+/t//Hs - 6f/v6eX/7ebi/+vj3v/o39r/5tvV/+LY0v/g1M3/3c/J/9vMxf/Nuq//xKyg/29VQf8AAAAAAAAAAM3A - tsDb0sv/+vj3//n49//KvbT/q5eJwAAAAAAAAAAAx7Om///////////////+//38/f/8+/r/+vn4//j2 - 9f/38/L/9fDv//Lt6v/w6uf/7ufj/+vk3//p4Nz/5t3X/+TZ0//h1c//39HL/9C9tP/FsKT/cllF/wAA - AAAAAAAA3NHKMc/Bt8C7qZz4tqOW+MKzqMDEtasxAAAAAAAAAADHtaf///////////////////////7+ - /f/8/Pv/+/r4//r39v/39fL/9vLv//Pv7f/y7On/7+nl/+zl4f/q4t3/597Z/+Xb1f/i19H/08K6/8iz - qP91XEn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMi1qMr////a//////// - /////////////////v/9/Pz//Pv6//r4+P/49vT/9vPx//Xw7v/y7er/8Orm/+3m4//r5N//6eDb/+bc - 1//cz8j/y7er/3lfTP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiXFfMcWx - pLL////N////6v////T////////////////+/f3//fz7//v6+f/69vX/9/Tz//Xy7//z7uz/8evo/+/o - 5f/s5eH/6uHd/+Ta1f+Gblz/hm5cRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAiXFfMcWxpLLDr6LTwK2e6L2pnP+7ppj/t6SV/7Wgkf+xnI3/rpmJ/6uVhf+nkoH/pI59/6CK - ev+chnX/mIJx/5V+bf+Remj/inJg/4ZuXEYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALOaiv+Ea1n/AAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAs5qK/4RrWf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAx7Gm/4ZuW/8AAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADHsab/hm5b/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvq+lMaaRg8CNdmT4hWxa+IZr - WcCCaFUxAAAAAAAAAAC+r6UxppGDwI12ZPiFbFr4hmtZwIJoVTEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8raLAx7qw/9fH - wf/DraH/nYNz/4dtWsAAAAAAAAAAALytosDHurD/18fB/8Otof+dg3P/h21awAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALGe - kPj59/b/8Oro/9zOxv/CrqH/iHBd+AAAAAAAAAAAsZ6Q+Pn39v/w6uj/3M7G/8Kuof+IcF34AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAuKaZ+Pn49///////8Ovo/9bJwP+Te2r4AAAAAAAAAAC4ppn4+fj3///////w6+j/1snA/5N7 - avgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADNwLbA29LL//r49//5+Pf/yr20/6uXicAAAAAAAAAAAM3AtsDb0sv/+vj3//n4 - 9//KvbT/q5eJwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAANzRyjHPwbfAu6mc+LajlvjCs6jAxLWrMQAAAAAAAAAA3NHKMc/B - t8C7qZz4tqOW+MKzqMDEtasxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// - ////////////////wA///8AH///AA///wAH//8AB///AAf+AAAH/AAAB/wAAAf8AAAEDAAABAwAAAQAA - AAMAAAADAwAAAwMAAAP/AAAD/wAAA/+AAAf//Pz///z8///wMD//8DA///AwP//wMD//8DA///AwP/// - ////////KAAAABAAAAAgAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAABmkqj/YYyi/1uEnP9VfZX/QF5z/0twiv9GaYT/N1d0/wAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAARq7b/0fH8P8nuu//FbLs/wVkiP8Bp+n/AKPm/wCc4P8UTGn/AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAFm54v9+3PP/fd70/23Y9P82eYz/TMry/z3E8P8Ao+X/BFmA/w5y - m/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZuuP/jeT0/5Dl9f+C3/X/Qn6N/2PT8/9RzfL/AKbn/wBd - hf8Jeab/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWbzn/4rh9P+K4fT/iuH0/02Ilv9+3PP/dNjy/2jT - 8f8AXYX/CXmm/wAAAAAAAAAAAAAAAAAAAAAAAAAAdVtG/2rE6//d9Pv/3fT7/930+/+HnKP/z/D7/8/w - +/+16Pr/AF2F/wl5pv8AAAAAAAAAAAAAAAD///8xhW1a/+3m4/+/p5r/asTr/3yus/94rLL/P2Bm/ytL - U/8lSFH/OIae/xZjff8Jeab/Y0gzO2NIM/9jSDM7////apeAb//28vH/8u3q/+3m4/9fsNP/T25x/zOr - 1/8uS1H/LqnX/zJsfP9Dtdj/Ma3j/66ai///////Y0gz/2NIM/+plIT//fv8//n39//28/D/8u3q/+3n - 4/8pWGz/pox7/ylXa/8AAAAAAAAAAAAAAABjSDM7rpqL/2NIMzv///95sp2O///////8/Pv/+vj3//by - 8f/y7er/6eDb/9/Sy/9pTjr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////RgAAAAC2oZP/rpqL/6eR - gf+fiXn/l4Bv/4dvXf94X0z/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAY0gz/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAY0gzP2NIM/9jSDM/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAK6ai///////Y0gz/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAABjSDM/rpqL/2NIMz8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAA/AMAAPwB - AAD8AAAA/AAAAPwAAAD4AAAA4AAAAAAAAAAABwAAAAcAAOgPAAD/fwAA/j8AAP4/AAD+PwAA - - - ADDED tools/install/Installer.2008.csproj Index: tools/install/Installer.2008.csproj ================================================================== --- /dev/null +++ tools/install/Installer.2008.csproj @@ -0,0 +1,61 @@ + + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {A41FE2A5-07AD-4CE7-B836-1544634816F5} + Properties + Exe + Installer + Installer + 2.0 + $(MSBuildProjectDirectory)\..\.. + true + 2008 + + + + $(BinaryOutputPath) + + + true + full + false + DEBUG;TRACE + prompt + + + pdbonly + true + TRACE + prompt + + + + + + + + + + + + + + ADDED tools/install/Installer.2010.csproj Index: tools/install/Installer.2010.csproj ================================================================== --- /dev/null +++ tools/install/Installer.2010.csproj @@ -0,0 +1,60 @@ + + + + + Debug + AnyCPU + 10.0.30319 + 2.0 + {A41FE2A5-07AD-4CE7-B836-1544634816F5} + Properties + Exe + Installer + Installer + 3.5 + $(MSBuildProjectDirectory)\..\.. + 2010 + + + + $(BinaryOutputPath) + + + true + full + false + DEBUG;TRACE + prompt + + + pdbonly + true + TRACE + prompt + + + + + + + + + + + + + + ADDED tools/install/Installer.cs Index: tools/install/Installer.cs ================================================================== --- /dev/null +++ tools/install/Installer.cs @@ -0,0 +1,4136 @@ +/* + * Installer.cs -- + * + * Written by Joe Mistachkin. + * Released to the public domain, use at your own risk! + */ + +using System.Collections.Generic; +using System.Diagnostics; +using System.EnterpriseServices.Internal; +using System.IO; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Threading; +using System.Windows.Forms; +using System.Xml; +using Microsoft.Win32; + +namespace System.Data.SQLite +{ + #region Public Delegates + internal delegate void TraceCallback( + string message, + string category + ); + + /////////////////////////////////////////////////////////////////////////// + + internal delegate bool FrameworkConfigCallback( + string fileName, + string invariant, + string name, + string description, + string typeName, + AssemblyName assemblyName, + object clientData, + bool whatIf, + bool verbose, + ref bool saved, + ref string error + ); + + /////////////////////////////////////////////////////////////////////////// + + internal delegate bool FrameworkRegistryCallback( + RegistryKey rootKey, + string frameworkName, + Version frameworkVersion, + string platformName, + object clientData, + bool whatIf, + bool verbose, + ref string error + ); + + /////////////////////////////////////////////////////////////////////////// + + internal delegate bool VisualStudioRegistryCallback( + RegistryKey rootKey, + Version vsVersion, + Guid packageId, + Guid serviceId, + Guid dataSourceId, + Guid dataProviderId, + object clientData, + bool whatIf, + bool verbose, + ref string error + ); + #endregion + + /////////////////////////////////////////////////////////////////////////// + + #region Public Enumerations + [Flags()] + public enum InstallFlags + { + None = 0x0, + GAC = 0x1, + AssemblyFolders = 0x2, + DbProviderFactory = 0x4, + VsPackage = 0x8, + VsDataSource = 0x10, + VsDataProvider = 0x20, + Framework = GAC | AssemblyFolders | DbProviderFactory, + Vs = VsPackage | VsDataSource | VsDataProvider, + All = Framework | Vs, + Default = All + } + #endregion + + /////////////////////////////////////////////////////////////////////////// + + #region Installer Class + internal static class Installer + { + #region Private Helper Classes + #region AnyPair Class + private sealed class AnyPair + { + #region Public Constructors + // + // WARNING: This constructor produces an immutable "empty" pair + // object. + // + public AnyPair() + : base() + { + // do nothing. + } + + /////////////////////////////////////////////////////////////////// + + public AnyPair(T1 x) + : this() + { + this.x = x; + } + + /////////////////////////////////////////////////////////////////// + + public AnyPair(T1 x, T2 y) + : this(x) + { + this.y = y; + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Public Properties + private T1 x; + public T1 X + { + get { return x; } + } + + /////////////////////////////////////////////////////////////////// + + private T2 y; + public T2 Y + { + get { return y; } + } + #endregion + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region TraceOps Class + private static class TraceOps + { + #region Private Constants + private const string Iso8601DateTimeOutputFormat = + "yyyy.MM.ddTHH:mm:ss.fffffff"; + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Private Data + private static object syncRoot = new object(); + private static long nextId; + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Interactive Support Methods + public static string GetAssemblyTitle( + Assembly assembly + ) + { + if (assembly != null) + { + try + { + if (assembly.IsDefined( + typeof(AssemblyTitleAttribute), false)) + { + AssemblyTitleAttribute title = + (AssemblyTitleAttribute) + assembly.GetCustomAttributes( + typeof(AssemblyTitleAttribute), false)[0]; + + return title.Title; + } + } + catch + { + // do nothing. + } + } + + return null; + } + + /////////////////////////////////////////////////////////////////// + + public static DialogResult ShowMessage( + TraceCallback traceCallback, + Assembly assembly, + string message, + string category, + MessageBoxButtons buttons, + MessageBoxIcon icon + ) + { + DialogResult result = DialogResult.OK; + + Trace(traceCallback, message, category); + + if (SystemInformation.UserInteractive) + { + string title = GetAssemblyTitle(assembly); + + if (title == null) + title = Application.ProductName; + + result = MessageBox.Show(message, title, buttons, icon); + + Trace(traceCallback, String.Format( + "User choice of \"{0}\".", result), category); + + return result; + } + + Trace(traceCallback, String.Format( + "Default choice of \"{0}\".", result), category); + + return result; + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Tracing Support Methods + public static long NextId() + { + return Interlocked.Increment(ref nextId); + } + + /////////////////////////////////////////////////////////////////// + + public static string TimeStamp(DateTime dateTime) + { + return dateTime.ToString(Iso8601DateTimeOutputFormat); + } + + /////////////////////////////////////////////////////////////////// + + [MethodImpl(MethodImplOptions.NoInlining)] + private static string GetMethodName( + StackTrace stackTrace, + int level + ) + { + try + { + // + // NOTE: If a valid stack trace was not supplied by the + // caller, create one now based on the current + // execution stack. + // + if (stackTrace == null) + { + // + // NOTE: Grab the current execution stack. + // + stackTrace = new StackTrace(); + + // + // NOTE: Always skip this call frame when we capture + // the stack trace. + // + level++; + } + + // + // NOTE: Get the specified stack frame (always add one to + // skip this method). + // + StackFrame stackFrame = stackTrace.GetFrame(level); + + // + // NOTE: Get the method for the stack frame. + // + MethodBase methodBase = stackFrame.GetMethod(); + + // + // NOTE: Get the type for the method. + // + Type type = methodBase.DeclaringType; + + // + // NOTE: Get the name of the method. + // + string name = methodBase.Name; + + // + // NOTE: Return the properly formatted result. + // + return String.Format( + "{0}{1}{2}", type.Name, Type.Delimiter, name); + } + catch + { + // do nothing. + } + + return null; + } + + /////////////////////////////////////////////////////////////////// + + public static void TraceCore( + string message, + string category + ) + { + lock (syncRoot) + { + System.Diagnostics.Trace.WriteLine(message, category); + System.Diagnostics.Trace.Flush(); + } + } + + /////////////////////////////////////////////////////////////////// + + [MethodImpl(MethodImplOptions.NoInlining)] + public static string Trace( + TraceCallback traceCallback, + Exception exception, + string category + ) + { + if (exception != null) + return Trace(traceCallback, + new StackTrace(exception, true), 0, + exception.ToString(), category); + + return null; + } + + /////////////////////////////////////////////////////////////////// + + [MethodImpl(MethodImplOptions.NoInlining)] + public static string Trace( + TraceCallback traceCallback, + string message, + string category + ) + { + return Trace(traceCallback, null, 1, message, category); + } + + /////////////////////////////////////////////////////////////////// + + [MethodImpl(MethodImplOptions.NoInlining)] + private static string Trace( + TraceCallback traceCallback, + StackTrace stackTrace, + int level, + string message, + string category + ) + { + // + // NOTE: Always skip this call frame if the stack trace is + // going to be captured by GetMethodName. + // + if (stackTrace == null) + level++; + + if (traceCallback == null) + traceCallback = TraceCore; + + traceCallback(String.Format("{0}: {1}", + GetMethodName(stackTrace, level), message), category); + + return message; + } + #endregion + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region MockRegistryKey Class + private sealed class MockRegistryKey : IDisposable + { + #region Private Constructors + private MockRegistryKey() + { + whatIf = true; + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Public Constructors + public MockRegistryKey( + RegistryKey key + ) + : this() + { + this.key = key; + } + + /////////////////////////////////////////////////////////////////// + + public MockRegistryKey( + RegistryKey key, + string subKeyName + ) + : this(key) + { + this.subKeyName = subKeyName; + } + + /////////////////////////////////////////////////////////////////// + + public MockRegistryKey( + RegistryKey key, + string subKeyName, + bool whatIf + ) + : this(key, subKeyName) + { + this.whatIf = whatIf; + } + + /////////////////////////////////////////////////////////////////// + + public MockRegistryKey( + RegistryKey key, + bool whatIf + ) + : this(key, null, whatIf) + { + // do nothing. + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Public Methods + public void Close() + { + // + // NOTE: No disposed check here because calling this method + // should be just like calling Dispose. + // + Dispose(true); + } + + /////////////////////////////////////////////////////////////////// + + public MockRegistryKey CreateSubKey( + string subKeyName + ) + { + CheckDisposed(); + + if (key == null) + return null; + + if (whatIf) + { + // + // HACK: Attempt to open the specified sub-key. If this + // fails, we will simply return the wrapped root key + // itself since no writes are allowed in 'what-if' + // mode anyhow. + // + RegistryKey subKey = key.OpenSubKey(subKeyName); + + return (subKey != null) ? + new MockRegistryKey(subKey) : + new MockRegistryKey(key, subKeyName); + } + else + { + return new MockRegistryKey( + key.CreateSubKey(subKeyName), false); + } + } + + /////////////////////////////////////////////////////////////////// + + public void DeleteSubKey( + string subKeyName + ) + { + CheckDisposed(); + + if (key == null) + return; + + if (!whatIf) + key.DeleteSubKey(subKeyName); + } + + /////////////////////////////////////////////////////////////////// + + public void DeleteSubKeyTree( + string subKeyName + ) + { + CheckDisposed(); + + if (key == null) + return; + + if (!whatIf) + key.DeleteSubKeyTree(subKeyName); + } + + /////////////////////////////////////////////////////////////////// + + public void DeleteValue( + string name + ) + { + CheckDisposed(); + + if (key == null) + return; + + if (!whatIf) + key.DeleteValue(name); + } + + /////////////////////////////////////////////////////////////////// + + public string[] GetSubKeyNames() + { + CheckDisposed(); + + if (key == null) + return null; + + return key.GetSubKeyNames(); + } + + /////////////////////////////////////////////////////////////////// + + public object GetValue( + string name, + object defaultValue + ) + { + CheckDisposed(); + + if (key == null) + return null; + + return key.GetValue(name, defaultValue); + } + + /////////////////////////////////////////////////////////////////// + + public MockRegistryKey OpenSubKey( + string subKeyName + ) + { + CheckDisposed(); + + return OpenSubKey(subKeyName, false); + } + + /////////////////////////////////////////////////////////////////// + + public MockRegistryKey OpenSubKey( + string subKeyName, + bool writable + ) + { + CheckDisposed(); + + if (key == null) + return null; + + RegistryKey subKey = key.OpenSubKey( + subKeyName, whatIf ? false : writable); + + return (subKey != null) ? + new MockRegistryKey(subKey, whatIf) : null; + } + + /////////////////////////////////////////////////////////////////// + + public void SetValue( + string name, + object value + ) + { + CheckDisposed(); + + if (key == null) + return; + + if (!whatIf) + key.SetValue(name, value); + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Public Properties + public string Name + { + get + { + CheckDisposed(); + + if (key == null) + return null; + + return !String.IsNullOrEmpty(subKeyName) ? + String.Format("{0}\\{1}", key.Name, subKeyName) : + key.Name; + } + } + + /////////////////////////////////////////////////////////////////// + + private RegistryKey key; + public RegistryKey Key + { + get { CheckDisposed(); return key; } + } + + /////////////////////////////////////////////////////////////////// + + private string subKeyName; + public string SubKeyName + { + get { CheckDisposed(); return subKeyName; } + } + + /////////////////////////////////////////////////////////////////// + + private bool whatIf; + public bool WhatIf + { + get { CheckDisposed(); return whatIf; } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region System.Object Overrides + public override string ToString() + { + CheckDisposed(); + + return this.Name; + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Implicit Conversion Operators + // + // BUGBUG: The 'what-if' mode setting here should probably be based + // on some static property, not hard-coded to true? + // + public static implicit operator MockRegistryKey( + RegistryKey key + ) + { + return new MockRegistryKey(key, null, true); + } + + /////////////////////////////////////////////////////////////////// + + // + // BUGBUG: Remove me? This should be safe because in 'what-if' + // mode all keys are opened read-only. + // + public static implicit operator RegistryKey( + MockRegistryKey key + ) + { + return (key != null) ? key.Key : null; + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region IDisposable "Pattern" Members + private bool disposed; + private void CheckDisposed() /* throw */ + { + if (!disposed) + return; + + throw new ObjectDisposedException(typeof(MockRegistryKey).Name); + } + + /////////////////////////////////////////////////////////////////// + + private /* protected virtual */ void Dispose( + bool disposing + ) + { + if (!disposed) + { + if (disposing) + { + //////////////////////////////////// + // dispose managed resources here... + //////////////////////////////////// + + if (key != null) + { + key.Close(); + key = null; + } + } + + ////////////////////////////////////// + // release unmanaged resources here... + ////////////////////////////////////// + + // + // NOTE: This object is now disposed. + // + disposed = true; + } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region IDisposable Members + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Destructor + ~MockRegistryKey() + { + Dispose(false); + } + #endregion + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region RegistryHelper Class + private static class RegistryHelper + { + #region Public Static Properties + private static int subKeysCreated; + public static int SubKeysCreated + { + get { return subKeysCreated; } + } + + /////////////////////////////////////////////////////////////////// + + private static int subKeysDeleted; + public static int SubKeysDeleted + { + get { return subKeysDeleted; } + } + + /////////////////////////////////////////////////////////////////// + + private static int keyValuesSet; + public static int KeyValuesSet + { + get { return keyValuesSet; } + } + + /////////////////////////////////////////////////////////////////// + + private static int keyValuesDeleted; + public static int KeyValuesDeleted + { + get { return keyValuesDeleted; } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Public Static Methods + public static RegistryKey GetRootKeyByName( + string keyName + ) + { + if (String.IsNullOrEmpty(keyName)) + return null; + + switch (keyName.ToUpperInvariant()) + { + case "HKCR": + case "HKEY_CLASSES_ROOT": + return Registry.ClassesRoot; + case "HKCC": + case "HKEY_CURRENT_CONFIG": + return Registry.CurrentConfig; + case "HKCU": + case "HKEY_CURRENT_USER": + return Registry.CurrentUser; + case "HKDD": + case "HKEY_DYN_DATA": + return Registry.DynData; + case "HKLM": + case "HKEY_LOCAL_MACHINE": + return Registry.LocalMachine; + case "HKPD": + case "HKEY_PERFORMANCE_DATA": + return Registry.PerformanceData; + case "HKU": + case "HKEY_USERS": + return Registry.Users; + } + + return null; + } + + /////////////////////////////////////////////////////////////////// + + public static MockRegistryKey OpenSubKey( + MockRegistryKey rootKey, + string subKeyName, + bool writable, + bool whatIf, + bool verbose + ) + { + if (rootKey == null) + return null; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "rootKey = {0}, subKeyName = {1}, writable = {2}", + ForDisplay(rootKey), ForDisplay(subKeyName), writable), + traceCategory); + + // + // HACK: Always forbid writable access when operating in + // 'what-if' mode. + // + MockRegistryKey key = rootKey.OpenSubKey( + subKeyName, whatIf ? false : writable); + + return (key != null) ? + new MockRegistryKey(key, whatIf) : null; + } + + /////////////////////////////////////////////////////////////////// + + public static MockRegistryKey CreateSubKey( + MockRegistryKey rootKey, + string subKeyName, + bool whatIf, + bool verbose + ) + { + if (rootKey == null) + return null; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "rootKey = {0}, subKeyName = {1}", ForDisplay(rootKey), + ForDisplay(subKeyName)), traceCategory); + + try + { + // + // HACK: Always open a key, rather than creating one when + // operating in 'what-if' mode. + // + if (whatIf) + { + // + // HACK: Attempt to open the specified sub-key. If + // this fails, we will simply return the root key + // itself since no writes are allowed in + // 'what-if' mode anyhow. + // + MockRegistryKey key = rootKey.OpenSubKey(subKeyName); + + return (key != null) ? + key : new MockRegistryKey(rootKey, subKeyName); + } + else + { + return new MockRegistryKey( + rootKey.CreateSubKey(subKeyName), false); + } + } + finally + { + subKeysCreated++; + } + } + + /////////////////////////////////////////////////////////////////// + + public static void DeleteSubKey( + MockRegistryKey rootKey, + string subKeyName, + bool whatIf, + bool verbose + ) + { + if (rootKey == null) + return; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "rootKey = {0}, subKeyName = {1}", ForDisplay(rootKey), + ForDisplay(subKeyName)), traceCategory); + + if (!whatIf) + rootKey.DeleteSubKey(subKeyName); + + subKeysDeleted++; + } + + /////////////////////////////////////////////////////////////////// + + public static void DeleteSubKeyTree( + MockRegistryKey rootKey, + string subKeyName, + bool whatIf, + bool verbose + ) + { + if (rootKey == null) + return; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "rootKey = {0}, subKeyName = {1}", ForDisplay(rootKey), + ForDisplay(subKeyName)), traceCategory); + + if (!whatIf) + rootKey.DeleteSubKeyTree(subKeyName); + + subKeysDeleted++; + } + + /////////////////////////////////////////////////////////////////// + + public static string[] GetSubKeyNames( + MockRegistryKey key, + bool whatIf, + bool verbose + ) + { + if (key == null) + return null; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "key = {0}", ForDisplay(key)), traceCategory); + + return key.GetSubKeyNames(); + } + + /////////////////////////////////////////////////////////////////// + + public static object GetValue( + MockRegistryKey key, + string name, + object defaultValue, + bool whatIf, + bool verbose + ) + { + if (key == null) + return null; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "key = {0}, name = {1}, defaultValue = {2}", + ForDisplay(key), ForDisplay(name), + ForDisplay(defaultValue)), traceCategory); + + return key.GetValue(name, defaultValue); + } + + /////////////////////////////////////////////////////////////////// + + public static void SetValue( + MockRegistryKey key, + string name, + object value, + bool whatIf, + bool verbose + ) + { + if (key == null) + return; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "key = {0}, name = {1}, value = {2}", ForDisplay(key), + ForDisplay(name), ForDisplay(value)), traceCategory); + + if (!whatIf) + key.SetValue(name, value); + + keyValuesSet++; + } + + /////////////////////////////////////////////////////////////////// + + public static void DeleteValue( + MockRegistryKey key, + string name, + bool whatIf, + bool verbose + ) + { + if (key == null) + return; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "key = {0}, name = {1}", ForDisplay(key), + ForDisplay(name)), traceCategory); + + if (!whatIf) + key.DeleteValue(name); + + keyValuesDeleted++; + } + #endregion + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region StringList Class + private sealed class StringList : List + { + public StringList() + : base() + { + // do nothing. + } + + /////////////////////////////////////////////////////////////////// + + public StringList(IEnumerable collection) + : base(collection) + { + // do nothing. + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region StringDictionary Class + private sealed class StringDictionary : Dictionary + { + public StringDictionary() + { + // do nothing. + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region VersionList Class + private sealed class VersionList : List + { + public VersionList() + : base() + { + // do nothing. + } + + /////////////////////////////////////////////////////////////////// + + public VersionList(IEnumerable collection) + : base(collection) + { + // do nothing. + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region VersionMap Class + private sealed class VersionMap : Dictionary + { + public VersionMap() + { + // do nothing. + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Configuration Class + private sealed class Configuration + { + #region Private Constants + private const char Switch = '-'; + private const char AltSwitch = '/'; + + /////////////////////////////////////////////////////////////////// + + private static readonly char[] SwitchChars = { + Switch, AltSwitch + }; + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Private Constructors + private Configuration( + Assembly assembly, + string logFileName, + string directory, + string coreFileName, + string linqFileName, + string designerFileName, + InstallFlags installFlags, + bool install, + bool noDesktop, + bool noCompact, + bool noNetFx20, + bool noNetFx40, + bool noVs2008, + bool noVs2010, + bool noTrace, + bool noConsole, + bool noLog, + bool whatIf, + bool verbose, + bool confirm + ) + { + this.assembly = assembly; + this.logFileName = logFileName; + this.directory = directory; + this.coreFileName = coreFileName; + this.linqFileName = linqFileName; + this.designerFileName = designerFileName; + this.installFlags = installFlags; + this.install = install; + this.noDesktop = noDesktop; + this.noCompact = noCompact; + this.noNetFx20 = noNetFx20; + this.noNetFx40 = noNetFx40; + this.noVs2008 = noVs2008; + this.noVs2010 = noVs2010; + this.noTrace = noTrace; + this.noConsole = noConsole; + this.noLog = noLog; + this.whatIf = whatIf; + this.verbose = verbose; + this.confirm = confirm; + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Private Static Methods + private static void GetDefaultFileNames( + ref string directory, + ref string coreFileName, + ref string linqFileName, + ref string designerFileName + ) + { + if (thisAssembly == null) + return; + + directory = Path.GetDirectoryName(thisAssembly.Location); + + if (String.IsNullOrEmpty(directory)) + return; + + coreFileName = Path.Combine(directory, + Installer.CoreFileName); + + linqFileName = Path.Combine(directory, + Installer.LinqFileName); + + designerFileName = Path.Combine(directory, + Installer.DesignerFileName); + } + + /////////////////////////////////////////////////////////////////// + + private static bool CheckOption( + ref string arg + ) + { + string result = arg; + + if (!String.IsNullOrEmpty(result)) + { + // + // NOTE: Remove all leading switch chars. + // + result = result.TrimStart(SwitchChars); + + // + // NOTE: How many chars were removed? + // + int count = arg.Length - result.Length; + + // + // NOTE: Was there at least one? + // + if (count > 0) + { + // + // NOTE: Ok, replace their original + // argument. + // + arg = result; + + // + // NOTE: Yes, this is a switch. + // + return true; + } + } + + return false; + } + + /////////////////////////////////////////////////////////////////// + + private static bool MatchOption( + string arg, + string option + ) + { + if ((arg == null) || (option == null)) + return false; + + return String.Compare(arg, 0, option, 0, + arg.Length, StringComparison.OrdinalIgnoreCase) == 0; + } + + /////////////////////////////////////////////////////////////////// + + private static bool? ParseBoolean( + string text + ) + { + if (!String.IsNullOrEmpty(text)) + { + bool value; + + if (bool.TryParse(text, out value)) + return value; + } + + return null; + } + + /////////////////////////////////////////////////////////////////// + + private static object ParseEnum( + Type enumType, + string text, + bool noCase + ) + { + if ((enumType == null) || !enumType.IsEnum) + return null; + + if (!String.IsNullOrEmpty(text)) + { + try + { + return Enum.Parse(enumType, text, noCase); + } + catch + { + // do nothing. + } + } + + return null; + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Public Static Methods + public static Configuration CreateDefault() + { + string directory = null; + string coreFileName = null; + string linqFileName = null; + string designerFileName = null; + + GetDefaultFileNames( + ref directory, ref coreFileName, ref linqFileName, + ref designerFileName); + + return new Configuration( + thisAssembly, null, directory, coreFileName, linqFileName, + designerFileName, InstallFlags.Default, true, false, true, + false, false, false, false, false, false, false, true, + true, false); + } + + /////////////////////////////////////////////////////////////////// + + public static bool FromArgs( + string[] args, + bool strict, + ref Configuration configuration, + ref string error + ) + { + try + { + if (args == null) + return true; + + if (configuration == null) + configuration = Configuration.CreateDefault(); + + int length = args.Length; + + for (int index = 0; index < length; index++) + { + string arg = args[index]; + + if (String.IsNullOrEmpty(arg)) + continue; + + string newArg = arg; + + if (CheckOption(ref newArg)) + { + // + // NOTE: All the supported command line options must + // have a value; therefore, attempt to advance + // to it now. If we fail, we are done. + // + index++; + + if (index >= length) + { + error = TraceOps.Trace( + traceCallback, String.Format( + "Missing value for option: {0}", + ForDisplay(arg)), traceCategory); + + if (strict) + return false; + + break; + } + + // + // NOTE: Grab the textual value of this command line + // option. + // + string text = args[index]; + + // + // NOTE: Figure out which command line option this is + // (based on a partial name match) and then try + // to interpret the textual value as the correct + // type. + // + if (MatchOption(newArg, "strict")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + // + // NOTE: Allow the command line arguments to override + // the "strictness" setting provided by our caller. + // + strict = (bool)value; + } + else if (MatchOption(newArg, "logFileName")) + { + configuration.logFileName = text; + } + else if (MatchOption(newArg, "directory")) + { + configuration.directory = text; + + // + // NOTE: *SPECIAL* Must refresh the file names + // here because the underlying directory + // has changed. + // + string coreFileName = configuration.coreFileName; + + if (!String.IsNullOrEmpty(coreFileName)) + coreFileName = Path.GetFileName(coreFileName); + + if (String.IsNullOrEmpty(coreFileName)) + coreFileName = Installer.CoreFileName; + + configuration.coreFileName = Path.Combine( + configuration.directory, coreFileName); + + string linqFileName = configuration.linqFileName; + + if (!String.IsNullOrEmpty(linqFileName)) + linqFileName = Path.GetFileName(linqFileName); + + if (String.IsNullOrEmpty(linqFileName)) + linqFileName = Installer.LinqFileName; + + configuration.linqFileName = Path.Combine( + configuration.directory, linqFileName); + + string designerFileName = configuration.designerFileName; + + if (!String.IsNullOrEmpty(designerFileName)) + designerFileName = Path.GetFileName(designerFileName); + + if (String.IsNullOrEmpty(designerFileName)) + designerFileName = Installer.DesignerFileName; + + configuration.designerFileName = Path.Combine( + configuration.directory, designerFileName); + } + else if (MatchOption(newArg, "coreFileName")) + { + configuration.coreFileName = text; + } + else if (MatchOption(newArg, "linqFileName")) + { + configuration.linqFileName = text; + } + else if (MatchOption(newArg, "designerFileName")) + { + configuration.designerFileName = text; + } + else if (MatchOption(newArg, "installFlags")) + { + object value = ParseEnum( + typeof(InstallFlags), text, true); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid install flags value: {0}", + ForDisplay(text)), traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.installFlags = (InstallFlags)value; + } + else if (MatchOption(newArg, "install")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.install = (bool)value; + } + else if (MatchOption(newArg, "whatIf")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.whatIf = (bool)value; + } + else if (MatchOption(newArg, "verbose")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.verbose = (bool)value; + } + else if (MatchOption(newArg, "confirm")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.confirm = (bool)value; + } + else if (MatchOption(newArg, "noDesktop")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noDesktop = (bool)value; + } + else if (MatchOption(newArg, "noCompact")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noCompact = (bool)value; + } + else if (MatchOption(newArg, "noNetFx20")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noNetFx20 = (bool)value; + } + else if (MatchOption(newArg, "noNetFx40")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noNetFx40 = (bool)value; + } + else if (MatchOption(newArg, "noVs2008")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noVs2008 = (bool)value; + } + else if (MatchOption(newArg, "noVs2010")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noVs2010 = (bool)value; + } + else if (MatchOption(newArg, "noTrace")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noTrace = (bool)value; + } + else if (MatchOption(newArg, "noConsole")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noConsole = (bool)value; + } + else if (MatchOption(newArg, "noLog")) + { + bool? value = ParseBoolean(text); + + if (value == null) + { + error = TraceOps.Trace(traceCallback, String.Format( + "Invalid {0} boolean value: {1}", + ForDisplay(arg), ForDisplay(text)), + traceCategory); + + if (strict) + return false; + + continue; + } + + configuration.noLog = (bool)value; + } + else + { + error = TraceOps.Trace(traceCallback, String.Format( + "Unsupported command line option: {0}", + ForDisplay(arg)), traceCategory); + + if (strict) + return false; + } + } + else + { + error = TraceOps.Trace(traceCallback, String.Format( + "Unsupported command line argument: {0}", + ForDisplay(arg)), traceCategory); + + if (strict) + return false; + } + } + + return true; + } + catch (Exception e) + { + TraceOps.Trace(traceCallback, e, traceCategory); + + error = "Failed to modify configuration."; + } + + return false; + } + + /////////////////////////////////////////////////////////////////// + + public static bool Process( + string[] args, + Configuration configuration, + bool strict, + ref string error + ) + { + try + { + if (configuration == null) + { + error = "Invalid configuration."; + return false; + } + + Assembly assembly = configuration.assembly; + + if (assembly == null) + { + error = "Invalid assembly."; + return false; + } + + if (!configuration.noTrace) + { + if (!configuration.noLog && + String.IsNullOrEmpty(configuration.logFileName)) + { + configuration.logFileName = GetLogFileName(); + } + + /////////////////////////////////////////////////////// + + if (!configuration.noConsole) + { + Trace.Listeners.Add(new ConsoleTraceListener()); + } + + if (!configuration.noLog && + !String.IsNullOrEmpty(configuration.logFileName)) + { + Trace.Listeners.Add(new TextWriterTraceListener( + configuration.logFileName)); + } + } + + // + // NOTE: Dump the configuration now in case we need to + // troubleshoot any issues. + // + configuration.Dump(); + + // + // NOTE: Show where we are running from and how we were + // invoked. + // + string location = assembly.Location; + + TraceOps.Trace(traceCallback, String.Format( + "Original command line is: {0}", + Environment.CommandLine), traceCategory); + + // + // NOTE: If the debugger is attached and What-If mode is + // [now] disabled, issue a warning. + // + if (!configuration.whatIf && Debugger.IsAttached) + { + TraceOps.Trace(traceCallback, + "Forced to disable \"what-if\" mode with " + + "debugger attached.", traceCategory); + } + + // + // NOTE: If the command line has not been manually + // confirmed (i.e. via the explicit command line + // option), then stop processing now. We enforce + // this rule so that simply double-clicking the + // executable will not result in any changes being + // made to the system. + // + if (!configuration.confirm) + { + error = "Cannot continue, the \"confirm\" option is " + + "not enabled."; + + return false; + } + + return true; + } + catch (Exception e) + { + TraceOps.Trace(traceCallback, e, traceCategory); + + error = "Failed to process configuration."; + } + + return false; + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Public Methods + public bool HasFlags( + InstallFlags hasFlags, + bool all + ) + { + if (all) + return ((installFlags & hasFlags) == hasFlags); + else + return ((installFlags & hasFlags) != InstallFlags.None); + } + + /////////////////////////////////////////////////////////////////// + + public void Dump() + { + if (traceCallback != null) + { + traceCallback(String.Format(NameAndValueFormat, + "Assembly", ForDisplay(assembly)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "LogFileName", ForDisplay(logFileName)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "Directory", ForDisplay(directory)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "CoreFileName", ForDisplay(coreFileName)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "LinqFileName", ForDisplay(linqFileName)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "DesignerFileName", ForDisplay(designerFileName)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "InstallFlags", ForDisplay(installFlags)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "Install", ForDisplay(install)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoDesktop", ForDisplay(noDesktop)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoCompact", ForDisplay(noCompact)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoNetFx20", ForDisplay(noNetFx20)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoNetFx40", ForDisplay(noNetFx40)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoVs2008", ForDisplay(noVs2008)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoVs2010", ForDisplay(noVs2010)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoTrace", ForDisplay(noTrace)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoConsole", ForDisplay(noConsole)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "NoLog", ForDisplay(noLog)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "WhatIf", ForDisplay(whatIf)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "Verbose", ForDisplay(verbose)), + traceCategory); + + traceCallback(String.Format(NameAndValueFormat, + "Confirm", ForDisplay(confirm)), + traceCategory); + } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Public Properties + private Assembly assembly; + public Assembly Assembly + { + get { return assembly; } + set { assembly = value; } + } + + /////////////////////////////////////////////////////////////////// + + private string logFileName; + public string LogFileName + { + get { return logFileName; } + set { logFileName = value; } + } + + /////////////////////////////////////////////////////////////////// + + private string directory; + public string Directory + { + get { return directory; } + set { directory = value; } + } + + /////////////////////////////////////////////////////////////////// + + private string coreFileName; + public string CoreFileName + { + get { return coreFileName; } + set { coreFileName = value; } + } + + /////////////////////////////////////////////////////////////////// + + private string linqFileName; + public string LinqFileName + { + get { return linqFileName; } + set { linqFileName = value; } + } + + /////////////////////////////////////////////////////////////////// + + private string designerFileName; + public string DesignerFileName + { + get { return designerFileName; } + set { designerFileName = value; } + } + + /////////////////////////////////////////////////////////////////// + + private InstallFlags installFlags; + public InstallFlags InstallFlags + { + get { return installFlags; } + set { installFlags = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool install; + public bool Install + { + get { return install; } + set { install = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noDesktop; + public bool NoDesktop + { + get { return noDesktop; } + set { noDesktop = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noCompact; + public bool NoCompact + { + get { return noCompact; } + set { noCompact = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noNetFx20; + public bool NoNetFx20 + { + get { return noNetFx20; } + set { noNetFx20 = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noNetFx40; + public bool NoNetFx40 + { + get { return noNetFx40; } + set { noNetFx40 = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noVs2008; + public bool NoVs2008 + { + get { return noVs2008; } + set { noVs2008 = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noVs2010; + public bool NoVs2010 + { + get { return noVs2010; } + set { noVs2010 = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noTrace; + public bool NoTrace + { + get { return noTrace; } + set { noTrace = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noConsole; + public bool NoConsole + { + get { return noConsole; } + set { noConsole = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool noLog; + public bool NoLog + { + get { return noLog; } + set { noLog = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool whatIf; + public bool WhatIf + { + get { return whatIf; } + set { whatIf = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool verbose; + public bool Verbose + { + get { return verbose; } + set { verbose = value; } + } + + /////////////////////////////////////////////////////////////////// + + private bool confirm; + public bool Confirm + { + get { return confirm; } + set { confirm = value; } + } + #endregion + } + #endregion + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Private Constant Data + private const string CoreFileName = "System.Data.SQLite.dll"; + private const string LinqFileName = "System.Data.SQLite.Linq.dll"; + private const string DesignerFileName = "SQLite.Designer.dll"; + private const string ProviderName = "SQLite Data Provider"; + private const string ProjectName = "System.Data.SQLite"; + private const string LegacyProjectName = "SQLite"; + private const string InvariantName = "System.Data.SQLite"; + private const string FactoryTypeName = "System.Data.SQLite.SQLiteFactory"; + private const string Description = ".NET Framework Data Provider for SQLite"; + + /////////////////////////////////////////////////////////////////////// + + private const string NameAndValueFormat = "{0}: {1}"; + private const string TraceFormat = "#{0} @ {1}: {2}"; + private const string LogFileSuffix = ".log"; + + /////////////////////////////////////////////////////////////////////// + + private static readonly string VsIdFormat = "B"; + + /////////////////////////////////////////////////////////////////////// + + private static readonly string FrameworkKeyName = + "Software\\Microsoft\\.NETFramework"; + + /////////////////////////////////////////////////////////////////////// + + private static readonly string FrameworkSdkKeyName = + "Software\\Microsoft\\Microsoft SDKs\\.NETFramework"; + + /////////////////////////////////////////////////////////////////////// + + private static readonly string WindowsSdkKeyName = + "Software\\Microsoft\\Microsoft SDKs\\Windows"; + + /////////////////////////////////////////////////////////////////////// + + private static readonly string XPathForAddElement = + "configuration/system.data/DbProviderFactories/add[@invariant=\"{0}\"]"; + + private static readonly string XPathForRemoveElement = + "configuration/system.data/DbProviderFactories/remove[@invariant=\"{0}\"]"; + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Private Data + private static Assembly thisAssembly = Assembly.GetExecutingAssembly(); + + private static string traceCategory = Path.GetFileName( + thisAssembly.Location); + + private static TraceCallback traceCallback = AppTrace; + + /////////////////////////////////////////////////////////////////////// + + private static RegistryKey frameworkRootKey; + private static StringList frameworkNameList; + private static VersionMap frameworkVersionMap; + private static StringList platformNameList; + + /////////////////////////////////////////////////////////////////////// + + private static RegistryKey vsRootKey; + private static VersionList vsVersionList; + private static Guid? vsPackageId; + private static Guid? vsServiceId; + private static Guid? vsDataSourcesId; + private static Guid? vsDataProviderId; + private static Guid? vsAdoNetTechnologyId; + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Trace Handling + private static string GetLogFileName() + { + string result = Path.GetTempFileName(); /* throw */ + + File.Move(result, result + LogFileSuffix); /* throw */ + result += LogFileSuffix; + + return result; + } + + /////////////////////////////////////////////////////////////////////// + + private static void AppTrace( + string message, + string category + ) + { + TraceOps.TraceCore(String.Format( + TraceFormat, TraceOps.NextId(), + TraceOps.TimeStamp(DateTime.UtcNow), message), category); + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Generic String Handling + private static string ForDisplay( + object value + ) + { + if (value == null) + return ""; + + string result; + Type type = value.GetType(); + + if (type == typeof(XmlElement)) + { + XmlElement element = (XmlElement)value; + + result = element.OuterXml; + } + else + { + result = value.ToString(); + + if (result.Length == 0) + return ""; + + result = String.Format( + type.IsSubclassOf(typeof(ValueType)) ? "{0}" : "\"{0}\"", + result); + } + + return result; + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region .NET Framework Handling + private static string GetFrameworkDirectory( + RegistryKey rootKey, + Version frameworkVersion, + bool whatIf, + bool verbose + ) + { + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, FrameworkKeyName, false, whatIf, verbose)) + { + if (key == null) + return null; + + object value = RegistryHelper.GetValue( + key, "InstallRoot", null, whatIf, verbose); + + if (!(value is string)) + return null; + + return Path.Combine( + (string)value, String.Format("v{0}", frameworkVersion)); + } + } + + /////////////////////////////////////////////////////////////////////// + + private static string GetSdkBinaryFileName( + RegistryKey rootKey, + string fileName, + bool whatIf, + bool verbose + ) + { + StringDictionary results = new StringDictionary(); + + string[] keyNames = { + FrameworkKeyName, + FrameworkSdkKeyName, + WindowsSdkKeyName + }; + + string[] valueNames = { + "sdkInstallRootv2.0", + "InstallationFolder", + "InstallationFolder" + }; + + bool[] useSubKeys = { + false, + true, + true + }; + + for (int index = 0; index < keyNames.Length; index++) + { + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyNames[index], false, whatIf, verbose)) + { + if (key == null) + continue; + + if (useSubKeys[index]) + { + foreach (string subKeyName in RegistryHelper.GetSubKeyNames( + key, whatIf, verbose)) + { + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, subKeyName, false, whatIf, verbose)) + { + if (subKey == null) + continue; + + object value = RegistryHelper.GetValue( + subKey, valueNames[index], null, whatIf, + verbose); + + if (!(value is string)) + continue; + + string path = (string)value; + + if (!Directory.Exists(path)) + continue; + + path = Path.Combine(path, "bin"); + + if (!Directory.Exists(path)) + continue; + + if (String.IsNullOrEmpty(fileName)) + { + results.Add(subKey.Name, path); + continue; + } + + path = Path.Combine(path, fileName); + + if (File.Exists(path)) + results.Add(subKey.Name, path); + } + } + } + else + { + object value = RegistryHelper.GetValue( + key, valueNames[index], null, whatIf, verbose); + + if (!(value is string)) + continue; + + string path = (string)value; + + if (!Directory.Exists(path)) + continue; + + path = Path.Combine(path, "bin"); + + if (!Directory.Exists(path)) + continue; + + if (String.IsNullOrEmpty(fileName)) + { + results.Add(key.Name, path); + continue; + } + + path = Path.Combine(path, fileName); + + if (File.Exists(path)) + results.Add(key.Name, path); + } + } + } + + // + // NOTE: If we found some results, return the last (latest) one. + // + if (results.Count > 0) + return results[new StringList(results.Keys)[results.Count - 1]]; + + return null; + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Per-Framework/Platform Handling + private static void InitializeAllFrameworks( + Configuration configuration + ) + { + if (frameworkRootKey == null) + frameworkRootKey = Registry.LocalMachine; + + if (frameworkNameList == null) + { + frameworkNameList = new StringList(); + + if ((configuration == null) || !configuration.NoDesktop) + frameworkNameList.Add(".NETFramework"); + + if ((configuration == null) || !configuration.NoCompact) + { + frameworkNameList.Add(".NETCompactFramework"); + frameworkNameList.Add(".NETCompactFramework"); + frameworkNameList.Add(".NETCompactFramework"); + } + } + + if (frameworkVersionMap == null) + frameworkVersionMap = new VersionMap(); + + if ((configuration == null) || !configuration.NoDesktop) + { + VersionList desktopVersionList = new VersionList(); + + if ((configuration == null) || !configuration.NoNetFx20) + desktopVersionList.Add(new Version(2, 0, 50727)); + + if ((configuration == null) || !configuration.NoNetFx40) + desktopVersionList.Add(new Version(4, 0, 30319)); + + frameworkVersionMap.Add(".NETFramework", desktopVersionList); + } + + if ((configuration == null) || !configuration.NoCompact) + { + frameworkVersionMap.Add(".NETCompactFramework", new VersionList( + new Version[] { + new Version(2, 0, 0, 0), new Version(3, 5, 0, 0) + })); + } + + if (platformNameList == null) + { + platformNameList = new StringList(); + + if ((configuration == null) || !configuration.NoDesktop) + platformNameList.Add(null); + + if ((configuration == null) || !configuration.NoCompact) + { + platformNameList.Add("PocketPC"); + platformNameList.Add("Smartphone"); + platformNameList.Add("WindowsCE"); + } + } + } + + /////////////////////////////////////////////////////////////////////// + + private static bool HaveFramework( + RegistryKey rootKey, + string frameworkName, + Version frameworkVersion, + string platformName, + bool whatIf, + bool verbose + ) + { + string format = !String.IsNullOrEmpty(platformName) ? + "Software\\Microsoft\\{0}\\v{1}\\{2}" : + "Software\\Microsoft\\{0}\\v{1}"; + + string keyName = String.Format( + format, frameworkName, frameworkVersion, platformName); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + return false; + + if (platformName != null) // NOTE: Skip non-desktop frameworks. + return true; + + string directory = GetFrameworkDirectory( + rootKey, frameworkVersion, whatIf, verbose); + + if (String.IsNullOrEmpty(directory)) + return false; + + if (!Directory.Exists(directory)) + return false; + + return true; + } + } + + /////////////////////////////////////////////////////////////////////// + + private static bool ForEachFrameworkConfig( + FrameworkConfigCallback callback, + string invariant, + string name, + string description, + string typeName, + AssemblyName assemblyName, + object clientData, + bool whatIf, + bool verbose, + ref bool saved, + ref string error + ) + { + RegistryKey rootKey = frameworkRootKey; + + if (rootKey == null) + { + error = "invalid root key"; + return false; + } + + if (!Object.ReferenceEquals(rootKey, Registry.CurrentUser) && + !Object.ReferenceEquals(rootKey, Registry.LocalMachine)) + { + error = "root key must be per-user or per-machine"; + return false; + } + + if (frameworkNameList == null) + { + error = "no framework names found"; + return false; + } + + if (frameworkVersionMap == null) + { + error = "no framework versions found"; + return false; + } + + if (platformNameList == null) + { + error = "no platform names found"; + return false; + } + + if (frameworkNameList.Count != platformNameList.Count) + { + error = String.Format("framework name count {0} does not " + + "match platform name count {1}", frameworkNameList.Count, + platformNameList.Count); + + return false; + } + + for (int index = 0; index < frameworkNameList.Count; index++) + { + // + // NOTE: Grab the name of the framework (e.g. ".NETFramework") + // and the name of the platform (e.g. "WindowsCE"). + // + string frameworkName = frameworkNameList[index]; + string platformName = platformNameList[index]; + + // + // NOTE: Skip all non-desktop frameworks (i.e. if the platform + // name is not null). + // + if (platformName != null) + continue; + + // + // NOTE: Grab the supported versions of this particular + // framework. + // + VersionList frameworkVersionList; + + if (!frameworkVersionMap.TryGetValue( + frameworkName, out frameworkVersionList) || + (frameworkVersionList == null)) + { + continue; + } + + foreach (Version frameworkVersion in frameworkVersionList) + { + TraceOps.Trace(traceCallback, String.Format( + "frameworkName = {0}, frameworkVersion = {1}, " + + "platformName = {2}", ForDisplay(frameworkName), + ForDisplay(frameworkVersion), + ForDisplay(platformName)), traceCategory); + + if (!HaveFramework( + rootKey, frameworkName, frameworkVersion, + platformName, whatIf, verbose)) + { + TraceOps.Trace(traceCallback, + ".NET Framework not found, skipping...", + traceCategory); + + continue; + } + + if (callback == null) + continue; + + string directory = GetFrameworkDirectory( + rootKey, frameworkVersion, whatIf, verbose); + + if (String.IsNullOrEmpty(directory)) + { + TraceOps.Trace(traceCallback, String.Format( + ".NET Framework v{0} directory is invalid, " + + "skipping...", frameworkVersion), traceCategory); + + continue; + } + + directory = Path.Combine(directory, "Config"); + + if (!Directory.Exists(directory)) + { + TraceOps.Trace(traceCallback, String.Format( + ".NET Framework v{0} directory \"{1}\" does not " + + "exist, skipping...", frameworkVersion, directory), + traceCategory); + + continue; + } + + string fileName = Path.Combine(directory, "machine.config"); + + if (!File.Exists(fileName)) + { + TraceOps.Trace(traceCallback, String.Format( + ".NET Framework v{0} file \"{1}\" does not exist, " + + "skipping...", frameworkVersion, fileName), + traceCategory); + + continue; + } + + bool localSaved = false; + + if (!callback( + fileName, invariant, name, description, typeName, + assemblyName, clientData, whatIf, verbose, + ref localSaved, ref error)) + { + return false; + } + else + { + if (localSaved && !saved) + saved = true; + + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "localSaved = {0}, saved = {1}", localSaved, + saved), traceCategory); + } + } + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool ForEachFrameworkRegistry( + FrameworkRegistryCallback callback, + object clientData, + bool whatIf, + bool verbose, + ref string error + ) + { + RegistryKey rootKey = frameworkRootKey; + + if (rootKey == null) + { + error = "invalid root key"; + return false; + } + + if (!Object.ReferenceEquals(rootKey, Registry.CurrentUser) && + !Object.ReferenceEquals(rootKey, Registry.LocalMachine)) + { + error = "root key must be per-user or per-machine"; + return false; + } + + if (frameworkNameList == null) + { + error = "no framework names found"; + return false; + } + + if (frameworkVersionMap == null) + { + error = "no framework versions found"; + return false; + } + + if (platformNameList == null) + { + error = "no platform names found"; + return false; + } + + if (frameworkNameList.Count != platformNameList.Count) + { + error = String.Format("framework name count {0} does not " + + "match platform name count {1}", frameworkNameList.Count, + platformNameList.Count); + + return false; + } + + for (int index = 0; index < frameworkNameList.Count; index++) + { + // + // NOTE: Grab the name of the framework (e.g. ".NETFramework") + // and the name of the platform (e.g. "WindowsCE"). + // + string frameworkName = frameworkNameList[index]; + string platformName = platformNameList[index]; + + // + // NOTE: Grab the supported versions of this particular + // framework. + // + VersionList frameworkVersionList; + + if (!frameworkVersionMap.TryGetValue( + frameworkName, out frameworkVersionList) || + (frameworkVersionList == null)) + { + continue; + } + + foreach (Version frameworkVersion in frameworkVersionList) + { + TraceOps.Trace(traceCallback, String.Format( + "frameworkName = {0}, frameworkVersion = {1}, " + + "platformName = {2}", ForDisplay(frameworkName), + ForDisplay(frameworkVersion), + ForDisplay(platformName)), traceCategory); + + if (!HaveFramework( + rootKey, frameworkName, frameworkVersion, + platformName, whatIf, verbose)) + { + TraceOps.Trace(traceCallback, + ".NET Framework not found, skipping...", + traceCategory); + + continue; + } + + if (callback == null) + continue; + + if (!callback( + rootKey, frameworkName, frameworkVersion, + platformName, clientData, whatIf, verbose, + ref error)) + { + return false; + } + } + } + + return true; + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Per-Visual Studio Version Handling + private static void InitializeAllVsVersions( + Configuration configuration + ) + { + if (vsRootKey == null) + vsRootKey = Registry.LocalMachine; + + if (vsAdoNetTechnologyId == null) + vsAdoNetTechnologyId = new Guid( + "77AB9A9D-78B9-4BA7-91AC-873F5338F1D2"); + + if (vsPackageId == null) + vsPackageId = new Guid( + "DCBE6C8D-0E57-4099-A183-98FF74C64D9C"); + + if (vsServiceId == null) + vsServiceId = new Guid( + "DCBE6C8D-0E57-4099-A183-98FF74C64D9D"); + + if (vsDataSourcesId == null) + vsDataSourcesId = new Guid( + "0EBAAB6E-CA80-4B4A-8DDF-CBE6BF058C71"); + + if (vsDataProviderId == null) + vsDataProviderId = new Guid( + "0EBAAB6E-CA80-4B4A-8DDF-CBE6BF058C70"); + + if (vsVersionList == null) + { + vsVersionList = new VersionList(); + + // vsVersionList.Add(new Version(8, 0)); // Visual Studio 2005 + + if ((configuration == null) || !configuration.NoVs2008) + vsVersionList.Add(new Version(9, 0)); // Visual Studio 2008 + + if ((configuration == null) || !configuration.NoVs2010) + vsVersionList.Add(new Version(10, 0));// Visual Studio 2010 + } + } + + /////////////////////////////////////////////////////////////////////// + + private static bool HaveVsVersion( + RegistryKey rootKey, + Version vsVersion, + bool whatIf, + bool verbose + ) + { + string format = "Software\\Microsoft\\VisualStudio\\{0}"; + string keyName = String.Format(format, vsVersion); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + return false; + + object value = RegistryHelper.GetValue( + key, "InstallDir", null, whatIf, verbose); + + if (!(value is string)) + return false; + + string directory = (string)value; + + if (String.IsNullOrEmpty(directory)) + return false; + + if (!Directory.Exists(directory)) + return false; + + return true; + } + } + + /////////////////////////////////////////////////////////////////////// + + private static bool ForEachVsVersionRegistry( + VisualStudioRegistryCallback callback, + Guid packageId, + Guid serviceId, + Guid dataSourceId, + Guid dataProviderId, + object clientData, + bool whatIf, + bool verbose, + ref string error + ) + { + RegistryKey rootKey = vsRootKey; + + if (rootKey == null) + { + error = "invalid root key"; + return false; + } + + if (!Object.ReferenceEquals(rootKey, Registry.CurrentUser) && + !Object.ReferenceEquals(rootKey, Registry.LocalMachine)) + { + error = "root key must be per-user or per-machine"; + return false; + } + + if (vsVersionList == null) + { + error = "no VS versions found"; + return false; + } + + foreach (Version vsVersion in vsVersionList) + { + TraceOps.Trace(traceCallback, String.Format( + "vsVersion = {0}", ForDisplay(vsVersion)), + traceCategory); + + if (!HaveVsVersion(rootKey, vsVersion, whatIf, verbose)) + { + TraceOps.Trace(traceCallback, + "Visual Studio version not found, skipping...", + traceCategory); + + continue; + } + + if (callback == null) + continue; + + if (!callback( + rootKey, vsVersion, packageId, serviceId, + dataSourceId, dataProviderId, clientData, whatIf, + verbose, ref error)) + { + return false; + } + } + + return true; + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Configuration File Handling + private static bool AddDbProviderFactory( + string fileName, + string invariant, + string name, + string description, + string typeName, + AssemblyName assemblyName, + bool whatIf, + bool verbose, + ref bool saved, + ref string error + ) + { + bool dirty = false; + XmlDocument document = new XmlDocument(); + + document.PreserveWhitespace = true; + document.Load(fileName); + + XmlElement element = document.SelectSingleNode(String.Format( + XPathForAddElement, invariant)) as XmlElement; + + if (element == null) + { + string[] elementNames = { + "system.data", "DbProviderFactories" + }; + + XmlElement previousElement = + document.DocumentElement; /* configuration */ + + foreach (string elementName in elementNames) + { + element = previousElement.SelectSingleNode( + elementName) as XmlElement; + + if (element == null) + { + element = document.CreateElement( + elementName, String.Empty); + + previousElement.AppendChild(element); + } + + previousElement = element; + } + + element = document.CreateElement( + "add", String.Empty); + + previousElement.AppendChild(element); + + dirty = true; + } + + if (!String.Equals(element.GetAttribute("name"), + name, StringComparison.InvariantCulture)) + { + element.SetAttribute("name", name); + dirty = true; + } + + if (!String.Equals(element.GetAttribute("invariant"), + invariant, StringComparison.InvariantCulture)) + { + element.SetAttribute("invariant", invariant); + dirty = true; + } + + if (!String.Equals(element.GetAttribute("description"), + description, StringComparison.InvariantCulture)) + { + element.SetAttribute("description", description); + dirty = true; + } + + string fullTypeName = String.Format("{0}, {1}", + typeName, assemblyName); + + if (!String.Equals(element.GetAttribute("type"), + fullTypeName, StringComparison.InvariantCulture)) + { + element.SetAttribute("type", fullTypeName); + dirty = true; + } + + if (dirty) + { + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "element = {0}", ForDisplay(element)), traceCategory); + + if (!whatIf) + document.Save(fileName); + + saved = true; + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool RemoveDbProviderFactory( + string fileName, + string invariant, + bool whatIf, + bool verbose, + ref bool saved, + ref string error + ) + { + bool dirty = false; + XmlDocument document = new XmlDocument(); + + document.PreserveWhitespace = true; + document.Load(fileName); + + XmlElement element = document.SelectSingleNode(String.Format( + XPathForAddElement, invariant)) as XmlElement; + + if (element != null) + { + element.ParentNode.RemoveChild(element); + dirty = true; + } + + element = document.SelectSingleNode(String.Format( + XPathForRemoveElement, invariant)) as XmlElement; + + if (element != null) + { + element.ParentNode.RemoveChild(element); + dirty = true; + } + + if (dirty) + { + if (verbose) + TraceOps.Trace(traceCallback, String.Format( + "element = {0}", ForDisplay(element)), traceCategory); + + if (!whatIf) + document.Save(fileName); + + saved = true; + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool ProcessDbProviderFactory( + string fileName, + string invariant, + string name, + string description, + string typeName, + AssemblyName assemblyName, + object clientData, + bool whatIf, + bool verbose, + ref bool saved, + ref string error + ) + { + AnyPair pair = clientData as AnyPair; + + if (pair == null) + { + error = "invalid framework config callback data"; + return false; + } + + if (pair.Y) + { + return RemoveDbProviderFactory( + fileName, invariant, whatIf, verbose, ref saved, + ref error) && + AddDbProviderFactory( + fileName, invariant, name, description, typeName, + assemblyName, whatIf, verbose, ref saved, ref error); + } + else + { + return RemoveDbProviderFactory( + fileName, invariant, whatIf, verbose, ref saved, + ref error); + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Assembly Folders Handling + private static string GetAssemblyFoldersKeyName( + string frameworkName, + Version frameworkVersion, + string platformName + ) + { + string format = !String.IsNullOrEmpty(platformName) ? + "Software\\Microsoft\\{0}\\v{1}\\{2}\\AssemblyFoldersEx" : + "Software\\Microsoft\\{0}\\v{1}\\AssemblyFoldersEx"; + + return String.Format(format, frameworkName, frameworkVersion, + platformName); + } + + /////////////////////////////////////////////////////////////////////// + + private static bool AddToAssemblyFolders( + RegistryKey rootKey, + string frameworkName, + Version frameworkVersion, + string platformName, + string subKeyName, + string directory, + bool whatIf, + bool verbose, + ref string error + ) + { + string keyName = GetAssemblyFoldersKeyName( + frameworkName, frameworkVersion, platformName); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, true, whatIf, verbose)) + { + if (key == null) + { + error = String.Format( + "could not open registry key: {0}\\{1}", + rootKey, keyName); + + return false; + } + + using (MockRegistryKey subKey = RegistryHelper.CreateSubKey( + key, subKeyName, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not create registry key: {0}\\{1}", + key, subKeyName); + + return false; + } + + RegistryHelper.SetValue( + subKey, null, directory, whatIf, verbose); + } + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool RemoveFromAssemblyFolders( + RegistryKey rootKey, + string frameworkName, + Version frameworkVersion, + string platformName, + string subKeyName, + bool whatIf, + bool verbose, + ref string error + ) + { + string keyName = GetAssemblyFoldersKeyName( + frameworkName, frameworkVersion, platformName); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + { + error = String.Format( + "could not open registry key: {0}\\{1}", + rootKey, keyName); + + return false; + } + + RegistryHelper.DeleteSubKey( + key, subKeyName, whatIf, verbose); + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool ProcessAssemblyFolders( + RegistryKey rootKey, + string frameworkName, + Version frameworkVersion, + string platformName, + object clientData, + bool whatIf, + bool verbose, + ref string error + ) + { + AnyPair pair = clientData as AnyPair; + + if (pair == null) + { + error = "invalid framework callback data"; + return false; + } + + if (pair.Y) + { + return RemoveFromAssemblyFolders( + rootKey, frameworkName, frameworkVersion, platformName, + LegacyProjectName, whatIf, verbose, ref error) && + AddToAssemblyFolders( + rootKey, frameworkName, frameworkVersion, platformName, + ProjectName, pair.X, whatIf, verbose, ref error); + } + else + { + return RemoveFromAssemblyFolders( + rootKey, frameworkName, frameworkVersion, platformName, + ProjectName, whatIf, verbose, ref error); + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Visual Studio Handling + private static string GetVsKeyName( + Version vsVersion + ) + { + return String.Format("Software\\Microsoft\\VisualStudio\\{0}", + vsVersion); + } + + /////////////////////////////////////////////////////////////////////// + + #region Visual Studio Data Source Handling + private static bool AddVsDataSource( + RegistryKey rootKey, + Version vsVersion, + Guid dataSourceId, + Guid dataProviderId, + bool whatIf, + bool verbose, + ref string error + ) + { + string keyName = GetVsKeyName(vsVersion); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + { + error = String.Format( + "could not open registry key: {0}\\{1}", + rootKey, keyName); + + return false; + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "DataSources", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\DataSources", + key); + + return false; + } + + using (MockRegistryKey dataSourceKey = RegistryHelper.CreateSubKey( + subKey, dataSourceId.ToString(VsIdFormat), whatIf, + verbose)) + { + if (dataSourceKey == null) + { + error = String.Format( + "could not create registry key: {0}\\{1}", + key, dataSourceId.ToString(VsIdFormat)); + + return false; + } + + RegistryHelper.SetValue( + dataSourceKey, null, String.Format( + "{0} Database File", ProjectName), whatIf, + verbose); + + RegistryHelper.CreateSubKey(dataSourceKey, + String.Format("SupportingProviders\\{0}", + dataProviderId.ToString(VsIdFormat)), whatIf, + verbose); + } + } + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool RemoveVsDataSource( + RegistryKey rootKey, + Version vsVersion, + Guid dataSourceId, + bool whatIf, + bool verbose, + ref string error + ) + { + string keyName = GetVsKeyName(vsVersion); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + { + error = String.Format( + "could not open registry key: {0}\\{1}", + rootKey, keyName); + + return false; + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "DataSources", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\DataSources", + key); + + return false; + } + + RegistryHelper.DeleteSubKeyTree( + subKey, dataSourceId.ToString(VsIdFormat), whatIf, + verbose); + } + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool ProcessVsDataSource( + RegistryKey rootKey, + Version vsVersion, + Guid packageId, /* NOT USED */ + Guid serviceId, /* NOT USED */ + Guid dataSourceId, + Guid dataProviderId, + object clientData, + bool whatIf, + bool verbose, + ref string error + ) + { + AnyPair pair = clientData as AnyPair; + + if (pair == null) + { + error = "invalid VS callback data"; + return false; + } + + if (pair.Y) + { + return AddVsDataSource( + rootKey, vsVersion, dataSourceId, dataProviderId, + whatIf, verbose, ref error); + } + else + { + return RemoveVsDataSource( + rootKey, vsVersion, dataSourceId, whatIf, verbose, + ref error); + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Visual Studio Data Provider Handling + private static bool AddVsDataProvider( + RegistryKey rootKey, + Version vsVersion, + Guid serviceId, + Guid dataProviderId, + string fileName, + bool whatIf, + bool verbose, + ref string error + ) + { + if (vsAdoNetTechnologyId == null) + { + error = "invalid ADO.NET technology Id"; + return false; + } + + string keyName = GetVsKeyName(vsVersion); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + { + error = String.Format( + "could not open registry key: {0}\\{1}", + rootKey, keyName); + + return false; + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "DataProviders", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\DataProviders", + key); + + return false; + } + + using (MockRegistryKey dataProviderKey = RegistryHelper.CreateSubKey( + subKey, dataProviderId.ToString(VsIdFormat), whatIf, + verbose)) + { + if (dataProviderKey == null) + { + error = String.Format( + "could not create registry key: {0}\\{1}", + key, dataProviderId.ToString(VsIdFormat)); + + return false; + } + + RegistryHelper.SetValue( + dataProviderKey, null, Description, whatIf, + verbose); + + RegistryHelper.SetValue( + dataProviderKey, "InvariantName", InvariantName, + whatIf, verbose); + + RegistryHelper.SetValue( + dataProviderKey, "Technology", + ((Guid)vsAdoNetTechnologyId).ToString(VsIdFormat), + whatIf, verbose); + + RegistryHelper.SetValue( + dataProviderKey, "CodeBase", fileName, whatIf, + verbose); + + RegistryHelper.SetValue( + dataProviderKey, "FactoryService", + serviceId.ToString(VsIdFormat), whatIf, verbose); + + RegistryHelper.CreateSubKey(dataProviderKey, + "SupportedObjects\\DataConnectionUIControl", + whatIf, verbose); + + RegistryHelper.CreateSubKey(dataProviderKey, + "SupportedObjects\\DataConnectionProperties", + whatIf, verbose); + + RegistryHelper.CreateSubKey(dataProviderKey, + "SupportedObjects\\DataConnectionSupport", whatIf, + verbose); + + RegistryHelper.CreateSubKey(dataProviderKey, + "SupportedObjects\\DataObjectSupport", whatIf, + verbose); + + RegistryHelper.CreateSubKey(dataProviderKey, + "SupportedObjects\\DataViewSupport", whatIf, + verbose); + } + } + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool RemoveVsDataProvider( + RegistryKey rootKey, + Version vsVersion, + Guid dataProviderId, + bool whatIf, + bool verbose, + ref string error + ) + { + string keyName = GetVsKeyName(vsVersion); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + { + error = String.Format( + "could not open registry key: {0}\\{1}", + rootKey, keyName); + + return false; + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "DataProviders", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\DataProviders", + key); + + return false; + } + + RegistryHelper.DeleteSubKeyTree( + subKey, dataProviderId.ToString(VsIdFormat), whatIf, + verbose); + } + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool ProcessVsDataProvider( + RegistryKey rootKey, + Version vsVersion, + Guid packageId, /* NOT USED */ + Guid serviceId, + Guid dataSourceId, /* NOT USED */ + Guid dataProviderId, + object clientData, + bool whatIf, + bool verbose, + ref string error + ) + { + AnyPair pair = clientData as AnyPair; + + if (pair == null) + { + error = "invalid VS callback data"; + return false; + } + + if (pair.Y) + { + return AddVsDataProvider( + rootKey, vsVersion, serviceId, dataProviderId, pair.X, + whatIf, verbose, ref error); + } + else + { + return RemoveVsDataProvider( + rootKey, vsVersion, dataProviderId, whatIf, verbose, + ref error); + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Visual Studio Package Handling + private static bool AddVsPackage( + RegistryKey rootKey, + Version vsVersion, + Guid packageId, + Guid serviceId, + string fileName, + bool whatIf, + bool verbose, + ref string error + ) + { + string keyName = GetVsKeyName(vsVersion); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + { + error = String.Format( + "could not open registry key: {0}\\{1}", + rootKey, keyName); + + return false; + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "Packages", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\Packages", + key); + + return false; + } + + using (MockRegistryKey packageKey = RegistryHelper.CreateSubKey( + subKey, packageId.ToString(VsIdFormat), whatIf, + verbose)) + { + if (packageKey == null) + { + error = String.Format( + "could not create registry key: {0}\\{1}", + key, packageId.ToString(VsIdFormat)); + + return false; + } + + RegistryHelper.SetValue(packageKey, null, String.Format( + "{0} Designer Package", ProjectName), whatIf, + verbose); + + RegistryHelper.SetValue(packageKey, "Class", + "SQLite.Designer.SQLitePackage", whatIf, verbose); + + RegistryHelper.SetValue(packageKey, "CodeBase", + fileName, whatIf, verbose); + + RegistryHelper.SetValue(packageKey, "ID", 400, whatIf, + verbose); + + RegistryHelper.SetValue(packageKey, "InprocServer32", + Path.Combine(Environment.SystemDirectory, + "mscoree.dll"), whatIf, verbose); + + RegistryHelper.SetValue(packageKey, "CompanyName", + "http://system.data.sqlite.org/", whatIf, verbose); + + RegistryHelper.SetValue(packageKey, "MinEdition", + "standard", whatIf, verbose); + + RegistryHelper.SetValue(packageKey, "ProductName", + String.Format("{0} Designer Package", ProjectName), + whatIf, verbose); + + RegistryHelper.SetValue(packageKey, "ProductVersion", + "1.0", whatIf, verbose); + + using (MockRegistryKey toolboxKey = RegistryHelper.CreateSubKey( + packageKey, "Toolbox", whatIf, verbose)) + { + if (toolboxKey == null) + { + error = String.Format( + "could not create registry key: {0}\\Toolbox", + packageKey); + + return false; + } + + RegistryHelper.SetValue( + toolboxKey, "Default Items", 3, whatIf, + verbose); + } + } + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "Menus", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\Menus", + key); + + return false; + } + + RegistryHelper.SetValue( + subKey, packageId.ToString(VsIdFormat), ", 1000, 3", + whatIf, verbose); + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "Services", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\Services", + key); + + return false; + } + + using (MockRegistryKey serviceKey = RegistryHelper.CreateSubKey( + subKey, serviceId.ToString(VsIdFormat), whatIf, + verbose)) + { + if (serviceKey == null) + { + error = String.Format( + "could not create registry key: {0}\\{1}", + key, serviceId.ToString(VsIdFormat)); + + return false; + } + + RegistryHelper.SetValue(serviceKey, null, + packageId.ToString(VsIdFormat), whatIf, verbose); + + RegistryHelper.SetValue(serviceKey, "Name", + String.Format("{0} Designer Service", ProjectName), + whatIf, verbose); + } + } + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool RemoveVsPackage( + RegistryKey rootKey, + Version vsVersion, + Guid packageId, + Guid serviceId, + bool whatIf, + bool verbose, + ref string error + ) + { + string keyName = GetVsKeyName(vsVersion); + + using (MockRegistryKey key = RegistryHelper.OpenSubKey( + rootKey, keyName, false, whatIf, verbose)) + { + if (key == null) + { + error = String.Format( + "could not open registry key: {0}\\{1}", + rootKey, keyName); + + return false; + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "Packages", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\Packages", + key); + + return false; + } + + RegistryHelper.DeleteSubKeyTree( + key, packageId.ToString(VsIdFormat), whatIf, verbose); + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "Menus", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\Menus", + key); + + return false; + } + + RegistryHelper.DeleteValue( + subKey, packageId.ToString(VsIdFormat), whatIf, + verbose); + } + + using (MockRegistryKey subKey = RegistryHelper.OpenSubKey( + key, "Services", true, whatIf, verbose)) + { + if (subKey == null) + { + error = String.Format( + "could not open registry key: {0}\\Services", + key); + + return false; + } + + RegistryHelper.DeleteSubKeyTree( + subKey, serviceId.ToString(VsIdFormat), whatIf, + verbose); + } + } + + return true; + } + + /////////////////////////////////////////////////////////////////////// + + private static bool ProcessVsPackage( + RegistryKey rootKey, + Version vsVersion, + Guid packageId, + Guid serviceId, + Guid dataSourceId, + Guid dataProviderId, + object clientData, + bool whatIf, + bool verbose, + ref string error + ) + { + AnyPair pair = clientData as AnyPair; + + if (pair == null) + { + error = "invalid VS callback data"; + return false; + } + + if (pair.Y) + { + return AddVsPackage( + rootKey, vsVersion, packageId, serviceId, pair.X, whatIf, + verbose, ref error); + } + else + { + return RemoveVsPackage( + rootKey, vsVersion, packageId, serviceId, whatIf, verbose, + ref error); + } + } + #endregion + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Application Entry Point + private static int Main(string[] args) + { + Configuration configuration = null; + string error = null; + + /////////////////////////////////////////////////////////////////// + + #region Command Line Processing + if (!Configuration.FromArgs( + args, true, ref configuration, ref error) || + !Configuration.Process( + args, configuration, true, ref error)) + { + TraceOps.ShowMessage( + traceCallback, thisAssembly, error, traceCategory, + MessageBoxButtons.OK, MessageBoxIcon.Error); + + return 1; + } + + /////////////////////////////////////////////////////////////////// + + InitializeAllFrameworks(configuration); + InitializeAllVsVersions(configuration); + #endregion + + /////////////////////////////////////////////////////////////////// + + AnyPair directoryPair = new AnyPair( + configuration.Directory, configuration.Install); + + AnyPair fileNamePair = new AnyPair( + configuration.DesignerFileName, configuration.Install); + + /////////////////////////////////////////////////////////////////// + + #region .NET GAC Install/Remove + if (configuration.HasFlags(InstallFlags.GAC, true)) + { + Publish publish = new Publish(); + + if (configuration.Install) + { + if (!configuration.WhatIf) + { + publish.GacInstall(configuration.CoreFileName); /* throw */ + publish.GacInstall(configuration.LinqFileName); /* throw */ + } + else + { + TraceOps.Trace(traceCallback, String.Format( + "GacInstall: assemblyPath = {0}", + configuration.CoreFileName), traceCategory); + + TraceOps.Trace(traceCallback, String.Format( + "GacInstall: assemblyPath = {0}", + configuration.LinqFileName), traceCategory); + } + } + else + { + if (!configuration.WhatIf) + { + publish.GacRemove(configuration.LinqFileName); /* throw */ + publish.GacRemove(configuration.CoreFileName); /* throw */ + } + else + { + TraceOps.Trace(traceCallback, String.Format( + "GacRemove: assemblyPath = {0}", + configuration.LinqFileName), traceCategory); + + TraceOps.Trace(traceCallback, String.Format( + "GacRemove: assemblyPath = {0}", + configuration.CoreFileName), traceCategory); + } + } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region .NET AssemblyFolders + if (configuration.HasFlags(InstallFlags.AssemblyFolders, true)) + { + if (!ForEachFrameworkRegistry(ProcessAssemblyFolders, + directoryPair, configuration.WhatIf, + configuration.Verbose, ref error)) + { + TraceOps.ShowMessage( + traceCallback, null, error, traceCategory, + MessageBoxButtons.OK, MessageBoxIcon.Error); + + return 1; + } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region .NET DbProviderFactory + if (configuration.HasFlags(InstallFlags.DbProviderFactory, true)) + { + bool saved = false; + + if (!ForEachFrameworkConfig(ProcessDbProviderFactory, + InvariantName, ProviderName, Description, + FactoryTypeName, AssemblyName.GetAssemblyName( + configuration.CoreFileName), directoryPair, + configuration.WhatIf, configuration.Verbose, + ref saved, ref error)) + { + TraceOps.ShowMessage( + traceCallback, null, error, traceCategory, + MessageBoxButtons.OK, MessageBoxIcon.Error); + + return 1; + } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region VS Package + if (configuration.HasFlags(InstallFlags.VsPackage, true)) + { + if (!ForEachVsVersionRegistry(ProcessVsPackage, + (Guid)vsPackageId, (Guid)vsServiceId, + (Guid)vsDataSourcesId, (Guid)vsDataProviderId, + fileNamePair, configuration.WhatIf, + configuration.Verbose, ref error)) + { + TraceOps.ShowMessage( + traceCallback, null, error, traceCategory, + MessageBoxButtons.OK, MessageBoxIcon.Error); + + return 1; + } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region VS DataSource + if (configuration.HasFlags(InstallFlags.VsDataSource, true)) + { + if (!ForEachVsVersionRegistry(ProcessVsDataSource, + (Guid)vsPackageId, (Guid)vsServiceId, + (Guid)vsDataSourcesId, (Guid)vsDataProviderId, + fileNamePair, configuration.WhatIf, + configuration.Verbose, ref error)) + { + TraceOps.ShowMessage( + traceCallback, null, error, traceCategory, + MessageBoxButtons.OK, MessageBoxIcon.Error); + + return 1; + } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + #region VS DataProvider + if (configuration.HasFlags(InstallFlags.VsDataProvider, true)) + { + if (!ForEachVsVersionRegistry(ProcessVsDataProvider, + (Guid)vsPackageId, (Guid)vsServiceId, + (Guid)vsDataSourcesId, (Guid)vsDataProviderId, + fileNamePair, configuration.WhatIf, + configuration.Verbose, ref error)) + { + TraceOps.ShowMessage( + traceCallback, null, error, traceCategory, + MessageBoxButtons.OK, MessageBoxIcon.Error); + + return 1; + } + } + #endregion + + /////////////////////////////////////////////////////////////////// + + TraceOps.Trace(traceCallback, String.Format( + "subKeysCreated = {0}, subKeysDeleted = {1}, " + + "keyValuesSet = {2}, keyValuesDeleted = {3}", + RegistryHelper.SubKeysCreated, RegistryHelper.SubKeysDeleted, + RegistryHelper.KeyValuesSet, RegistryHelper.KeyValuesDeleted), + traceCategory); + + /////////////////////////////////////////////////////////////////// + + return 0; + } + #endregion + } + #endregion +} DELETED tools/install/Program.cs Index: tools/install/Program.cs ================================================================== --- tools/install/Program.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Windows.Forms; - -namespace install -{ - static class Program - { - ///

- /// The main entry point for the application. - ///

- [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Environment.CurrentDirectory = System.IO.Path.GetDirectoryName(Application.ExecutablePath); - - InstallDesigner designer = new InstallDesigner(); - if (designer._remove == false) - designer.ShowDialog(); - } - } -} Index: tools/install/Properties/AssemblyInfo.cs ================================================================== --- tools/install/Properties/AssemblyInfo.cs +++ tools/install/Properties/AssemblyInfo.cs @@ -3,18 +3,21 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SQLite.Designer Installer")] -[assembly: AssemblyDescription("SQLite ADO.NET Design-Time Installer")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("http://system.data.sqlite.org")] -[assembly: AssemblyProduct("SQLite Installer")] +[assembly: AssemblyTitle("System.Data.SQLite Designer Installer")] +[assembly: AssemblyDescription("ADO.NET Data Provider for SQLite")] +[assembly: AssemblyCompany("http://system.data.sqlite.org/")] +[assembly: AssemblyProduct("System.Data.SQLite")] [assembly: AssemblyCopyright("Public Domain")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] DELETED tools/install/Properties/Resources.Designer.cs Index: tools/install/Properties/Resources.Designer.cs ================================================================== --- tools/install/Properties/Resources.Designer.cs +++ /dev/null @@ -1,70 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.1 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace install.Properties { - using System; - - - ///

- /// A strongly-typed resource class, for looking up localized strings, etc. - ///

- // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - ///

- /// Returns the cached ResourceManager instance used by this class. - ///

- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("install.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - ///

- /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - ///

- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - internal static byte[] System_Data_SQLite { - get { - object obj = ResourceManager.GetObject("System_Data_SQLite", resourceCulture); - return ((byte[])(obj)); - } - } - } -} DELETED tools/install/Properties/Resources.resx Index: tools/install/Properties/Resources.resx ================================================================== --- tools/install/Properties/Resources.resx +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Resources\System.Data.SQLite.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DELETED tools/install/Resources/System.Data.SQLite.dll Index: tools/install/Resources/System.Data.SQLite.dll ================================================================== --- tools/install/Resources/System.Data.SQLite.dll +++ /dev/null cannot compute difference between binary files DELETED tools/install/app.config Index: tools/install/app.config ================================================================== --- tools/install/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - DELETED tools/install/install.exe.manifest Index: tools/install/install.exe.manifest ================================================================== --- tools/install/install.exe.manifest +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - DELETED tools/install/install.ico Index: tools/install/install.ico ================================================================== --- tools/install/install.ico +++ /dev/null cannot compute difference between binary files DELETED tools/mergebin/MetaData.cpp Index: tools/mergebin/MetaData.cpp ================================================================== --- tools/mergebin/MetaData.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#include "StdAfx.h" -#include "MetaData.h" - -CMetadata::CStream::operator LPBYTE() const -{ - return m_pbData; -} - -CMetadata::CMetadata(CPEFile& peFile) : m_peFile(peFile) -{ - PIMAGE_COR20_HEADER pCor = m_peFile; - if (!pCor) throw; - - LPBYTE pb = (LPBYTE)m_peFile.GetPtrFromRVA(pCor->MetaData.VirtualAddress); - LPBYTE pbRoot = pb; - size_t x; - if (!pb) throw; - - m_pdwSignature = (LPDWORD)pb; - m_pwMajorVersion = (LPWORD)(m_pdwSignature + 1); - m_pwMinorVersion = m_pwMajorVersion + 1; - m_pdwVersionLength = (LPDWORD)(m_pwMinorVersion + 3); - m_pszVersion = (LPSTR)(m_pdwVersionLength + 1); - - pb = (LPBYTE)m_pszVersion; - x = *m_pdwVersionLength; - if (x % 4) x += 4 - (x % 4); - pb += x; - pb += 2; - - m_pwStreams = (LPWORD)pb; - m_pStreams = new CStream[*m_pwStreams]; - pb = (LPBYTE)(m_pwStreams + 1); - - for (WORD n = 0; n < *m_pwStreams; n++) - { - m_pStreams[n].m_pdwOffset = (LPDWORD)pb; - m_pStreams[n].m_pdwSize = m_pStreams[n].m_pdwOffset + 1; - m_pStreams[n].m_pszName = (LPSTR)(m_pStreams[n].m_pdwSize + 1); - m_pStreams[n].m_pbData = pbRoot + (*m_pStreams[n].m_pdwOffset); - - x = strlen(m_pStreams[n].m_pszName) + 1; - if (x % 4) x += 4 - (x % 4); - - pb = (LPBYTE)m_pStreams[n].m_pszName + x; - } -} - -CMetadata::~CMetadata(void) -{ - delete[] m_pStreams; -} - -CMetadata::operator CPEFile&() const -{ - return m_peFile; -} - -CMetadata::CStream * CMetadata::GetStream(UINT uiStream) -{ - if (uiStream >= *m_pwStreams) return NULL; - return &m_pStreams[uiStream]; -} - -CMetadata::CStream * CMetadata::GetStream(LPCSTR pszStreamName) -{ - for (WORD n = 0; n < *m_pwStreams; n++) - { - if (_stricmp(pszStreamName, m_pStreams[n].m_pszName) == 0) - return &m_pStreams[n]; - } - return NULL; -} - -WORD * CMetadata::StreamCount() const -{ - return m_pwStreams; -} - DELETED tools/mergebin/MetaData.h Index: tools/mergebin/MetaData.h ================================================================== --- tools/mergebin/MetaData.h +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#pragma once - -#include "pefile.h" - -class CMetadata -{ -public: - class CStream - { - friend CMetadata; - public: - operator LPBYTE() const; - - protected: - DWORD *m_pdwOffset; - DWORD *m_pdwSize; - LPSTR m_pszName; - LPBYTE m_pbData; - }; -public: - CMetadata(CPEFile& peFile); - virtual ~CMetadata(void); - -protected: - CPEFile& m_peFile; - - DWORD *m_pdwSignature; - WORD *m_pwMajorVersion; - WORD *m_pwMinorVersion; - DWORD *m_pdwVersionLength; - LPSTR m_pszVersion; - WORD *m_pwStreams; - CStream *m_pStreams; - -public: - operator CPEFile&() const; - - WORD * StreamCount () const; - CMetadata::CStream * GetStream (UINT uiStream); - CMetadata::CStream * GetStream (LPCSTR pszStreamName); -}; DELETED tools/mergebin/MetaDataTables.cpp Index: tools/mergebin/MetaDataTables.cpp ================================================================== --- tools/mergebin/MetaDataTables.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#include "StdAfx.h" -#include "MetaDataTables.h" -#include "TableData.h" - -CMetadataTables::CMetadataTables(CMetadata& metaData) : m_meta(metaData) -{ - CMetadata::CStream *ps = m_meta.GetStream("#~"); - if (!ps) throw; - - *static_cast(this) = *ps; - - LPBYTE pb = m_pbData + sizeof(DWORD); - m_pbMajorVersion = pb; - m_pbMinorVersion = m_pbMajorVersion + 1; - m_pbHeapOffsetSizes = m_pbMinorVersion + 1; - // Skip a byte - m_pullMaskValid = (UINT64 *)(m_pbHeapOffsetSizes + 2); - m_pullMaskSorted = m_pullMaskValid + 1; - - m_pdwTableLengths = (LPDWORD)(m_pullMaskSorted + 1); - - m_dwTables = 0; - for (int n = 0; n < 64; n++) - { - if ((((*m_pullMaskValid) >> n) & 1) == 1) - { - m_pdwTableLengthIndex[n] = &m_pdwTableLengths[m_dwTables ++]; - } - else - { - m_pdwTableLengthIndex[n] = NULL; - } - } - m_pbData = (LPBYTE)(m_pdwTableLengths + m_dwTables); - - for (int n = 0; n < 64; n++) - { - if (m_pdwTableLengthIndex[n] && g_arTableTypes[n]) - { - m_pTables[n] = g_arTableTypes[n](this); - } - else - m_pTables[n] = 0; - } -} - -CMetadataTables::~CMetadataTables(void) -{ - for (int n = 0; n < 64; n++) - { - if (m_pTables[n]) - delete m_pTables[n]; - } -} - -UINT CMetadataTables::GetStringIndexSize(void) -{ - return ((*m_pbHeapOffsetSizes) & 0x01) == 0 ? sizeof(WORD) : sizeof(DWORD); -} - -UINT CMetadataTables::GetGuidIndexSize(void) -{ - return ((*m_pbHeapOffsetSizes) & 0x02) == 0 ? sizeof(WORD) : sizeof(DWORD); -} - -UINT CMetadataTables::GetBlobIndexSize(void) -{ - return ((*m_pbHeapOffsetSizes) & 0x04) == 0 ? sizeof(WORD) : sizeof(DWORD); -} - -DWORD *CMetadataTables::TableRowCount(UINT uType) -{ - return m_pdwTableLengthIndex[uType]; -} - -DWORD CMetadataTables::GetMaxIndexSizeOf(UINT * puiTables) -{ - DWORD dwMaxRows = 0; - DWORD *pdwLength; - UINT uCount = 0; - - while (*puiTables) - { - uCount ++; - pdwLength = m_pdwTableLengthIndex[*puiTables]; - if (pdwLength) - dwMaxRows = max(dwMaxRows, pdwLength[0]); - - puiTables ++; - } - - return (dwMaxRows > 0xFFFF) ? 4 : 2; - //return (dwMaxRows > (ULONG)(2 << (16 - uCount))) ? 4 : 2; -} - -CTableData *CMetadataTables::GetTable(UINT uId) -{ - return m_pTables[uId]; -} DELETED tools/mergebin/MetaDataTables.h Index: tools/mergebin/MetaDataTables.h ================================================================== --- tools/mergebin/MetaDataTables.h +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#pragma once -#include "metadata.h" - -class CTableData; - -class CMetadataTables : - public CMetadata::CStream -{ - friend CTableData; - -public: - CMetadataTables(CMetadata& metaData); - virtual ~CMetadataTables(void); - -protected: - CMetadata& m_meta; - BYTE *m_pbMajorVersion; - BYTE *m_pbMinorVersion; - BYTE *m_pbHeapOffsetSizes; - UINT64 *m_pullMaskValid; - UINT64 *m_pullMaskSorted; - DWORD *m_pdwTableLengths; - - DWORD *m_pdwTableLengthIndex[64]; - DWORD m_dwTables; - - CTableData *m_pTables[64]; - -public: - UINT GetStringIndexSize (); - UINT GetGuidIndexSize (); - UINT GetBlobIndexSize (); - DWORD GetMaxIndexSizeOf (UINT *); - - DWORD * TableRowCount (UINT uType); - - CTableData *GetTable (UINT uId); -}; DELETED tools/mergebin/PEFile.cpp Index: tools/mergebin/PEFile.cpp ================================================================== --- tools/mergebin/PEFile.cpp +++ /dev/null @@ -1,184 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#include "StdAfx.h" -#include "PEFile.h" - -#define MakePtr( cast, ptr, addValue ) (cast)( (DWORD_PTR)(ptr) + (DWORD_PTR)(addValue)) - -CPEFile::CPEFile(void) -{ - m_hMap = NULL; - m_hFile = INVALID_HANDLE_VALUE; - m_pBase = NULL; -} - -CPEFile::~CPEFile(void) -{ - Close(); -} - -HRESULT CPEFile::Open(LPCTSTR pszFile, BOOL bReadOnly) -{ - HRESULT hr = S_OK; - Close(); - - m_hFile = CreateFile(pszFile, GENERIC_READ | ((bReadOnly == FALSE) ? GENERIC_WRITE: 0), FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (m_hFile == INVALID_HANDLE_VALUE) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - } - else - { - m_hMap = CreateFileMapping(m_hFile, NULL, (bReadOnly == TRUE) ? PAGE_READONLY:PAGE_READWRITE, 0, 0, NULL); - if (!m_hMap) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - } - else - { - m_pBase = (PIMAGE_DOS_HEADER)MapViewOfFile(m_hMap, FILE_MAP_READ | ((bReadOnly == FALSE) ? FILE_MAP_WRITE:0), 0, 0, 0); - if (!m_pBase) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - } - } - } - - if (SUCCEEDED(hr)) - { - PIMAGE_FILE_HEADER pImageHeader = (PIMAGE_FILE_HEADER)m_pBase; - if (m_pBase->e_magic != IMAGE_DOS_SIGNATURE) - { - hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); - } - - m_pNTHeader = MakePtr(PIMAGE_NT_HEADERS, m_pBase, m_pBase->e_lfanew); - if (IsBadReadPtr(m_pNTHeader, sizeof(m_pNTHeader->Signature))) - { - hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); - } - else - { - if (m_pNTHeader->Signature != IMAGE_NT_SIGNATURE) - { - hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); - } - } - m_bIs64Bit = (m_pNTHeader->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC); - } - - if (FAILED(hr)) Close(); - - return hr; -} - -void CPEFile::Close(void) -{ - if (m_pBase) - { - UnmapViewOfFile(m_pBase); - } - - if (m_hMap) - CloseHandle(m_hMap); - - if (m_hFile != INVALID_HANDLE_VALUE) - CloseHandle(m_hFile); - - m_hMap = NULL; - m_hFile = INVALID_HANDLE_VALUE; - m_pBase = NULL; -} - -PIMAGE_SECTION_HEADER CPEFile::GetEnclosingSectionHeader(DWORD rva) const -{ - PIMAGE_SECTION_HEADER section; - - if (m_bIs64Bit) - section = IMAGE_FIRST_SECTION((PIMAGE_NT_HEADERS64)m_pNTHeader); - else - section = IMAGE_FIRST_SECTION(m_pNTHeader); - - for (UINT i=0; i < m_pNTHeader->FileHeader.NumberOfSections; i++, section++ ) - { - DWORD size = section->Misc.VirtualSize; - if (!size) - size = section->SizeOfRawData; - - if ( (rva >= section->VirtualAddress) && - (rva < (section->VirtualAddress + size))) - return section; - } - return NULL; -} - -LPVOID CPEFile::GetPtrFromRVA(DWORD rva) const -{ - PIMAGE_SECTION_HEADER pSectionHdr; - INT delta; - - pSectionHdr = GetEnclosingSectionHeader(rva); - if ( !pSectionHdr ) - return 0; - - delta = (INT)(pSectionHdr->VirtualAddress-pSectionHdr->PointerToRawData); - return (PVOID) (((LPBYTE)m_pBase) + rva - delta); -} - -PIMAGE_SECTION_HEADER CPEFile::GetSectionHeader(LPCSTR name) const -{ - PIMAGE_SECTION_HEADER section; - - if (m_bIs64Bit) - section = IMAGE_FIRST_SECTION((PIMAGE_NT_HEADERS64)m_pNTHeader); - else - section = IMAGE_FIRST_SECTION(m_pNTHeader); - - for (UINT i=0; i < m_pNTHeader->FileHeader.NumberOfSections; i++, section++) - { - if (_strnicmp((char *)section->Name,name,IMAGE_SIZEOF_SHORT_NAME) == 0) - return section; - } - - return NULL; -} - -CPEFile::operator PIMAGE_NT_HEADERS32() const -{ - if (!m_pBase || m_bIs64Bit) return NULL; - return m_pNTHeader; -} - -CPEFile::operator PIMAGE_NT_HEADERS64() const -{ - if (!m_pBase || !m_bIs64Bit) return NULL; - return (PIMAGE_NT_HEADERS64)m_pNTHeader; -} - -CPEFile::operator PIMAGE_DOS_HEADER() const -{ - return m_pBase; -} - -CPEFile::operator PIMAGE_COR20_HEADER() const -{ - if (!m_pBase) return NULL; - - DWORD dwRVA; - - if (m_bIs64Bit) - dwRVA = ((PIMAGE_NT_HEADERS64)m_pNTHeader)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; - else - dwRVA = m_pNTHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; - if (!dwRVA) - { - return NULL; - } - - return ((PIMAGE_COR20_HEADER)GetPtrFromRVA(dwRVA)); -} DELETED tools/mergebin/PEFile.h Index: tools/mergebin/PEFile.h ================================================================== --- tools/mergebin/PEFile.h +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#pragma once - -class CPEFile -{ -public: - CPEFile(); - virtual ~CPEFile(void); - -protected: - HANDLE m_hMap; - HANDLE m_hFile; - PIMAGE_DOS_HEADER m_pBase; - PIMAGE_NT_HEADERS32 m_pNTHeader; - BOOL m_bIs64Bit; - -public: - HRESULT Open (LPCTSTR pszFile, BOOL bReadOnly = TRUE); - void Close (void); - - PIMAGE_SECTION_HEADER GetEnclosingSectionHeader (DWORD rva) const; - LPVOID GetPtrFromRVA (DWORD rva) const; - PIMAGE_SECTION_HEADER GetSectionHeader (LPCSTR name) const; - - operator PIMAGE_DOS_HEADER () const; - operator PIMAGE_NT_HEADERS32 () const; - operator PIMAGE_NT_HEADERS64 () const; - operator PIMAGE_COR20_HEADER () const; -}; DELETED tools/mergebin/StreamTable.cpp Index: tools/mergebin/StreamTable.cpp ================================================================== --- tools/mergebin/StreamTable.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "StdAfx.h" -#include "StreamTable.h" - -CREATEINSTANCE g_arTableTypes[64] = { - CStreamTable::CreateInstance, - CStreamTable::CreateInstance, - CStreamTable::CreateInstance, - NULL, -}; - -CStreamTable::CStreamTable(CMetadataTables& tables) : m_tables(tables) -{ -} - -CStreamTable::~CStreamTable(void) -{ -} - -template -static CStreamTable * CALLBACK CStreamTable::CreateInstance(CMetadataTables *ptables) -{ - CStreamTable *p = new C(*ptables); - p->Init(); - - return p; -} - -void CStreamTable::Init() -{ - m_pbData = m_tables.m_pbData; - CStreamTable *p; - - for (UINT n = 0; n < GetType(); n++) - { - p = m_tables.GetTable(n); - if (p) - { - m_pbData += (p->GetRowSize() * p->GetRowCount()); - } - } -} - -DWORD CStreamTable::GetRowCount() -{ - return *m_tables.TableRowCount(GetType()); -} - -UINT CStreamTable::GetRowSize() -{ - TABLE_COLUMN *pc = GetColumns(); - UINT ulen = 0; - - while (pc->uSize) - { - ulen += pc->uSize; - pc ++; - } - - return ulen; -} - -UINT CStreamTable::GetColumnCount() -{ - TABLE_COLUMN *pc = GetColumns(); - UINT ucount = 0; - - while (pc->uSize) - { - ucount ++; - pc ++; - } - return ucount; -} - -LPBYTE CStreamTable::operator[](UINT uRow) -{ - return m_pbData + (uRow * GetRowSize()); -} DELETED tools/mergebin/StreamTable.h Index: tools/mergebin/StreamTable.h ================================================================== --- tools/mergebin/StreamTable.h +++ /dev/null @@ -1,158 +0,0 @@ -#pragma once -#include "MetaDataTables.h" - -typedef enum TableTypes -{ - ttModule = 0, - ttTypeRef = 1, - ttTypeDef = 2, - ttFieldPtr = 3, - ttField = 4, - ttMethodPtr = 5, - ttMethodDef = 6, - ttParamPtr = 7, - ttParam = 8, - ttInterfaceImpl = 9, - ttMemberRef = 10, - ttConstant = 11, - ttCustomAttribute = 12, - ttFieldMarshal = 13, - ttPermission = 14, - ttClassLayout = 15, - ttFieldLayout = 16, - ttStandAloneSig = 17, - ttEventMap = 18, - ttEventPtr = 19, - ttEvent = 20, - ttPropertyMap = 21, - ttPropertyPtr = 22, - ttProperty = 23, - ttMethodSemantics = 24, - ttMethodImpl = 25, - ttModuleRef = 26, - ttTypeSpec = 27, - ttImplMap = 28, //lidin book is wrong again here? It has enclog at 28 - ttFieldRVA = 29, - ttENCLog = 30, - ttENCMap = 31, - ttAssembly = 32, - ttAssemblyProcessor= 33, - ttAssemblyOS = 34, - ttAssemblyRef = 35, - ttAssemblyRefProcessor = 36, - ttAssemblyRefOS = 37, - ttFile = 38, - ttExportedType = 39, - ttManifestResource = 40, - ttNestedClass = 41, - ttTypeTyPar = 42, - ttMethodTyPar = 43, -} TableTypes; - -#define STRING_INDEXSIZE (m_tables.GetStringIndexSize()) -#define GUID_INDEXSIZE (m_tables.GetGuidIndexSize()) -#define BLOB_INDEXSIZE (m_tables.GetBlobIndexSize()) -#define TABLE_ROWCOUNT(x) (m_tables.TableRowCount(x)[0]) -#define TABLE_INDEXSIZE(x) (TABLE_ROWCOUNT(x) > 65535 ? 4 : 2) -#define MAX_INDEXSIZE(x) (m_tables.GetMaxIndexSizeOf(x)) - -class CStreamTable; - -typedef CStreamTable* (CALLBACK* CREATEINSTANCE)(CMetadataTables *); - -#define DECLARE_TABLE(classname, typ, nam) \ - public: \ - classname##(CMetadataTables& tables) : CStreamTable(tables) {} \ - UINT GetType() { return typ; } \ - LPCTSTR GetName() { return _T(nam); } - -typedef struct TABLE_COLUMN -{ - UINT uSize; - LPCTSTR pszName; -} TABLE_COLUMNS; - -#define BEGIN_COLUMN_MAP() \ - protected: \ - TABLE_COLUMN *GetColumns() \ - { \ - static TABLE_COLUMN map[] = { - -#define END_COLUMN_MAP() \ - { 0, NULL } \ - }; \ - return map; \ - } - -#define COLUMN_ENTRY(name, size) { size, _T(name) }, - -class CStreamTable -{ -public: - CStreamTable(CMetadataTables& tables); - virtual ~CStreamTable(void); - - DWORD GetRowCount(); - LPBYTE operator[](UINT uRow); - - virtual UINT GetType() = 0; - virtual LPCTSTR GetName() = 0; - - template static CStreamTable * CALLBACK CreateInstance(CMetadataTables *ptables); - -protected: - CMetadataTables& m_tables; - LPBYTE m_pbData; - - virtual UINT GetRowSize(); - virtual UINT GetColumnCount(); - - virtual TABLE_COLUMN *GetColumns() = 0; - -private: - void Init(); -}; - -class CModuleTable : public CStreamTable -{ - DECLARE_TABLE(CModuleTable, ttModule, "Module") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Generation", sizeof(WORD)) - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - COLUMN_ENTRY("Mvid", GUID_INDEXSIZE) - COLUMN_ENTRY("EncId", GUID_INDEXSIZE) - COLUMN_ENTRY("EncBaseId", GUID_INDEXSIZE) - END_COLUMN_MAP() -}; - -static UINT ResolutionScopeIndex[] = {ttModule, ttModuleRef, ttAssemblyRef, ttTypeRef, 0}; - -class CTypeRefTable : public CStreamTable -{ - DECLARE_TABLE(CTypeRefTable, ttTypeRef, "TypeRef") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("ResolutionScope", MAX_INDEXSIZE(ResolutionScopeIndex)) - COLUMN_ENTRY("TypeName", STRING_INDEXSIZE) - COLUMN_ENTRY("TypeNamespace", STRING_INDEXSIZE) - END_COLUMN_MAP() -}; - -static UINT TypeDefOrRefIndex[] = {ttTypeDef, ttTypeRef, ttTypeSpec, 0}; - -class CTypeDefTable : public CStreamTable -{ - DECLARE_TABLE(CTypeDefTable, ttTypeDef, "TypeDef") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Flags", sizeof(DWORD)) - COLUMN_ENTRY("TypeName", STRING_INDEXSIZE) - COLUMN_ENTRY("TypeNamespace", STRING_INDEXSIZE) - COLUMN_ENTRY("Extends", MAX_INDEXSIZE(TypeDefOrRefIndex)) - COLUMN_ENTRY("FieldList", TABLE_INDEXSIZE(ttField)) - COLUMN_ENTRY("MethodList", TABLE_INDEXSIZE(ttMethodDef)) - END_COLUMN_MAP() -}; - -extern CREATEINSTANCE g_arTableTypes[64]; DELETED tools/mergebin/TableData.cpp Index: tools/mergebin/TableData.cpp ================================================================== --- tools/mergebin/TableData.cpp +++ /dev/null @@ -1,166 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#include "StdAfx.h" -#include "TableData.h" - -CREATEINSTANCE g_arTableTypes[64] = { - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - CTableData::CreateInstance, - NULL, -}; - -CTableData::CTableData(CMetadataTables& tables) : m_tables(tables) -{ - m_uiRowSize = 0; -} - -CTableData::~CTableData(void) -{ - if (m_pColumns) - delete[] m_pColumns; -} - -template -static CTableData * CALLBACK CTableData::CreateInstance(CMetadataTables *ptables) -{ - CTableData *p = new C(*ptables); - p->Init(); - - return p; -} - -void CTableData::Init() -{ - m_pbData = m_tables.m_pbData; - CTableData *p; - UINT n = GetType(); - - while(n--) - { - p = m_tables.GetTable(n); - if (p) - { - m_pbData = p->m_pbData + (p->GetRowSize() * p->GetRowCount()); - break; - } - } - - m_pColumns = _CreateColumns(); - TABLE_COLUMNS *tc = m_pColumns + 1; - - while (tc->pszName && !tc->dwOffset) - { - tc->dwOffset = tc[-1].dwOffset + tc[-1].uSize; - tc ++; - } -} - -TABLE_COLUMN * CTableData::GetColumns() -{ - return m_pColumns; -} - -DWORD CTableData::GetRowCount() -{ - return *m_tables.TableRowCount(GetType()); -} - -UINT CTableData::GetRowSize() -{ - if (m_uiRowSize == 0) - { - TABLE_COLUMN *pc = m_pColumns; - - while (pc->uSize) - { - m_uiRowSize += pc->uSize; - pc ++; - } - } - - return m_uiRowSize; -} - -UINT CTableData::GetColumnCount() -{ - TABLE_COLUMN *pc = m_pColumns; - UINT ucount = 0; - - while (pc->uSize) - { - ucount ++; - pc ++; - } - return ucount; -} - -int CTableData::GetColumnIndex(LPCTSTR pszName) -{ - TABLE_COLUMN *pc = m_pColumns; - for (int n = 0; pc[n].pszName; n++) - { - if (lstrcmpi(pszName, pc[n].pszName) == 0) return n; - } - return -1; -} - -UINT CTableData::GetColumnSize(UINT uIndex) -{ - return m_pColumns[uIndex].uSize; -} - -UINT CTableData::GetColumnSize(LPCTSTR pszName) -{ - int n = GetColumnIndex(pszName); - if (n < 0) return 0; - - return GetColumnSize(n); -} - -LPBYTE CTableData::Column(UINT uRow, UINT uIndex) -{ - TABLE_COLUMN *pc = m_pColumns; - LPBYTE pb = m_pbData + (uRow * GetRowSize()) + pc[uIndex].dwOffset; - - return pb; -} - -LPBYTE CTableData::Column(UINT uRow, LPCTSTR pszName) -{ - int n = GetColumnIndex(pszName); - if (n < 0) return NULL; - return Column(uRow, n); -} DELETED tools/mergebin/TableData.h Index: tools/mergebin/TableData.h ================================================================== --- tools/mergebin/TableData.h +++ /dev/null @@ -1,471 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#pragma once -#include "MetaDataTables.h" - -typedef enum TableTypes -{ - ttModule = 0, - ttTypeRef = 1, - ttTypeDef = 2, - ttFieldPtr = 3, - ttField = 4, - ttMethodPtr = 5, - ttMethodDef = 6, - ttParamPtr = 7, - ttParam = 8, - ttInterfaceImpl = 9, - ttMemberRef = 10, - ttConstant = 11, - ttCustomAttribute = 12, - ttFieldMarshal = 13, - ttDeclSecurity = 14, - ttClassLayout = 15, - ttFieldLayout = 16, - ttStandAloneSig = 17, - ttEventMap = 18, - ttEventPtr = 19, - ttEvent = 20, - ttPropertyMap = 21, - ttPropertyPtr = 22, - ttProperty = 23, - ttMethodSemantics = 24, - ttMethodImpl = 25, - ttModuleRef = 26, - ttTypeSpec = 27, - ttImplMap = 28, - ttFieldRVA = 29, - ttENCLog = 30, - ttENCMap = 31, - ttAssembly = 32, - ttAssemblyProcessor= 33, - ttAssemblyOS = 34, - ttAssemblyRef = 35, - ttAssemblyRefProcessor = 36, - ttAssemblyRefOS = 37, - ttFile = 38, - ttExportedType = 39, - ttManifestResource = 40, - ttNestedClass = 41, - ttGenericParam = 42, - ttMethodSpec = 43, - ttGenericParamConstraint = 44, -} TableTypes; - -typedef struct TABLE_COLUMN -{ - UINT uSize; - LPCTSTR pszName; - DWORD dwOffset; -} TABLE_COLUMNS; - -class CTableData; - -/* -** Helpers -*/ -#define STRING_INDEXSIZE (m_tables.GetStringIndexSize()) -#define GUID_INDEXSIZE (m_tables.GetGuidIndexSize()) -#define BLOB_INDEXSIZE (m_tables.GetBlobIndexSize()) -#define TABLE_ROWCOUNT(x) (m_tables.TableRowCount(x)[0]) -#define TABLE_INDEXSIZE(x) (TABLE_ROWCOUNT(x) > 65535 ? 4 : 2) -#define MAX_INDEXSIZE(x) (m_tables.GetMaxIndexSizeOf(x)) - -#define DECLARE_TABLE(classname, typ, nam) \ - public: \ - classname##(CMetadataTables& tables) : CTableData(tables) {} \ - UINT GetType() { return typ; } \ - LPCTSTR GetName() { return _T(nam); } - -#define BEGIN_COLUMN_MAP() \ - protected: \ - TABLE_COLUMN *_CreateColumns() \ - { \ - TABLE_COLUMN map[] = { - -#define END_COLUMN_MAP() \ - { 0, NULL } \ - }; \ - TABLE_COLUMN *p = new TABLE_COLUMN[sizeof(map) / sizeof(TABLE_COLUMN)]; \ - CopyMemory(p, map, sizeof(map)); \ - return p; \ - } - -#define COLUMN_ENTRY(name, size) { size, _T(name), 0 }, -/* -** End Of Helpers -*/ - -class CTableData -{ -public: - CTableData(CMetadataTables& tables); - virtual ~CTableData(void); - - virtual UINT GetType () = 0; - virtual LPCTSTR GetName () = 0; - virtual TABLE_COLUMN *_CreateColumns () = 0; - - template static CTableData * CALLBACK CreateInstance(CMetadataTables *ptables); - - virtual DWORD GetRowCount (); - virtual UINT GetRowSize (); - - int GetColumnIndex (LPCTSTR pszName); - UINT GetColumnSize (UINT uIndex); - UINT GetColumnSize (LPCTSTR pszName); - UINT GetColumnCount (); - LPBYTE Column (UINT uRow, UINT uIndex); - LPBYTE Column (UINT uRow, LPCTSTR pszName); - TABLE_COLUMN *GetColumns (); - -protected: - CMetadataTables& m_tables; - LPBYTE m_pbData; - UINT m_uiRowSize; - TABLE_COLUMN *m_pColumns; - -private: - void Init (); -}; - -class CModuleTable : public CTableData -{ - DECLARE_TABLE(CModuleTable, ttModule, "Module") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Generation", sizeof(WORD)) - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - COLUMN_ENTRY("Mvid", GUID_INDEXSIZE) - COLUMN_ENTRY("EncId", GUID_INDEXSIZE) - COLUMN_ENTRY("EncBaseId", GUID_INDEXSIZE) - END_COLUMN_MAP() -}; - -static UINT TypeDefOrRefIndex[] = { ttTypeDef, ttTypeRef, ttTypeSpec, 0 }; -static UINT HasConstantIndex[] = { ttField, ttParam, ttProperty, 0 }; -static UINT HasCustomAttributeIndex[] = { ttMethodDef, ttField, ttTypeRef, ttTypeDef, ttParam, ttInterfaceImpl, ttMemberRef, ttModule, ttDeclSecurity, ttProperty, ttEvent, ttStandAloneSig, ttModuleRef, ttTypeSpec, ttAssembly, ttAssemblyRef, ttFile, ttExportedType, ttManifestResource, 0 }; -static UINT HasFieldMarshalIndex[] = { ttField, ttParam, 0 }; -static UINT HasDeclSecurityIndex[] = { ttTypeDef, ttMethodDef, ttAssembly, 0 }; -static UINT MemberRefParentIndex[] = { ttTypeDef, ttTypeRef, ttModuleRef, ttMethodDef, ttTypeSpec, 0 }; -static UINT HasSemanticsIndex[] = { ttEvent, ttProperty, 0 }; -static UINT MethodDefOrRefIndex[] = { ttMethodDef, ttMemberRef, 0 }; -static UINT MemberForwardedIndex[] = { ttField, ttMethodDef, 0 }; -static UINT ImplementationIndex[] = { ttFile, ttAssemblyRef, ttExportedType, 0 }; -static UINT CustomAttributeTypeIndex[] = { 63, 63, ttMethodDef, ttMemberRef, 63, 0 }; -static UINT ResolutionScopeIndex[] = { ttModule, ttModuleRef, ttAssemblyRef, ttTypeRef, 0 }; -static UINT TypeOrMethodDefIndex[] = { ttTypeDef, ttMethodDef, 0 }; - -class CTypeRefTable : public CTableData -{ - DECLARE_TABLE(CTypeRefTable, ttTypeRef, "TypeRef") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("ResolutionScope", MAX_INDEXSIZE(ResolutionScopeIndex)) - COLUMN_ENTRY("TypeName", STRING_INDEXSIZE) - COLUMN_ENTRY("TypeNamespace", STRING_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CTypeDefTable : public CTableData -{ - DECLARE_TABLE(CTypeDefTable, ttTypeDef, "TypeDef") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Flags", sizeof(DWORD)) - COLUMN_ENTRY("TypeName", STRING_INDEXSIZE) - COLUMN_ENTRY("TypeNamespace", STRING_INDEXSIZE) - COLUMN_ENTRY("Extends", MAX_INDEXSIZE(TypeDefOrRefIndex)) - COLUMN_ENTRY("FieldList", TABLE_INDEXSIZE(ttField)) - COLUMN_ENTRY("MethodList", TABLE_INDEXSIZE(ttMethodDef)) - END_COLUMN_MAP() -}; - -class CFieldPtrTable : public CTableData -{ - DECLARE_TABLE(CFieldPtrTable, ttFieldPtr, "FieldPtr") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Field", TABLE_INDEXSIZE(ttField)) - END_COLUMN_MAP() -}; - -class CFieldTable : public CTableData -{ - DECLARE_TABLE(CFieldTable, ttField, "Field") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Flags", sizeof(WORD)) - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - COLUMN_ENTRY("Signature", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CMethodPtrTable : public CTableData -{ - DECLARE_TABLE(CMethodPtrTable, ttMethodPtr, "MethodPtr") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Method", TABLE_INDEXSIZE(ttMethodDef)) - END_COLUMN_MAP() -}; - -class CMethodTable : public CTableData -{ - DECLARE_TABLE(CMethodTable, ttMethodDef, "Method") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("RVA", sizeof(DWORD)) - COLUMN_ENTRY("ImplFlags", sizeof(WORD)) - COLUMN_ENTRY("Flags", sizeof(WORD)) - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - COLUMN_ENTRY("Signature", BLOB_INDEXSIZE) - COLUMN_ENTRY("Parameters", TABLE_INDEXSIZE(ttParam)) - END_COLUMN_MAP() -}; - -class CParamPtrTable : public CTableData -{ - DECLARE_TABLE(CParamPtrTable, ttParamPtr, "ParamPtr") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Param", TABLE_INDEXSIZE(ttParam)) - END_COLUMN_MAP() -}; - -class CParamTable : public CTableData -{ - DECLARE_TABLE(CParamTable, ttParam, "Param") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Flags", sizeof(WORD)) - COLUMN_ENTRY("Sequence", sizeof(WORD)) - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CInterfaceImplTable : public CTableData -{ - DECLARE_TABLE(CInterfaceImplTable, ttInterfaceImpl, "Interface") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Class", TABLE_INDEXSIZE(ttTypeDef)) - COLUMN_ENTRY("Interface", MAX_INDEXSIZE(TypeDefOrRefIndex)) - END_COLUMN_MAP() -}; - -class CMemberRefTable : public CTableData -{ - DECLARE_TABLE(CMemberRefTable, ttMemberRef, "Member") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Class", MAX_INDEXSIZE(MemberRefParentIndex)) - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - COLUMN_ENTRY("Signature", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CConstantTable : public CTableData -{ - DECLARE_TABLE(CConstantTable, ttConstant, "Constant") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Type", sizeof(WORD)) - COLUMN_ENTRY("Parent", MAX_INDEXSIZE(HasConstantIndex)) - COLUMN_ENTRY("Value", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CCustomAttributeTable : public CTableData -{ - DECLARE_TABLE(CCustomAttributeTable, ttCustomAttribute, "CustomAttribute") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Parent", MAX_INDEXSIZE(HasCustomAttributeIndex)) - COLUMN_ENTRY("Type", MAX_INDEXSIZE(CustomAttributeTypeIndex)) - COLUMN_ENTRY("Value", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CFieldMarshalTable : public CTableData -{ - DECLARE_TABLE(CFieldMarshalTable, ttFieldMarshal, "FieldMarshal") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Parent", MAX_INDEXSIZE(HasFieldMarshalIndex)) - COLUMN_ENTRY("NativeType", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CDeclSecurityTable : public CTableData -{ - DECLARE_TABLE(CDeclSecurityTable, ttDeclSecurity, "DeclSecurity") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Action", sizeof(WORD)) - COLUMN_ENTRY("Parent", MAX_INDEXSIZE(HasDeclSecurityIndex)) - COLUMN_ENTRY("PermissionSet", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CClassLayoutTable : public CTableData -{ - DECLARE_TABLE(CClassLayoutTable, ttClassLayout, "ClassLayout") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("PackingSize", sizeof(WORD)) - COLUMN_ENTRY("ClassSize", sizeof(DWORD)) - COLUMN_ENTRY("Parent", TABLE_INDEXSIZE(ttTypeDef)) - END_COLUMN_MAP() -}; - -class CFieldLayoutTable : public CTableData -{ - DECLARE_TABLE(CFieldLayoutTable, ttFieldLayout, "FieldLayout") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Offset", sizeof(DWORD)) - COLUMN_ENTRY("Field", TABLE_INDEXSIZE(ttField)) - END_COLUMN_MAP() -}; - -class CStandAloneSigTable : public CTableData -{ - DECLARE_TABLE(CStandAloneSigTable, ttStandAloneSig, "StandAloneSig") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Signature", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CEventMapTable : public CTableData -{ - DECLARE_TABLE(CEventMapTable, ttEventMap, "EventMap") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Parent", TABLE_INDEXSIZE(ttTypeDef)) - COLUMN_ENTRY("EventList", TABLE_INDEXSIZE(ttEvent)) - END_COLUMN_MAP() -}; - -class CEventTable : public CTableData -{ - DECLARE_TABLE(CEventTable, ttEvent, "Event") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("EventFlags", sizeof(WORD)) - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - COLUMN_ENTRY("EventType", MAX_INDEXSIZE(TypeDefOrRefIndex)) - END_COLUMN_MAP() -}; - -class CEventPtrTable : public CTableData -{ - DECLARE_TABLE(CEventPtrTable, ttEventPtr, "EventPtr") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Event", TABLE_INDEXSIZE(ttEvent)) - END_COLUMN_MAP() -}; - -class CPropertyMapTable : public CTableData -{ - DECLARE_TABLE(CPropertyMapTable, ttPropertyMap, "PropertyMap") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Parent", TABLE_INDEXSIZE(ttTypeDef)) - COLUMN_ENTRY("PropertyList", TABLE_INDEXSIZE(ttProperty)) - END_COLUMN_MAP() -}; - -class CPropertyPtrTable : public CTableData -{ - DECLARE_TABLE(CPropertyPtrTable, ttEventPtr, "PropertyPtr") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Property", TABLE_INDEXSIZE(ttProperty)) - END_COLUMN_MAP() -}; - -class CPropertyTable : public CTableData -{ - DECLARE_TABLE(CPropertyTable, ttProperty, "Property") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Flags", sizeof(WORD)) - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - COLUMN_ENTRY("Type", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CMethodSemanticsTable : public CTableData -{ - DECLARE_TABLE(CMethodSemanticsTable, ttMethodSemantics, "MethodSemantics") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Semantics", sizeof(WORD)) - COLUMN_ENTRY("Method", TABLE_INDEXSIZE(ttMethodDef)) - COLUMN_ENTRY("Association", MAX_INDEXSIZE(HasSemanticsIndex)) - END_COLUMN_MAP() -}; - -class CMethodImplTable : public CTableData -{ - DECLARE_TABLE(CMethodImplTable, ttMethodImpl, "MethodImpl") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Class", TABLE_INDEXSIZE(ttTypeDef)) - COLUMN_ENTRY("MethodBody", MAX_INDEXSIZE(MethodDefOrRefIndex)) - COLUMN_ENTRY("MethodDeclaration", MAX_INDEXSIZE(MethodDefOrRefIndex)) - END_COLUMN_MAP() -}; - -class CModuleRefTable : public CTableData -{ - DECLARE_TABLE(CModuleRefTable, ttModuleRef, "ModuleRef") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Name", STRING_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CTypeSpecTable : public CTableData -{ - DECLARE_TABLE(CTypeSpecTable, ttTypeSpec, "TypeSpec") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("Signature", BLOB_INDEXSIZE) - END_COLUMN_MAP() -}; - -class CImplMapTable : public CTableData -{ - DECLARE_TABLE(CImplMapTable, ttImplMap, "ImplMap") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("MappingFlags", sizeof(WORD)) - COLUMN_ENTRY("MemberForwarded", MAX_INDEXSIZE(MemberForwardedIndex)) - COLUMN_ENTRY("ImportName", STRING_INDEXSIZE) - COLUMN_ENTRY("ImportScope", TABLE_INDEXSIZE(ttModuleRef)) - END_COLUMN_MAP() -}; - -class CFieldRVATable : public CTableData -{ - DECLARE_TABLE(CFieldRVATable, ttFieldRVA, "FieldRVA") - - BEGIN_COLUMN_MAP() - COLUMN_ENTRY("RVA", sizeof(DWORD)) - COLUMN_ENTRY("Field", TABLE_INDEXSIZE(ttField)) - END_COLUMN_MAP() -}; - -// Only tables up to ttFieldRVA are mapped, because they're all I needed. If you need the tables beyond that, map them yourself! - -typedef CTableData* (CALLBACK* CREATEINSTANCE)(CMetadataTables *); -extern CREATEINSTANCE g_arTableTypes[64]; DELETED tools/mergebin/mergebin.cpp Index: tools/mergebin/mergebin.cpp ================================================================== --- tools/mergebin/mergebin.cpp +++ /dev/null @@ -1,591 +0,0 @@ -/******************************************************** - * mergebin - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -#include "stdafx.h" -#include "MetaData.h" -#include "MetaDataTables.h" -#include "TableData.h" - -void DumpCLRInfo(LPCTSTR pszFile); -void MergeModules(LPCTSTR pszAssembly, LPCTSTR pszNative, LPCTSTR pszSection, DWORD dwAdjust); -void DumpCLRPragma(LPCTSTR pszAssembly, LPCTSTR pszSection); -void FixObjFile(LPCTSTR pszFile); - -typedef struct EXTRA_STUFF -{ - DWORD dwNativeEntryPoint; -} EXTRA_STUFF, *LPEXTRA_STUFF; - -int _tmain(int argc, _TCHAR* argv[]) -{ - if (argc == 1) - { - _tprintf(_T( -"MERGEBIN - Merges a pure .NET assembly with a native DLL\n \ -Syntax: MERGEBIN [/I:assembly] [/S:sectionname assembly nativedll]\n \ -/I:assembly Returns the number of bytes required\n \ - to consume the assembly\n \ -/S:sectionname The name of the section in the nativedll\n \ - to insert the CLR data\n \ -/P:assembly Outputs the C++ pragma code that can be used\n \ - as additional input to a C++ app to reserve\n \ - a section block large enough for the managed code.\n \ -/B:objectfile Windows CE workaround, changes the attributes of\n \ - the .BSS section of an object file to generate a\n \ - DLL that doesn't have a .bss section whos \n \ - virtualsize is larger than the rawdata size.\n \ -The native DLL must have an unused section in it, into which the\n \ -.NET assembly will be inserted. You can do this with the following code:\n \ - #pragma data_seg(\".clr\")\n \ - #pragma comment(linker, \"/SECTION:.clr,ER\")\n \ - char __ph[92316] = {0}; // 92316 is the number of bytes to reserve\n \ - #pragma data_seg()\n \ -You would then specify /SECTION:.CLR in the command-line for the location to\n \ -insert the .NET assembly. The number of bytes reserved in the section needs\n \ -to be equal to or more than the number of bytes returned by the /I parameter.\n \ -\n \ -The native DLL must also export a function that calls _CorDllMain in \n \ -MSCOREE.DLL. This function must have the same parameters and calling\n \ -conventions as DllMain, and its name must have the word \"CORDLLMAIN\"\n \ -in it.\n \ -")); - return 0; - } - - LPTSTR pszAssembly = NULL; - LPTSTR pszNative = NULL; - LPTSTR pszSection = NULL; - BOOL bDoPragma = FALSE; - BOOL bDoObj = FALSE; - DWORD dwAdjust = 0; - - for (int n = 1; n < argc; n++) - { - if (argv[n][0] != '-' && argv[n][0] != '/') - { - if (pszAssembly == NULL) - pszAssembly = argv[n]; - else if (pszNative == NULL) - pszNative = argv[n]; - else - { - _tprintf(_T("Too many files specified\n")); - return 0; - } - continue; - } - - switch(argv[n][1]) - { - case 'I': - case 'i': - pszAssembly = &argv[n][3]; - if (argv[n][2] != ':' || lstrlen(pszAssembly) == 0) - { - _tprintf(_T("/I requires an assembly name\n")); - return 0; - } - DumpCLRInfo(pszAssembly); - return 0; - break; - case 'P': - case 'p': - pszAssembly = &argv[n][3]; - if (argv[n][2] != ':' || lstrlen(pszAssembly) == 0) - { - _tprintf(_T("/P requires an assembly name\n")); - return 0; - } - bDoPragma = TRUE; - break; - case 'S': - case 's': - pszSection = &argv[n][3]; - if (argv[n][2] != ':' || lstrlen(pszSection) == 0) - { - _tprintf(_T("/S requires a section name\n")); - return 0; - } - break; - //case 'A': - //case 'a': - // if (argv[n][2] != ':') - // { - // _tprintf(_T("A parameter requires a numeric value\n")); - // return 0; - // } - // dwAdjust = _ttol(&argv[n][3]); - // break; - case 'B': - case 'b': - pszAssembly = &argv[n][3]; - if (argv[n][2] != ':' || lstrlen(pszAssembly) == 0) - { - _tprintf(_T("/B requires an object file name\n")); - return 0; - } - bDoObj = TRUE; - break; - } - } - - if (pszAssembly && bDoObj) - FixObjFile(pszAssembly); - else if (pszAssembly && pszNative && pszSection && !bDoPragma) - MergeModules(pszAssembly, pszNative, pszSection, dwAdjust); - else if (pszAssembly && bDoPragma) - DumpCLRPragma(pszAssembly, pszSection); - - return 0; -} - -LPBYTE memstr(LPBYTE buffer, LPCSTR find, DWORD size) -{ - LPBYTE p; - DWORD findsize = lstrlenA(find); - - for (p = buffer; p <= (buffer-findsize+size); p++) - { - if (memcmp(p, find, findsize) == 0) - return p; /* found */ - } - return NULL; -} - -void FixObjFile(LPCTSTR pszFile) -{ - HANDLE hMap = INVALID_HANDLE_VALUE; - HANDLE hFile = CreateFile(pszFile, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - LPBYTE p; - DWORD dwSize; - - if (hFile == INVALID_HANDLE_VALUE) return; - - dwSize = GetFileSize(hFile, NULL); - hMap = CreateFileMapping(hFile, NULL, PAGE_READWRITE, 0, 0, NULL); - if (hMap) - { - p = (LPBYTE)MapViewOfFile(hMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); - if (p) - { - PIMAGE_SECTION_HEADER section = (PIMAGE_SECTION_HEADER)memstr(p, ".bss", dwSize); - - if (section) - { - section->Characteristics &= ~IMAGE_SCN_CNT_UNINITIALIZED_DATA; - section->Characteristics |= IMAGE_SCN_CNT_INITIALIZED_DATA; - } - UnmapViewOfFile(p); - } - CloseHandle(hMap); - } - CloseHandle(hFile); -} - - -BOOL GetMinMaxCOR20RVA(CPEFile& file, DWORD& dwMin, DWORD& dwMax) -{ - PIMAGE_COR20_HEADER pCor = file; - dwMin = MAXDWORD; - dwMax = 0; - - if (!pCor) return FALSE; - - if (pCor->MetaData.Size) dwMin = min(dwMin, pCor->MetaData.VirtualAddress); - if (pCor->Resources.Size) dwMin = min(dwMin, pCor->Resources.VirtualAddress); - if (pCor->StrongNameSignature.Size) dwMin = min(dwMin, pCor->StrongNameSignature.VirtualAddress); - if (pCor->CodeManagerTable.Size) dwMin = min(dwMin, pCor->CodeManagerTable.VirtualAddress); - if (pCor->VTableFixups.Size) dwMin = min(dwMin, pCor->VTableFixups.VirtualAddress); - if (pCor->ExportAddressTableJumps.Size) dwMin = min(dwMin, pCor->ExportAddressTableJumps.VirtualAddress); - if (pCor->ManagedNativeHeader.Size) dwMin = min(dwMin, pCor->ManagedNativeHeader.VirtualAddress); - - dwMax = max(dwMax, (pCor->MetaData.VirtualAddress + pCor->MetaData.Size)); - dwMax = max(dwMax, (pCor->Resources.VirtualAddress + pCor->Resources.Size)); - dwMax = max(dwMax, (pCor->StrongNameSignature.VirtualAddress + pCor->StrongNameSignature.Size)); - dwMax = max(dwMax, (pCor->CodeManagerTable.VirtualAddress + pCor->CodeManagerTable.Size)); - dwMax = max(dwMax, (pCor->VTableFixups.VirtualAddress + pCor->VTableFixups.Size)); - dwMax = max(dwMax, (pCor->ExportAddressTableJumps.VirtualAddress + pCor->ExportAddressTableJumps.Size)); - dwMax = max(dwMax, (pCor->ManagedNativeHeader.VirtualAddress + pCor->ManagedNativeHeader.Size)); - - CMetadata meta(file); - CMetadataTables tables(meta); - CTableData *p; - DWORD *pdwRVA; - DWORD dwRows; - - for (int n = 0; n < 2; n++) - { - p = tables.GetTable((n == 0) ? ttMethodDef : ttFieldRVA); - if (p) - { - dwRows = p->GetRowCount(); - for (UINT uRow = 0; uRow < dwRows; uRow ++) - { - pdwRVA = (DWORD *)p->Column(uRow, (UINT)0); - if (*pdwRVA) - dwMin = min(dwMin, (*pdwRVA)); - } - } - } - return TRUE; -} - -void DumpCLRInfo(LPCTSTR pszFile) -{ - CPEFile peFile; - HRESULT hr; - hr = peFile.Open(pszFile); - if (FAILED(hr)) return; - - DWORD dwMinRVA; - DWORD dwMaxRVA; - - if (!GetMinMaxCOR20RVA(peFile, dwMinRVA, dwMaxRVA)) - { - _tprintf(_T("Unable to retrieve .NET assembly information for file %s\n"), pszFile); - return; - } - - _tprintf(_T("%d Bytes required to merge %s\n"), (dwMaxRVA - dwMinRVA) + ((PIMAGE_COR20_HEADER)peFile)->cb + sizeof(EXTRA_STUFF), pszFile); -} - -void DumpCLRPragma(LPCTSTR pszAssembly, LPCTSTR pszSection) -{ - CPEFile peFile; - HRESULT hr; - DWORD dwMinRVA; - DWORD dwMaxRVA; - - hr = peFile.Open(pszAssembly); - if (FAILED(hr)) return; - - if (pszSection == NULL) pszSection = _T(".clr"); - - if (!GetMinMaxCOR20RVA(peFile, dwMinRVA, dwMaxRVA)) - { - _tprintf(_T("// Unable to retrieve .NET assembly information for file %s\n"), pszAssembly); - return; - } - - _tprintf(_T("// This code was automatically generated from assembly\n\ -// %s\n\n\ -#include \n\n\ -#pragma data_seg(push,clrseg,\"%s\")\n\ -#pragma comment(linker, \"/SECTION:%s,ER\")\n\ - char __ph[%d] = {0}; // The number of bytes to reserve\n\ -#pragma data_seg(pop,clrseg)\n\n\ -typedef BOOL (WINAPI *DLLMAIN)(HANDLE, DWORD, LPVOID);\n\ -typedef struct EXTRA_STUFF\n\ -{\n\ - DWORD dwNativeEntryPoint;\n\ -} EXTRA_STUFF, *LPEXTRA_STUFF;\n\n\ -__declspec(dllexport) BOOL WINAPI _CorDllMainStub(HANDLE hModule, DWORD dwReason, LPVOID pvReserved)\n\ -{\n\ - HANDLE hMod;\n\ - DLLMAIN proc;\n\ - LPEXTRA_STUFF pExtra;\n\n\ - hMod = GetModuleHandle(_T(\"mscoree\"));\n\ - if (hMod)\n\ - proc = (DLLMAIN)GetProcAddress(hMod, _T(\"_CorDllMain\"));\n\ - else\n\ - {\n\ - MEMORY_BASIC_INFORMATION mbi;\n\n\ - VirtualQuery(_CorDllMainStub, &mbi, sizeof(mbi));\n\ - pExtra = (LPEXTRA_STUFF)__ph;\n\ - proc = (DLLMAIN)(pExtra->dwNativeEntryPoint + (DWORD)mbi.AllocationBase);\n\ - }\n\ - return proc(hModule, dwReason, pvReserved);\n\ -}\n\ -"), pszAssembly, pszSection, pszSection, (dwMaxRVA - dwMinRVA) + ((PIMAGE_COR20_HEADER)peFile)->cb + sizeof(EXTRA_STUFF)); -} - -/* When merged, the native DLL's entrypoint must go to _CorDllMain in MSCOREE.DLL. - ** In order to do this, we need to change the DLL's entrypoint to "something" that will - ** call CorDllMain. Since its too much hassle to add imports to the DLL and make drastic - ** changes to it, we rely on the native DLL to export a function that we can call which will - ** forward to CorDllMain. Exported functions are easy to identify and get an RVA for. - ** The exported function must have the same calling conventions and parameters as DllMain, - ** and must contain the letters "CORDLLMAIN" in the name. The search is case-insensitive. */ -DWORD GetExportedCorDllMainRVA(CPEFile& file) -{ - PIMAGE_EXPORT_DIRECTORY pExportDir; - PIMAGE_SECTION_HEADER header; - INT delta; - DWORD i; - DWORD *pdwFunctions; - PWORD pwOrdinals; - DWORD *pszFuncNames; - DWORD exportsStartRVA; - DWORD exportsEndRVA; - CHAR szName[MAX_PATH + 1]; - PIMAGE_NT_HEADERS32 pNT = file; - PIMAGE_NT_HEADERS64 pNT64 = file; - - if (pNT) - { - exportsStartRVA = pNT->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress; - exportsEndRVA = exportsStartRVA + pNT->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size; - } - else - { - exportsStartRVA = pNT64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress; - exportsEndRVA = exportsStartRVA + pNT64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size; - } - - header = file.GetEnclosingSectionHeader(exportsStartRVA); - if (!header) - return 0; - - delta = (INT)(header->VirtualAddress - header->PointerToRawData); - - pExportDir = (PIMAGE_EXPORT_DIRECTORY)file.GetPtrFromRVA(exportsStartRVA); - pdwFunctions = (PDWORD)file.GetPtrFromRVA(pExportDir->AddressOfFunctions); - pwOrdinals = (PWORD)file.GetPtrFromRVA(pExportDir->AddressOfNameOrdinals); - pszFuncNames = (DWORD *)file.GetPtrFromRVA(pExportDir->AddressOfNames); - - for (i = 0; i < pExportDir->NumberOfFunctions; i++, pdwFunctions++) - { - DWORD entryPointRVA = *pdwFunctions; - - if ( entryPointRVA == 0 ) - continue; - - for (UINT j = 0; j < pExportDir->NumberOfNames; j++) - { - if (pwOrdinals[j] == i) - { - lstrcpynA(szName, (LPSTR)file.GetPtrFromRVA(pszFuncNames[j]), MAX_PATH); - szName[MAX_PATH] = 0; - CharUpper(szName); - if (strstr(szName, "CORDLLMAIN") != 0) return entryPointRVA; - } - } - } - return 0; -} - -// Merges a pure .NET assembly with a native DLL, inserting it into the specified section -void MergeModules(LPCTSTR pszAssembly, LPCTSTR pszNative, LPCTSTR pszSection, DWORD dwAdjust) -{ - CPEFile peFile; - CPEFile peDest; - HRESULT hr; - DWORD dwMinRVA; - DWORD dwMaxRVA; - DWORD dwDestRVA; - PIMAGE_SECTION_HEADER pSection; - LPBYTE pSrc; - LPBYTE pDest; - DWORD dwSize; - DWORD dwNewEntrypoint; - PIMAGE_COR20_HEADER pCor; - PIMAGE_NT_HEADERS32 pNT; - PIMAGE_NT_HEADERS64 pNT64; - int diffRVA; - CTableData *p; - DWORD *pdwRVA; - DWORD dwRows; - LPEXTRA_STUFF pExtra; - - // Open the .NET assembly - hr = peFile.Open(pszAssembly); - if (FAILED(hr)) return; - - // Scan the .NET assembly and find the block of .NET code specified in the .NET metadata - if (!GetMinMaxCOR20RVA(peFile, dwMinRVA, dwMaxRVA)) - { - _tprintf(_T("Unable to retrieve .NET assembly information for file %s\n"), pszAssembly); - return; - } - // Total number of bytes of the block of .NET code we're going to merge - dwSize = (dwMaxRVA - dwMinRVA) + ((PIMAGE_COR20_HEADER)peFile)->cb; - - // Open the destination file for readwrite access - hr = peDest.Open(pszNative, FALSE); - if (FAILED(hr)) return; - - // Make sure it has the section specified in the command-line - pSection = peDest.GetSectionHeader(pszSection); - if (!pSection) - { - _tprintf(_T("Unable to find section %s in file\n"), pszSection); - return; - } - - // If the section isn't large enough, tell the user how large it needs to be - if (pSection->Misc.VirtualSize < (dwSize + sizeof(EXTRA_STUFF))) - { - _tprintf(_T("Not enough room in section for data. Need %d bytes\n"), dwSize + sizeof(EXTRA_STUFF)); - return; - } - - /* - ** Find a new entrypoint to use for the DLL. The old entrypoint is written into the .NET header - */ - dwNewEntrypoint = GetExportedCorDllMainRVA(peDest); - if (!dwNewEntrypoint) - { - _tprintf(_T("Native DLL must export a function that calls _CorDllMain, and its name must contain the word \"CorDllMain\".\n")); - return; - } - - // Change this section's flags - pSection->Characteristics = IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ; - dwDestRVA = pSection->VirtualAddress; - - pExtra = (LPEXTRA_STUFF)peDest.GetPtrFromRVA(dwDestRVA); - dwDestRVA += sizeof(EXTRA_STUFF); - - // If the native DLL has been merged with an assembly beforehand, we need to strip the .NET stuff and restore the entrypoint - pCor = peDest; - if (pCor) - { - if (pCor->Flags & 0x10) - { - pNT = peDest; - pNT64 = peDest; - - if (pNT) - pNT->OptionalHeader.AddressOfEntryPoint = pCor->EntryPointToken; - else - pNT64->OptionalHeader.AddressOfEntryPoint = pCor->EntryPointToken; - } - } - - // Copy the assembly's .NET header into the section - dwSize = ((PIMAGE_COR20_HEADER)peFile)->cb; - pSrc = (LPBYTE)(PIMAGE_COR20_HEADER)peFile; - pDest = (LPBYTE)peDest.GetPtrFromRVA(dwDestRVA); - CopyMemory(pDest, pSrc, dwSize); - - pNT = peDest; - pNT64 = peDest; - - // Fixup the NT header on the native DLL to include the new .NET header - if (pNT) - { - pExtra->dwNativeEntryPoint = pNT->OptionalHeader.AddressOfEntryPoint; - pNT->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress = dwDestRVA; - pNT->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size = dwSize; - } - else - { - pExtra->dwNativeEntryPoint = pNT64->OptionalHeader.AddressOfEntryPoint; - pNT64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress = dwDestRVA; - pNT64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size = dwSize; - } - dwDestRVA += dwSize; - if (dwDestRVA % 4) dwDestRVA += (4 - (dwDestRVA % 4)); - - // Copy the .NET block of code and metadata into the section, after the header - dwSize = dwMaxRVA - dwMinRVA; - pSrc = (LPBYTE)peFile.GetPtrFromRVA(dwMinRVA); - pDest = (LPBYTE)peDest.GetPtrFromRVA(dwDestRVA); - CopyMemory(pDest, pSrc, dwSize); - - // Figure out by how much we need to change the RVA's to compensate for the relocation - diffRVA = dwDestRVA - dwMinRVA; - pCor = peDest; - - // Fixup the DLL entrypoints - if (pNT) - { - pNT->OptionalHeader.MajorOperatingSystemVersion = 4; - pNT->OptionalHeader.MajorSubsystemVersion = 4; - if (pNT->OptionalHeader.AddressOfEntryPoint != dwNewEntrypoint) - { - pCor->EntryPointToken = pNT->OptionalHeader.AddressOfEntryPoint; - pNT->OptionalHeader.AddressOfEntryPoint = dwNewEntrypoint; - } - } - else - { - if (pNT64->OptionalHeader.AddressOfEntryPoint != dwNewEntrypoint) - { - pCor->EntryPointToken = pNT64->OptionalHeader.AddressOfEntryPoint; - pNT64->OptionalHeader.AddressOfEntryPoint = dwNewEntrypoint; - } - } - // Adjust the .NET headers to indicate we're a mixed DLL - pCor->Flags = (pCor->Flags & 0xFFFE) | 0x10; - - // Fixup the metadata header RVA's - if (pCor->MetaData.VirtualAddress) pCor->MetaData.VirtualAddress += diffRVA; - if (pCor->Resources.VirtualAddress) pCor->Resources.VirtualAddress += diffRVA; - if (pCor->StrongNameSignature.VirtualAddress) pCor->StrongNameSignature.VirtualAddress += diffRVA; - if (pCor->CodeManagerTable.VirtualAddress) pCor->CodeManagerTable.VirtualAddress += diffRVA; - if (pCor->VTableFixups.VirtualAddress) pCor->VTableFixups.VirtualAddress += diffRVA; - if (pCor->ExportAddressTableJumps.VirtualAddress) pCor->ExportAddressTableJumps.VirtualAddress += diffRVA; - if (pCor->ManagedNativeHeader.VirtualAddress) pCor->ManagedNativeHeader.VirtualAddress += diffRVA; - - CMetadata meta(peDest); - CMetadataTables tables(meta); - - // Fixup all the RVA's for methods and fields that have them in the .NET code - for (int n = 0; n < 2; n++) - { - p = tables.GetTable((n == 0) ? ttMethodDef : ttFieldRVA); - if (p) - { - dwRows = p->GetRowCount(); - for (UINT uRow = 0; uRow < dwRows; uRow ++) - { - pdwRVA = (DWORD *)p->Column(uRow, (UINT)0); - if (*pdwRVA) - *pdwRVA = (*pdwRVA) + diffRVA; - } - } - } - - // If this is a CE file, then change the processor to x86 - if (pNT) - { - if (pNT->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CE_GUI - || pNT->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM) - { - pNT->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; - pNT->OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; - } - - if (pNT->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI && (pCor->Flags & 0x08)) - { - PIMAGE_SECTION_HEADER section = IMAGE_FIRST_SECTION(pNT); - for (UINT i=0; i < pNT->FileHeader.NumberOfSections; i++, section++) - { - if (_tcscmp((LPCSTR)section->Name, _T(".bss")) == 0) - { - _tcscpy((LPSTR)section->Name, _T(".idata")); - //section->Characteristics &= ~IMAGE_SCN_CNT_INITIALIZED_DATA; - //section->Characteristics |= IMAGE_SCN_CNT_UNINITIALIZED_DATA; - DWORD dwBSSRVA = section->VirtualAddress; - LPBYTE pBSS = (LPBYTE)peDest.GetPtrFromRVA(dwBSSRVA); - for (DWORD u = 0; u < section->SizeOfRawData; u++) - { - pBSS[u] = 0; - } - } - if (section->SizeOfRawData < section->Misc.VirtualSize) - { - if (_tcscmp((LPCSTR)section->Name, _T(".data")) == 0 && dwAdjust > 0) - { - _tprintf(_T("\nWARNING: %s section has a RawData size of %d, less than its VirtualSize of %d, adjusting VirtualSize to %d\n"), section->Name, section->SizeOfRawData, section->Misc.VirtualSize, dwAdjust); - section->Misc.VirtualSize = dwAdjust; - } - else - { - _tprintf(_T("\nWARNING: %s section has a RawData size of %d and a VirtualSize of %d, strong named image may not run on Windows CE\n"), section->Name, section->SizeOfRawData, section->Misc.VirtualSize); - } - } - } - } - } - - if (pCor->Flags & 0x08) - _tprintf(_T("\nWARNING: %s must be re-signed before it can be used!\n"), pszNative); - - _tprintf(_T("Success!\n")); -} DELETED tools/mergebin/stdafx.cpp Index: tools/mergebin/stdafx.cpp ================================================================== --- tools/mergebin/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// mergebin.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file DELETED tools/mergebin/stdafx.h Index: tools/mergebin/stdafx.h ================================================================== --- tools/mergebin/stdafx.h +++ /dev/null @@ -1,16 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define _WIN32_WINNT 0x0400 - -#include -#include -#include -#include -// TODO: reference additional headers your program requires here DELETED tools/setup/exe/setup/admin.manifest Index: tools/setup/exe/setup/admin.manifest ================================================================== --- tools/setup/exe/setup/admin.manifest +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - DELETED tools/setup/exe/setup/install.ico Index: tools/setup/exe/setup/install.ico ================================================================== --- tools/setup/exe/setup/install.ico +++ /dev/null cannot compute difference between binary files DELETED tools/setup/exe/setup/resource.h Index: tools/setup/exe/setup/resource.h ================================================================== --- tools/setup/exe/setup/resource.h +++ /dev/null @@ -1,21 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by setup.rc -// -#define IDI_SETUP 5 -#define IDD_SETUP_DIALOG 102 -#define IDR_MAINFRAME 128 -#define IDR_MSI1 130 -#define IDC_STATIC -1 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 131 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif DELETED tools/setup/exe/setup/setup.cpp Index: tools/setup/exe/setup/setup.cpp ================================================================== --- tools/setup/exe/setup/setup.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// setup.cpp : Defines the entry point for the application. -// - -#include "stdafx.h" -#include "setup.h" - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE /*hPrevInstance*/, - LPTSTR /*lpCmdLine*/, - int /*nCmdShow*/) -{ - HRSRC hRes = FindResource(hInstance, MAKEINTRESOURCE(1), _T("MSI")); - HGLOBAL hGlob = LoadResource(hInstance, hRes); - DWORD dwSize = SizeofResource(hInstance, hRes); - LPVOID pv = LockResource(hGlob); - TCHAR szDir[MAX_PATH]; - TCHAR szPath[MAX_PATH]; - - GetTempPath(MAX_PATH, szDir); - GetTempFileName(szDir, _T("tmp"), 0, szPath); - DeleteFile(szPath); - lstrcat(szPath, _T(".msi")); - - HANDLE hFile = CreateFile(szPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - WriteFile(hFile, pv, dwSize, &dwSize, NULL); - CloseHandle(hFile); - - SHELLEXECUTEINFO shex; - - ZeroMemory(&shex, sizeof(shex)); - - shex.cbSize = sizeof(shex); - shex.fMask = SEE_MASK_NOCLOSEPROCESS; - - shex.lpFile = szPath; - - if (ShellExecuteEx(&shex)) - { - if (shex.hProcess) - { - WaitForSingleObject(shex.hProcess, INFINITE); - } - } - while (!DeleteFile(szPath)) - Sleep(250); - - return 0; -} DELETED tools/setup/exe/setup/setup.h Index: tools/setup/exe/setup/setup.h ================================================================== --- tools/setup/exe/setup/setup.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "resource.h" DELETED tools/setup/exe/setup/setup.rc Index: tools/setup/exe/setup/setup.rc ================================================================== --- tools/setup/exe/setup/setup.rc +++ /dev/null @@ -1,122 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,67,0 - PRODUCTVERSION 1,0,0,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "http://sqlite.phxsoftware.com" - VALUE "FileDescription", "SQLite ADO.NET Setup" - VALUE "FileVersion", "1.0.67.0" - VALUE "InternalName", "setup" - VALUE "LegalCopyright", "Released to the public domain" - VALUE "OriginalFilename", "setup.exe" - VALUE "ProductName", "System.Data.SQLite" - VALUE "ProductVersion", "1.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_SETUP ICON ".\\install.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// MSI -// - -1 MSI "..\\..\\sqlite_setup.msi" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - DELETED tools/setup/exe/setup/stdafx.cpp Index: tools/setup/exe/setup/stdafx.cpp ================================================================== --- tools/setup/exe/setup/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// setup.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file DELETED tools/setup/exe/setup/stdafx.h Index: tools/setup/exe/setup/stdafx.h ================================================================== --- tools/setup/exe/setup/stdafx.h +++ /dev/null @@ -1,37 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. -#ifndef WINVER // Allow use of features specific to Windows XP or later. -#define WINVER 0x0500 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT 0x0500 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later. -#define _WIN32_IE 0x0500 // Change this to the appropriate value to target other versions of IE. -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files: -#include - -// C RunTime Header Files -#include -#include -#include -#include -#include - -// TODO: reference additional headers your program requires here DELETED tools/setup/install.ico Index: tools/setup/install.ico ================================================================== --- tools/setup/install.ico +++ /dev/null cannot compute difference between binary files DELETED tools/setup/sqlite_setup.vdproj Index: tools/setup/sqlite_setup.vdproj ================================================================== --- tools/setup/sqlite_setup.vdproj +++ /dev/null @@ -1,1124 +0,0 @@ -"DeployProject" -{ -"VSVersion" = "3:800" -"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" -"IsWebType" = "8:FALSE" -"ProjectName" = "8:sqlite_msi" -"LanguageId" = "3:1033" -"CodePage" = "3:1252" -"UILanguageId" = "3:1033" -"SccProjectName" = "8:" -"SccLocalPath" = "8:" -"SccAuxPath" = "8:" -"SccProvider" = "8:" - "Hierarchy" - { - "Entry" - { - "MsmKey" = "8:_055B2BCD025C40A08F3B155843F41702" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_26E74AC417994018832F9B82462AA3AF" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2C7EDFF06B61482393D94E3A63D90113" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_33349D46CCFB4E16A3F7C6CE1FE6F6C9" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3ED55D8CC0EF87B27C01F6698F3EE7B2" - "OwnerKey" = "8:_2C7EDFF06B61482393D94E3A63D90113" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3ED55D8CC0EF87B27C01F6698F3EE7B2" - "OwnerKey" = "8:_CE9E3EF0722342DB8DE0860C0DDCD39E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_58B331DC63A74A74B1C85278A998798F" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_60E2C442F77C48DE8150EBFC86663225" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B29C75F5F4D24817846DCEF9951068E1" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C8E329AC56AD4C88A986481E639F72A5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CE9E3EF0722342DB8DE0860C0DDCD39E" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D7FECFD3C8164DA7B3712AF54D0CDDAD" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B29C75F5F4D24817846DCEF9951068E1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CE9E3EF0722342DB8DE0860C0DDCD39E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_58B331DC63A74A74B1C85278A998798F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2C7EDFF06B61482393D94E3A63D90113" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3ED55D8CC0EF87B27C01F6698F3EE7B2" - "MsmSig" = "8:_UNDEFINED" - } - } - "Configurations" - { - "Debug" - { - "DisplayName" = "8:Debug" - "IsDebugOnly" = "11:TRUE" - "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\sqlite_setup.msi" - "PackageFilesAs" = "3:4" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:3" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - } - } - } - "Release" - { - "DisplayName" = "8:Release" - "IsDebugOnly" = "11:FALSE" - "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:sqlite_setup.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:3" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:FALSE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.2.0" - { - "Name" = "8:.NET Framework 2.0" - "ProductCode" = "8:Microsoft.Net.Framework.2.0" - } - } - } - } - } - "Deployable" - { - "CustomAction" - { - } - "DefaultFeature" - { - "Name" = "8:DefaultFeature" - "Title" = "8:" - "Description" = "8:" - } - "ExternalPersistence" - { - "LaunchCondition" - { - "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_2A5202AB8FA440F9AA45DF7B9C7CEAD5" - { - "Name" = "8:.NET Framework" - "Message" = "8:[VSDNETMSG]" - "FrameworkVersion" = "8:2.0.50727 " - "AllowLaterVersions" = "11:TRUE" - "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=9832" - } - } - } - "File" - { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_055B2BCD025C40A08F3B155843F41702" - { - "SourcePath" = "8:..\\..\\bin\\test.exe.config" - "TargetName" = "8:test.exe.config" - "Tag" = "8:" - "Folder" = "8:_30C77BF2E6E84D01ADE5FB8BA2F81504" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_26E74AC417994018832F9B82462AA3AF" - { - "SourcePath" = "8:..\\..\\bin\\x64\\System.Data.SQLite.lib" - "TargetName" = "8:System.Data.SQLite.lib" - "Tag" = "8:" - "Folder" = "8:_66DBD0998AA8499691D4F5E42417697D" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2C7EDFF06B61482393D94E3A63D90113" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:test, Version=1.0.0.40629, Culture=neutral, processorArchitecture=x86" - "ScatterAssemblies" - { - "_2C7EDFF06B61482393D94E3A63D90113" - { - "Name" = "8:test.exe" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:..\\..\\bin\\test.exe" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_30C77BF2E6E84D01ADE5FB8BA2F81504" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_33349D46CCFB4E16A3F7C6CE1FE6F6C9" - { - "SourcePath" = "8:..\\..\\bin\\System.Data.SQLite.XML" - "TargetName" = "8:System.Data.SQLite.XML" - "Tag" = "8:" - "Folder" = "8:_30C77BF2E6E84D01ADE5FB8BA2F81504" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3ED55D8CC0EF87B27C01F6698F3EE7B2" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.67.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86" - "ScatterAssemblies" - { - "_3ED55D8CC0EF87B27C01F6698F3EE7B2" - { - "Name" = "8:System.Data.SQLite.DLL" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Data.SQLite.DLL" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_30C77BF2E6E84D01ADE5FB8BA2F81504" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_58B331DC63A74A74B1C85278A998798F" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.67.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86" - "ScatterAssemblies" - { - "_58B331DC63A74A74B1C85278A998798F" - { - "Name" = "8:System.Data.SQLite.DLL" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:..\\..\\bin\\System.Data.SQLite.DLL" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_A0841E79B7874F7288672343934C7657" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_60E2C442F77C48DE8150EBFC86663225" - { - "SourcePath" = "8:..\\..\\Doc\\SQLite.NET.chm" - "TargetName" = "8:SQLite.NET.chm" - "Tag" = "8:" - "Folder" = "8:_CA5E61837F5B452B8169C698979CF05C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B29C75F5F4D24817846DCEF9951068E1" - { - "SourcePath" = "8:..\\..\\bin\\x64\\System.Data.SQLite.DLL" - "TargetName" = "8:System.Data.SQLite.DLL" - "Tag" = "8:" - "Folder" = "8:_66DBD0998AA8499691D4F5E42417697D" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.27.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyRegister" = "3:1" - "ScatterAssemblies" - { - "_B29C75F5F4D24817846DCEF9951068E1" - { - "Attributes" = "3:512" - "Name" = "8:System.Data.SQLite.DLL" - } - } - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B6156897CBBB4E929D9C1F7358CE9E90" - { - "SourcePath" = "8:topband.jpg" - "TargetName" = "8:topband.jpg" - "Tag" = "8:" - "Folder" = "8:_A0841E79B7874F7288672343934C7657" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C8E329AC56AD4C88A986481E639F72A5" - { - "SourcePath" = "8:..\\..\\readme.htm" - "TargetName" = "8:readme.htm" - "Tag" = "8:" - "Folder" = "8:_A0841E79B7874F7288672343934C7657" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CE9E3EF0722342DB8DE0860C0DDCD39E" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite.Linq, Version=1.0.38.1, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_CE9E3EF0722342DB8DE0860C0DDCD39E" - { - "Name" = "8:System.Data.SQLite.Linq.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:..\\..\\bin\\System.Data.SQLite.Linq.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_30C77BF2E6E84D01ADE5FB8BA2F81504" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D7FECFD3C8164DA7B3712AF54D0CDDAD" - { - "SourcePath" = "8:..\\..\\bin\\System.Data.SQLite.lib" - "TargetName" = "8:System.Data.SQLite.lib" - "Tag" = "8:" - "Folder" = "8:_30C77BF2E6E84D01ADE5FB8BA2F81504" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - } - "FileType" - { - } - "Folder" - { - "{3C67513D-01DD-4637-8A68-80971EB9504F}:_A0841E79B7874F7288672343934C7657" - { - "DefaultLocation" = "8:[ProgramFilesFolder]SQLite.NET4" - "Name" = "8:#1925" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:TARGETDIR" - "Folders" - { - "{9EF0B969-E518-4E46-987F-47570745A589}:_30C77BF2E6E84D01ADE5FB8BA2F81504" - { - "Name" = "8:bin" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:_BD4105DB73B04559A56BB70C4E151056" - "Folders" - { - "{9EF0B969-E518-4E46-987F-47570745A589}:_66DBD0998AA8499691D4F5E42417697D" - { - "Name" = "8:x64" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:_7C07DE0299AB478C8BC7AFB40E220305" - "Folders" - { - } - } - "{9EF0B969-E518-4E46-987F-47570745A589}:_F11D54EE0EEA4BF59B52E621630B6A2E" - { - "Name" = "8:Designer" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:_CA865020181A40EEB518ACF5F89BD66A" - "Folders" - { - } - } - } - } - "{9EF0B969-E518-4E46-987F-47570745A589}:_CA5E61837F5B452B8169C698979CF05C" - { - "Name" = "8:Doc" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:_B787482AA405492D998CAAD43761AF61" - "Folders" - { - } - } - } - } - "{1525181F-901A-416C-8A58-119130FE478E}:_AB7F365F78A44DE79C7007FB08F7343E" - { - "Name" = "8:#1916" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:DesktopFolder" - "Folders" - { - } - } - "{1525181F-901A-416C-8A58-119130FE478E}:_E420345AA61B4AF780EEA7BC8AFAF268" - { - "Name" = "8:#1919" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:ProgramMenuFolder" - "Folders" - { - "{9EF0B969-E518-4E46-987F-47570745A589}:_1B562A9F876E47058AB813C418E24FBF" - { - "Name" = "8:SQLite.NET4" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:_85ED61DA38214E1C9AB39E119A89D75B" - "Folders" - { - } - } - } - } - } - "LaunchCondition" - { - } - "Locator" - { - } - "MsiBootstrapper" - { - "LangId" = "3:1033" - "RequiresElevation" = "11:FALSE" - } - "Product" - { - "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:SQLite ADO.NET Provider" - "ProductCode" = "8:{902C69AF-5B0C-4E21-89F2-064462C2BBC4}" - "PackageCode" = "8:{73B9EABC-05DF-499D-B771-8FB6F1E5AF1B}" - "UpgradeCode" = "8:{E779C0FF-CCE2-493A-B8C2-6DD04E26072C}" - "AspNetVersion" = "8:4.0.30319.0" - "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:TRUE" - "DetectNewerInstalledVersion" = "11:TRUE" - "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:1.066.1" - "Manufacturer" = "8:Phoenix Software Solutions, LLC" - "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://sqlite.phxsoftware.com" - "Title" = "8:SQLite ADO.NET Provider" - "Subject" = "8:" - "ARPCONTACT" = "8:Phoenix Software Solutions, LLC" - "Keywords" = "8:" - "ARPCOMMENTS" = "8:" - "ARPURLINFOABOUT" = "8:" - "ARPPRODUCTICON" = "8:" - "ARPIconIndex" = "3:0" - "SearchPath" = "8:" - "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:0" - "PreBuildEvent" = "8:" - "PostBuildEvent" = "8:" - "RunPostBuildEvent" = "3:0" - } - "Registry" - { - "HKLM" - { - "Keys" - { - } - } - "HKCU" - { - "Keys" - { - } - } - "HKCR" - { - "Keys" - { - } - } - "HKU" - { - "Keys" - { - } - } - "HKPU" - { - "Keys" - { - } - } - } - "Sequences" - { - } - "Shortcut" - { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_920202B002F9475288A945B0C8361A44" - { - "Name" = "8:SQLite Test Application" - "Arguments" = "8:" - "Description" = "8:" - "ShowCmd" = "3:1" - "IconIndex" = "3:0" - "Transitive" = "11:FALSE" - "Target" = "8:_2C7EDFF06B61482393D94E3A63D90113" - "Folder" = "8:_1B562A9F876E47058AB813C418E24FBF" - "WorkingFolder" = "8:_30C77BF2E6E84D01ADE5FB8BA2F81504" - "Icon" = "8:" - "Feature" = "8:" - } - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_CC64AEB6D8A643F7BC8EB95EBC803EB5" - { - "Name" = "8:Help" - "Arguments" = "8:" - "Description" = "8:" - "ShowCmd" = "3:1" - "IconIndex" = "3:0" - "Transitive" = "11:FALSE" - "Target" = "8:_60E2C442F77C48DE8150EBFC86663225" - "Folder" = "8:_1B562A9F876E47058AB813C418E24FBF" - "WorkingFolder" = "8:_CA5E61837F5B452B8169C698979CF05C" - "Icon" = "8:" - "Feature" = "8:" - } - } - "UserInterface" - { - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_027E806A39AD4FCD8E7A4EBE86AD3DF3" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdUserInterface.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_349E960F62F043E79FD080CB87E24922" - { - "Name" = "8:#1902" - "Sequence" = "3:2" - "Attributes" = "3:3" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F1CAA16A464043FBB06804165AB31D0C" - { - "Sequence" = "3:100" - "DisplayName" = "8:Finished" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3CB3696DF5D54FCA98E2BF3D4579451E" - { - "Name" = "8:#1901" - "Sequence" = "3:1" - "Attributes" = "3:2" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1DBE83588B574F75A6233D46A3234D69" - { - "Sequence" = "3:100" - "DisplayName" = "8:Progress" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdProgressDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - "ShowProgress" - { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_573543E04AA54E9387CD1AAF21220444" - { - "Name" = "8:#1902" - "Sequence" = "3:1" - "Attributes" = "3:3" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_991B7280E37E4C23A54CC7027F774891" - { - "Sequence" = "3:100" - "DisplayName" = "8:Finished" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFinishedDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - "UpdateText" - { - "Name" = "8:UpdateText" - "DisplayName" = "8:#1058" - "Description" = "8:#1158" - "Type" = "3:15" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1258" - "DefaultValue" = "8:#1258" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_5E0AF2B2658547308882EEE91399D911" - { - "Name" = "8:#1901" - "Sequence" = "3:2" - "Attributes" = "3:2" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_82FCCA944F324BA18F0E3E01BCA1E60B" - { - "Sequence" = "3:100" - "DisplayName" = "8:Progress" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminProgressDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - "ShowProgress" - { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_7046F6E46106420BA50AA9A9ED86389A" - { - "Name" = "8:#1900" - "Sequence" = "3:1" - "Attributes" = "3:1" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_03C4F0FAD7804F3DAE9A980E584F691E" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4B4F0FAA5A094FCC952CA8A93DEA0F04" - { - "Sequence" = "3:100" - "DisplayName" = "8:Welcome" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdWelcomeDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" - { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" - "DefaultValue" = "8:#1203" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_CAD4CD70D47945E7A7FCD4428405F7FD" - { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - "InstallAllUsersVisible" - { - "Name" = "8:InstallAllUsersVisible" - "DisplayName" = "8:#1059" - "Description" = "8:#1159" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A95B4EFD2C5249848F009D88CBA3739B" - { - "Name" = "8:#1900" - "Sequence" = "3:2" - "Attributes" = "3:1" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_101B4B845E67488FB6A0AC097773DA38" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1AD3D10EBB64435985C57A85063E6CDF" - { - "Sequence" = "3:100" - "DisplayName" = "8:Welcome" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" - { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" - "DefaultValue" = "8:#1203" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F5C2368EB13F47EF8808B4E5855A647B" - { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_B6156897CBBB4E929D9C1F7358CE9E90" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_F02FDE6DA53449159DF6E6441E2314C9" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdBasicDialogs.wim" - } - } - "MergeModule" - { - } - "ProjectOutput" - { - } - } -} DELETED tools/setup/topband.jpg Index: tools/setup/topband.jpg ================================================================== --- tools/setup/topband.jpg +++ /dev/null cannot compute difference between binary files ADDED www/art/sqlite100.png Index: www/art/sqlite100.png ================================================================== --- /dev/null +++ www/art/sqlite100.png cannot compute difference between binary files ADDED www/art/sqlite200.png Index: www/art/sqlite200.png ================================================================== --- /dev/null +++ www/art/sqlite200.png cannot compute difference between binary files ADDED www/art/sqlite32.png Index: www/art/sqlite32.png ================================================================== --- /dev/null +++ www/art/sqlite32.png cannot compute difference between binary files Index: www/build.wiki ================================================================== --- www/build.wiki +++ www/build.wiki @@ -17,16 +17,17 @@ The new build system has been setup using modular solution, project, and property files.

- In general, files with 2008 in the name (e.g. SQLite.Interop.2008.vcproj) or - files ending in .vsprops are project and property files for the Visual Studio - 2008 solution. Files with 2010 in the name (e.g. SQLite.Interop.2010.vcxproj) - or files ending in .props are property and project files for the Visual Studio - 2010 solution. When making changes, you should make changes to both to keep - them in sync. + In general, files with 2008 in the name (e.g. + "SQLite.Interop.2008.vcproj") or files ending in + ".vsprops" are project and property files for the Visual Studio 2008 + solution. Files with 2010 in the name (e.g. + "SQLite.Interop.2010.vcxproj") or files ending in ".props" + are project and property files for the Visual Studio 2010 solution. When + making changes, you should make changes to both to keep them in sync.

You can either [./build.wiki#manual | manually build] the System.Data.SQLite binaries using one of the supplied Visual Studio solutions or follow the steps @@ -47,37 +48,39 @@

We want to ship native binaries that rely on the Visual C++ 2008 Runtime.

- We want to ship the separate managed-only System.Data.SQLite assembly and - the SQLite.Interop.dll native library. This will make it easier to maintain - and deploy the included core SQLite code (in the "SQLite.Interop.dll" - native library). We also want to ship the "monster DLL" (i.e. the - "mixed-mode" System.Data.SQLite assembly that includes all the - necessary native and managed code). This will make it easier for developers - that wish to register the assembly in the Global Assembly Cache (GAC). + We want to ship the separate managed-only "System.Data.SQLite.dll" + assembly and the "SQLite.Interop.dll" native library. This will + make it easier to maintain and deploy the included core SQLite code (in the + "SQLite.Interop.dll" native library). We also want to ship the + "monster DLL" (i.e. the mixed-mode + "System.Data.SQLite.dll" assembly that includes all the necessary + native and managed code). This will make it easier for developers that wish + to register the assembly in the Global Assembly Cache (GAC).

The machine used to prepare the official releases will have the [http://www.microsoft.com/downloads/en/details.aspx?FamilyID=ab99342f-5d1a-413d-8319-81da479ab0d7 | .NET Framework 3.5 SP1] - and the corresponding [http://www.microsoft.com/downloads/details.aspx?FamilyId=E6E1C3DF-A74F-4207-8586-711EBE331CDC | SDK] + and the corresponding + [http://www.microsoft.com/downloads/details.aspx?FamilyId=E6E1C3DF-A74F-4207-8586-711EBE331CDC | SDK] installed.

The machine used to prepare the official releases will have [http://www.jrsoftware.org/isdl.php | Inno Setup 5.4.2] or higher installed in "%ProgramFiles%\Inno Setup 5" or "%ProgramFiles(x86)%\Inno - Setup 5" for an 64-bit machines. Alternatively, the InnoSetup + Setup 5" for an 64-bit machines. Alternatively, the Inno Setup directory may be included in the PATH environment variable.

The string "<root>" represents the root of your source tree - for System.Data.SQLite. + for the System.Data.SQLite project.

The string "<year>" represents the version of Visual Studio being used (e.g. 2008). @@ -105,27 +108,31 @@

Make sure the version information is correct for System.Data.SQLite in the following files:

<root>\SQLite.nuspec
<root>\Doc\Extra\dbfactorysupport.html
<root>\Doc\Extra\welcome.html
<root>\test\app.config
<root>\testlinq\2008\App.config
<root>\testlinq\2010\App.config
<root>\SQLite.Designer\AssemblyInfo.cs
<root>\SQLite.Interop\props\SQLite.Interop.vsprops
<root>\SQLite.Interop\props\SQLite.Interop.props
<root>\SQLite.Interop\src\win\interop.h
<root>\System.Data.SQLite\AssemblyInfo.cs
<root>\System.Data.SQLite\SQLite3.cs
<root>\System.Data.SQLite\UnsafeNativeMethods.cs
<root>\System.Data.SQLite.Linq\AssemblyInfo.cs

You'll need to update the INTEROP_BUILD_NUMBER, INTEROP_MANIFEST_VERSION, - and INTEROP_RC_VERSION properties in the .vsprops and .props files, and the - INTEROP_VERSION define in interop.h. This version number should track the - release versions of the System.Data.SQLite packages (i.e. [./news.wiki | 1.0.x]). + and INTEROP_RC_VERSION properties in the ".vsprops" and + ".props" files, and the INTEROP_VERSION define in + "interop.h". This version number should track the release + versions of the System.Data.SQLite packages (i.e. [./news.wiki | 1.0.x]).

Manual Build

@@ -134,34 +141,36 @@

Complete the steps outlined in the [./build.wiki#all | All Builds] section (above).

Open the appropriate solution for your build platform. -

- SQLite.NET.2008.sln is the top-level solution primarily designed for use - with Visual Studio 2008 in the IDE; however, it may also be used from - the command line with MSBuild 3.5. -
- SQLite.NET.2010.sln is the top-level solution primarily designed for use - with Visual Studio 2010 in the IDE; however, it may also be used from - the command line with MSBuild 4.0. -
- SQLite.NET.2008.MSBuild.sln is the top-level solution primarily designed - for use with MSBuild 3.5 on the command line; however, it may also be - used from the Visual Studio 2008 IDE. -
- SQLite.NET.2010.MSBuild.sln is the top-level solution primarily designed - for use with MSBuild 4.0 on the command line; however, it may also be - used from the Visual Studio 2010 IDE. +
+ Open the appropriate solution for your build platform. + +
- + The "SQLite.NET.2008.sln" file is the top-level solution + primarily designed for use with Visual Studio 2008 in the IDE; however, + it may also be used from the command line with MSBuild 3.5. +
- + The "SQLite.NET.2010.sln" file is the top-level solution + primarily designed for use with Visual Studio 2010 in the IDE; however, + it may also be used from the command line with MSBuild 4.0. +
- + The "SQLite.NET.2008.MSBuild.sln" file is the top-level + solution primarily designed for use with MSBuild 3.5 on the command + line; however, it may also be used from the Visual Studio 2008 IDE. +
- + The "SQLite.NET.2010.MSBuild.sln" file is the top-level + solution primarily designed for use with MSBuild 4.0 on the command + line; however, it may also be used from the Visual Studio 2010 IDE.
@@ -186,30 +195,32 @@ directories are completely free of all output files. In theory, you should be able to simply delete these directories.
Open a normal command prompt window with "cmd.exe".
Change the current directory to "<root>\Setup".
- Enter the following command to build the binaries for Win32 (x86): build.bat - ReleaseNativeOnly Win32
You may need to enter the command - "setenv /x86" first if you are using a "Windows SDK Command - Prompt" or "Visual Studio Command Prompt" window. + Enter the following command to build the binaries for Win32 (x86): + build.bat ReleaseNativeOnly Win32
You may need to enter the + command "setenv /x86" first if you are using a + "Windows SDK Command Prompt" or "Visual Studio Command + Prompt" window.
Make sure everything succeeds with no errors; the log file "%TEMP%\System.Data.SQLite.Build_ReleaseNativeOnly_Win32_<year>_Unknown.log" may be checked if any errors should occur.
- Enter the following command to build the binaries for x64: build.bat - ReleaseNativeOnly x64
You may need to enter the command "setenv - /x64" first if you are using a "Windows SDK Command Prompt" - or "Visual Studio Command Prompt" window. + Enter the following command to build the binaries for x64: build.bat + ReleaseNativeOnly x64
You may need to enter the command + "setenv /x64" first if you are using a "Windows SDK + Command Prompt" or "Visual Studio Command Prompt" window.
Make sure everything succeeds with no errors; the log file "%TEMP%\System.Data.SQLite.Build_ReleaseNativeOnly_x64_<year>_Unknown.log" @@ -217,15 +228,15 @@
Enter the following command to build the setup binaries for all supported build configurations (unfortunately, it is not possible to build the setup - using the InnoSetup IDE. It must be done using the provided command line - tools due to its highly dynamic nature): bake_all.bat + using the Inno Setup IDE. It must be done using the provided command line + tools due to its highly dynamic nature):bake_all.bat
- Make sure everything succeeds with no errors. InnoSetup should produce - "success" messages very similar to the following: Successful - compile (X.XXX sec). Resulting Setup program filename is: abc + Make sure everything succeeds with no errors. Inno Setup should produce + "success" messages very similar to the following: Successful + compile (X.XXX sec). Resulting Setup program filename is: abc

[./news.wiki | News]
[./support.wiki | Support]
[./downloads.wiki | Downloads]
[./contribute.wiki | Contributing]
[./build.wiki | Build Procedures]
[./test.wiki | Test Procedures]
[./release.wiki | Release Procedures]

@@ -29,10 +30,14 @@ Historical versions, as well as the original support forums, may still be found at http://sqlite.phxsoftware.com/, though there have been no updates to this version since April of 2010.

+ +

Index: www/news.wiki ================================================================== --- www/news.wiki +++ www/news.wiki @@ -1,9 +1,36 @@ News Version History +

+ 1.0.75.0 - September XX, 2011 +

Updated to SQLite 3.7.8 [3e0da808d2].
More enhancements to the build system.
Add official NuGet package.
Add Changes and LastInsertRowId properties to the connection class.
Make all the assembly versioning attributes consistent.
Add unit testing infrastructure using Eagle.
Integrate all legacy unit tests, including the "testlinq" project, into the new test suite.
Add projects to build the interop assembly statically linked to the Visual C++ runtime. Fix for [53f0c5cbf6].
Add SQLITE_ENABLE_STAT2 compile-time option to the interop assembly. Fix for [74807fbf27].
Fix mutex issues exposed when running the test suite with the debug version of SQLite.
Fix transaction enlistment when repeated attempts are made to enlist in the same transaction. Fix for [ccfa69fc32].
Support the SQLITE_FCNTL_WIN32_AV_RETRY file control to mitigate the impact of file sharing violations caused by external processes.
Refactor the logging interface to be thread-safe and self-initializing.
Shutdown the SQLite native interface when the AppDomain is being unloaded. Fix for [b4a7ddc83f].
Support Skip operation for LINQ using OFFSET. Fix for [8b7d179c3c].
Support EndsWith operation for LINQ using SUBSTR. Fix for [59edc1018b].
Support all SQLite journal modes. Fix for [448d663d11].
Do not throw exceptions when disposing SQLiteDataReader. Fix for [e1b2e0f769].
The REAL type should be mapped to System.Double. Fix for [2c630bffa7] and [b0a5990f48].
Minor optimization to GetParamValueBytes(). Fix for [201128cc88].
Support the ON UPDATE, ON DELETE, and MATCH clause information when generating schema metadata for foreign keys. Partial fix for [b226147b37]. VS designer changes are not yet tested.
Fix incorrect resource name for SR.resx in the mixed-mode assembly.

1.0.74.0 - July 4, 2011

Updated to SQLite 3.7.7.1 [af0d91adf4].

Test Procedures

Test Assumptions & Prerequisites

+ The string "<root>" represents the root of the source tree + for the System.Data.SQLite project. +
+ The string "<year>" represents the version of Visual Studio + used (e.g. 2008) to build the binaries being tested. +
+ The string "<platform>" represents the native platform for + the binaries being tested (e.g. Win32 or x64). +
+ The string "<pid>" represents the process identifier for the + instance of EagleShell being used to run the unit tests. +

Test Procedures

+ Follow these steps to unit test the System.Data.SQLite (SDS) binaries. + Unless otherwise noted, all steps need to be done in the order specified. +

+ First, you will need a full source enlistment for the System.Data.SQLite + project, including the + "Externals\Eagle" + directory. +

+ The binaries to test must be [./build.wiki | built] or + [./downloads.wiki | downloaded]. If the binaries are downloaded, they must be + placed in the appropriate build output directory (e.g. + "<root>\bin\<year>\Release\bin" for the separate managed + and interop assemblies or + "<root>\bin\<year>\<platform>\Release" for the + mixed-mode assembly). +

+ The new unit tests have been setup using Eagle + and its associated unit testing framework, named "EagleTest". Eagle + is an implementation of the Tcl scripting + language for the Common Language Runtime (CLR). EagleTest is the unit testing + framework for Eagle, packaged as a collection of Eagle scripts, based loosely + on the implementation of + tcltest. +

Automated Unit Tests

Open a normal command prompt window with "cmd.exe".
Change the current directory to "<root>".
+ Enter the following command to run all the unit tests against the binaries built with a separate managed and interop assembly: + Externals\Eagle\bin\EagleShell.exe -file Tests\all.eagle +
+ Enter the following command to run all the unit tests against the binaries built with a mixed-mode assembly: + Externals\Eagle\bin\EagleShell.exe -initialize -runtimeOption native -file Tests\all.eagle +
+ Make sure all tests pass; the log file "%TEMP%\EagleShell.exe.test.<pid>.log" may be checked if any errors should occur. EagleTest should produce "success" messages very similar to the following:

+ PASSED: 30
+ TOTAL: 30
+ PASS PERCENTAGE: 100%
+ OVERALL RESULT: SUCCESS
+