Fix the "sqlite3" command in the TCL interface so that it correctly r…

…eturns an error if invoked with no arguments.
sekcheong · Sep 19, 2018 · c6ecdc6 · c6ecdc6
1 parent 89bd215
commit c6ecdc6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
@@ -3497,6 +3497,7 @@ static int SQLITE_TCLAPI DbMain(
   flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX;
 #endif
 
+  if( objc==1 ) return sqliteCmdUsage(interp, objv);
   if( objc==2 ){
     zArg = Tcl_GetStringFromObj(objv[1], 0);
     if( strcmp(zArg,"-version")==0 ){

diff --git a/test/tclsqlite.test b/test/tclsqlite.test
@@ -17,6 +17,8 @@
 #
 # $Id: tclsqlite.test,v 1.73 2009/03/16 13:19:36 danielk1977 Exp $
 
+catch {sqlite3}
+
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
@@ -31,6 +33,11 @@ do_test tcl-1.1 {
   regsub {really_sqlite3} $msg {sqlite3} msg
   lappend v $msg
 } [list 1 "wrong # args: should be \"$r\""]
+do_test tcl-1.1.1 {
+  set v [catch {sqlite3} msg]
+  regsub {really_sqlite3} $msg {sqlite3} msg
+  lappend v $msg
+} [list 1 "wrong # args: should be \"$r\""]
 do_test tcl-1.2 {
   set v [catch {db bogus} msg]
   lappend v $msg