/ Check-in [7987e285]
Login

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

Overview
Comment:Add the -uri option to the usage comment that is printed by the "sqlite3" TCL command when an unknown command-line option is supplied.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7987e285786161b1513ab77694d79e95fc76b0e5
User & Date: drh 2012-01-13 16:16:10
Context
2012-01-13
16:48
Fix documentation typos. No changes to code. check-in: 0b857613 user: drh tags: trunk
16:16
Add the -uri option to the usage comment that is printed by the "sqlite3" TCL command when an unknown command-line option is supplied. check-in: 7987e285 user: drh tags: trunk
15:50
Update the documentation for the sqlite3_uri_*() routines to make it clear that there argument must be a database filename passed into xOpen(). No changes to code. check-in: 08230a3a user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/tclsqlite.c.

  3013   3013         Tcl_AppendResult(interp, "unknown option: ", zArg, (char*)0);
  3014   3014         return TCL_ERROR;
  3015   3015       }
  3016   3016     }
  3017   3017     if( objc<3 || (objc&1)!=1 ){
  3018   3018       Tcl_WrongNumArgs(interp, 1, objv, 
  3019   3019         "HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN?"
  3020         -      " ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN?"
         3020  +      " ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?"
  3021   3021   #ifdef SQLITE_HAS_CODEC
  3022   3022         " ?-key CODECKEY?"
  3023   3023   #endif
  3024   3024       );
  3025   3025       return TCL_ERROR;
  3026   3026     }
  3027   3027     zErrMsg = 0;

Changes to test/tclsqlite.test.

    21     21   source $testdir/tester.tcl
    22     22   
    23     23   # Check the error messages generated by tclsqlite
    24     24   #
    25     25   if {[sqlite3 -has-codec]} {
    26     26     set r "sqlite_orig HANDLE FILENAME ?-key CODEC-KEY?"
    27     27   } else {
    28         -  set r "sqlite_orig HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN? ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN?"
           28  +  set r "sqlite_orig HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN? ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?"
    29     29   }
    30     30   do_test tcl-1.1 {
    31     31     set v [catch {sqlite3 bogus} msg]
    32     32     regsub {really_sqlite3} $msg {sqlite3} msg
    33     33     lappend v $msg
    34     34   } [list 1 "wrong # args: should be \"$r\""]
    35     35   do_test tcl-1.2 {