Add the -uri option to the usage comment that is printed by the "sqlite3"

TCL command when an unknown command-line option is supplied.

FossilOrigin-Name: 7987e285786161b1513ab77694d79e95fc76b0e5

diff --git a/manifest b/manifest
index ece4cfbfcf950260a76f010f48af01b5952cd636..223ce919798d277dfbdd1c6b16ff55810cdf4b3a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sdocumentation\sfor\sthe\ssqlite3_uri_*()\sroutines\sto\smake\sit\sclear\nthat\sthere\sargument\smust\sbe\sa\sdatabase\sfilename\spassed\sinto\sxOpen().\nNo\schanges\sto\scode.
-D 2012-01-13T15:50:02.146
+C Add\sthe\s-uri\soption\sto\sthe\susage\scomment\sthat\sis\sprinted\sby\sthe\s"sqlite3"\nTCL\scommand\swhen\san\sunknown\scommand-line\soption\sis\ssupplied.
+D 2012-01-13T16:16:10.024
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -188,7 +188,7 @@ F src/sqliteInt.h b8fdd9c39c8d7f5c794f4ea917293d9c75b9aff2
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
-F src/tclsqlite.c bd86070f52ae3f77a2e6b3b065ff03adb9140bfa
+F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
 F src/test1.c 1b1e514e85ffe7152b02cba38bd0a1ce8cd56113
 F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
 F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
@@ -711,7 +711,7 @@ F test/syscall.test 265cda616f56a297406728ee1e74c9b4a93aa6dd
 F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
 F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
-F test/tclsqlite.test 5ebcbb0dccc3fbc1edc3bba84c38e2c2d574c5aa
+F test/tclsqlite.test 1597d353308531527583481d14d9da52ea8ed0af
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
@@ -987,7 +987,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 227cfe11c4a1c095ccad76116dc4a68cccc5e8f0
-R ca9b41255e58bd932abff81962aad33c
+P 08230a3a8c88f275bfc0ba72d3fea3260f24fc63
+R 22c66172c879896f2a704680b88f3b03
 U drh
-Z f379d4c85e9a75cdc92cb058ea5e8982
+Z 3e0506307b4594426b40dcb894997066

diff --git a/manifest.uuid b/manifest.uuid
index f48e1ffaa66a617ac6b3d4faef1a7f903a25bd81..02ee0f817727cee27fdcb75757e9d4ceb9e63777 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08230a3a8c88f275bfc0ba72d3fea3260f24fc63
\ No newline at end of file
+7987e285786161b1513ab77694d79e95fc76b0e5
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 3692bef9ca1199e8e054a0748d2f0b0b1e11030c..967b1a004f80f2621a817d3c78ca90ac299fa8d3 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -3017,7 +3017,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
   if( objc<3 || (objc&1)!=1 ){
     Tcl_WrongNumArgs(interp, 1, objv, 
       "HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN?"
-      " ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN?"
+      " ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?"
 #ifdef SQLITE_HAS_CODEC
       " ?-key CODECKEY?"
 #endif

diff --git a/test/tclsqlite.test b/test/tclsqlite.test
index 0ed06024c4d53e5ca294397cf8e1ee3e5cd0ae6b..c8b0303296a347cab27a5e76ecdabaea5c020fb4 100644 (file)
--- a/test/tclsqlite.test
+++ b/test/tclsqlite.test
@@ -25,7 +25,7 @@ source $testdir/tester.tcl
 if {[sqlite3 -has-codec]} {
   set r "sqlite_orig HANDLE FILENAME ?-key CODEC-KEY?"
 } else {
-  set r "sqlite_orig HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN? ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN?"
+  set r "sqlite_orig HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN? ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?"
 }
 do_test tcl-1.1 {
   set v [catch {sqlite3 bogus} msg]