mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-08 14:02:16 +03:00
Merge latest trunk changes into this branch.
FossilOrigin-Name: 68c2b8d0ebd1a180c4828cb4996c6c5fd67386c3b6304edf587c255f8d067c24
This commit is contained in:
@@ -554,7 +554,7 @@ if {[info exists cmdlinearg]==0} {
|
||||
}
|
||||
unset -nocomplain a
|
||||
set testdir [file normalize $testdir]
|
||||
set cmdlinearg(TESTFIXTURE_HOME) [pwd]
|
||||
set cmdlinearg(TESTFIXTURE_HOME) [file dirname [info nameofexec]]
|
||||
set cmdlinearg(INFO_SCRIPT) [file normalize [info script]]
|
||||
set argv0 [file normalize $argv0]
|
||||
if {$cmdlinearg(testdir)!=""} {
|
||||
@@ -885,6 +885,15 @@ proc catchcmd {db {cmd ""}} {
|
||||
set rc [catch { eval $line } msg]
|
||||
list $rc $msg
|
||||
}
|
||||
proc catchsafecmd {db {cmd ""}} {
|
||||
global CLI
|
||||
set out [open cmds.txt w]
|
||||
puts $out $cmd
|
||||
close $out
|
||||
set line "exec $CLI -safe $db < cmds.txt"
|
||||
set rc [catch { eval $line } msg]
|
||||
list $rc $msg
|
||||
}
|
||||
|
||||
proc catchcmdex {db {cmd ""}} {
|
||||
global CLI
|
||||
|
Reference in New Issue
Block a user